diff options
307 files changed, 10583 insertions, 9432 deletions
diff --git a/context/data/scite/context/lexers/data/scite-context-data-tex.lua b/context/data/scite/context/lexers/data/scite-context-data-tex.lua index da3190c35..c9c8734c9 100644 --- a/context/data/scite/context/lexers/data/scite-context-data-tex.lua +++ b/context/data/scite/context/lexers/data/scite-context-data-tex.lua @@ -1,7 +1,7 @@ return { ["aleph"]={ "Alephminorversion", "Alephrevision", "Alephversion" }, ["etex"]={ "botmarks", "clubpenalties", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "detokenize", "dimexpr", "displaywidowpenalties", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "everyeof", "firstmarks", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "ifcsname", "ifdefined", "iffontchar", "interactionmode", "interlinepenalties", "lastlinefit", "lastnodetype", "marks", "muexpr", "mutoglue", "numexpr", "pagediscards", "parshapedimen", "parshapeindent", "parshapelength", "predisplaydirection", "protected", "readline", "savinghyphcodes", "savingvdiscards", "scantokens", "showgroups", "showifs", "showtokens", "splitbotmarks", "splitdiscards", "splitfirstmarks", "topmarks", "tracingassigns", "tracinggroups", "tracingifs", "tracingnesting", "tracingscantokens", "unexpanded", "unless", "widowpenalties" }, - ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, + ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, ["omega"]={ "Omegaminorversion", "Omegarevision", "Omegaversion" }, ["pdftex"]={ "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlinedepth", "pdfeachlineheight", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfignoreunknownimages", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinfoomitdate", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfmajorversion", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkfixeddpi", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdfsuppressoptionalinfo", "pdfsuppressptexinfo", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdftrailerid", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformmargin", "pdfxformname", "pdfxformresources", "pdfximage" }, ["tex"]={ " ", "-", "/", "Uleft", "Umiddle", "Uright", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "atop", "atopwithdelims", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "botmark", "boundary", "box", "boxmaxdepth", "brokenpenalty", "catcode", "char", "chardef", "cleaders", "closein", "closeout", "clubpenalty", "copy", "count", "countdef", "cr", "crcr", "csname", "csstring", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "dimen", "dimendef", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "edef", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "fam", "fi", "finalhyphendemerits", "firstmark", "firstvalidlanguage", "floatingpenalty", "font", "fontdimen", "fontname", "futurelet", "gdef", "global", "globaldefs", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hpack", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifcase", "ifcat", "ifdim", "ifeof", "iffalse", "ifhbox", "ifhmode", "ifinner", "ifmmode", "ifnum", "ifodd", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignorespaces", "immediate", "indent", "input", "inputlineno", "insert", "insertpenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastpenalty", "lastskip", "lccode", "leaders", "left", "lefthyphenmin", "leftskip", "leqno", "let", "limits", "linepenalty", "lineskip", "lineskiplimit", "long", "looseness", "lower", "lowercase", "mag", "mark", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathinner", "mathop", "mathopen", "mathord", "mathpunct", "mathrel", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "multiply", "muskip", "muskipdef", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nolimits", "nonscript", "nonstopmode", "nulldelimiterspace", "nullfont", "number", "omit", "openin", "openout", "or", "outer", "output", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagedepth", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageshrink", "pagestretch", "pagetotal", "par", "parfillskip", "parindent", "parshape", "parskip", "patterns", "pausing", "penalty", "postdisplaypenalty", "predisplaypenalty", "predisplaysize", "pretolerance", "prevdepth", "prevgraf", "protrusionboundary", "radical", "raise", "read", "relax", "relpenalty", "right", "righthyphenmin", "rightskip", "romannumeral", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setlanguage", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showlists", "showthe", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitfirstmark", "splitmaxdepth", "splittopskip", "string", "tabskip", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topskip", "tpack", "tracingcommands", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingstats", "uccode", "uchyph", "underline", "unhbox", "unhcopy", "unkern", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vpack", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalty", "wordboundary", "write", "xdef", "xleaders", "xspaceskip", "year" }, diff --git a/context/data/scite/context/scite-context-data-tex.properties b/context/data/scite/context/scite-context-data-tex.properties index 840d5c259..167a21304 100644 --- a/context/data/scite/context/scite-context-data-tex.properties +++ b/context/data/scite/context/scite-context-data-tex.properties @@ -61,19 +61,19 @@ letcharcode letterspacefont linedir localbrokenpenalty localinterlinepenalty \ localleftbox localrightbox lpcode luaescapestring luafunction \ luatexbanner luatexrevision luatexversion mathdelimitersmode mathdir \ mathdisplayskipmode matheqnogapstep mathitalicsmode mathnolimitsmode mathoption \ -mathpenaltiesmode mathrulesfam mathrulesmode mathscriptsmode mathstyle \ -mathsurroundmode mathsurroundskip nohrule nokerns noligs \ -normaldeviate nospaces novrule outputbox outputmode \ -pagebottomoffset pagedir pageheight pageleftoffset pagerightoffset \ -pagetopoffset pagewidth pardir pdfextension pdffeedback \ -pdfvariable postexhyphenchar posthyphenchar prebinoppenalty predisplaygapfactor \ -preexhyphenchar prehyphenchar prerelpenalty primitive protrudechars \ -pxdimen quitvmode randomseed rightghost rightmarginkern \ -rpcode saveboxresource savecatcodetable saveimageresource savepos \ -scantextokens setfontid setrandomseed shapemode suppressfontnotfounderror \ -suppressifcsnameerror suppresslongerror suppressmathparerror suppressoutererror synctex \ -tagcode textdir toksapp tokspre tracingfonts \ -uniformdeviate useboxresource useimageresource +mathpenaltiesmode mathrulesfam mathrulesmode mathscriptsmode mathscriptboxmode \ +mathstyle mathsurroundmode mathsurroundskip nohrule nokerns \ +noligs normaldeviate nospaces novrule outputbox \ +outputmode pagebottomoffset pagedir pageheight pageleftoffset \ +pagerightoffset pagetopoffset pagewidth pardir pdfextension \ +pdffeedback pdfvariable postexhyphenchar posthyphenchar prebinoppenalty \ +predisplaygapfactor preexhyphenchar prehyphenchar prerelpenalty primitive \ +protrudechars pxdimen quitvmode randomseed rightghost \ +rightmarginkern rpcode saveboxresource savecatcodetable saveimageresource \ +savepos scantextokens setfontid setrandomseed shapemode \ +suppressfontnotfounderror suppressifcsnameerror suppresslongerror suppressmathparerror suppressoutererror \ +synctex tagcode textdir toksapp tokspre \ +tracingfonts uniformdeviate useboxresource useimageresource keywordclass.tex.omega=\ Omegaminorversion Omegarevision Omegaversion diff --git a/context/data/textadept/context/data/scite-context-data-tex.lua b/context/data/textadept/context/data/scite-context-data-tex.lua index da3190c35..c9c8734c9 100644 --- a/context/data/textadept/context/data/scite-context-data-tex.lua +++ b/context/data/textadept/context/data/scite-context-data-tex.lua @@ -1,7 +1,7 @@ return { ["aleph"]={ "Alephminorversion", "Alephrevision", "Alephversion" }, ["etex"]={ "botmarks", "clubpenalties", "currentgrouplevel", "currentgrouptype", "currentifbranch", "currentiflevel", "currentiftype", "detokenize", "dimexpr", "displaywidowpenalties", "eTeXVersion", "eTeXminorversion", "eTeXrevision", "eTeXversion", "everyeof", "firstmarks", "fontchardp", "fontcharht", "fontcharic", "fontcharwd", "glueexpr", "glueshrink", "glueshrinkorder", "gluestretch", "gluestretchorder", "gluetomu", "ifcsname", "ifdefined", "iffontchar", "interactionmode", "interlinepenalties", "lastlinefit", "lastnodetype", "marks", "muexpr", "mutoglue", "numexpr", "pagediscards", "parshapedimen", "parshapeindent", "parshapelength", "predisplaydirection", "protected", "readline", "savinghyphcodes", "savingvdiscards", "scantokens", "showgroups", "showifs", "showtokens", "splitbotmarks", "splitdiscards", "splitfirstmarks", "topmarks", "tracingassigns", "tracinggroups", "tracingifs", "tracingnesting", "tracingscantokens", "unexpanded", "unless", "widowpenalties" }, - ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, + ["luatex"]={ "Uchar", "Udelcode", "Udelcodenum", "Udelimiter", "Udelimiterover", "Udelimiterunder", "Uhextensible", "Umathaccent", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", "Umathbininnerspacing", "Umathbinopenspacing", "Umathbinopspacing", "Umathbinordspacing", "Umathbinpunctspacing", "Umathbinrelspacing", "Umathchar", "Umathcharclass", "Umathchardef", "Umathcharfam", "Umathcharnum", "Umathcharnumdef", "Umathcharslot", "Umathclosebinspacing", "Umathcloseclosespacing", "Umathcloseinnerspacing", "Umathcloseopenspacing", "Umathcloseopspacing", "Umathcloseordspacing", "Umathclosepunctspacing", "Umathcloserelspacing", "Umathcode", "Umathcodenum", "Umathconnectoroverlapmin", "Umathfractiondelsize", "Umathfractiondenomdown", "Umathfractiondenomvgap", "Umathfractionnumup", "Umathfractionnumvgap", "Umathfractionrule", "Umathinnerbinspacing", "Umathinnerclosespacing", "Umathinnerinnerspacing", "Umathinneropenspacing", "Umathinneropspacing", "Umathinnerordspacing", "Umathinnerpunctspacing", "Umathinnerrelspacing", "Umathlimitabovebgap", "Umathlimitabovekern", "Umathlimitabovevgap", "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathopbinspacing", "Umathopclosespacing", "Umathopenbinspacing", "Umathopenclosespacing", "Umathopeninnerspacing", "Umathopenopenspacing", "Umathopenopspacing", "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", "Umathopopspacing", "Umathopordspacing", "Umathoppunctspacing", "Umathoprelspacing", "Umathordbinspacing", "Umathordclosespacing", "Umathordinnerspacing", "Umathordopenspacing", "Umathordopspacing", "Umathordordspacing", "Umathordpunctspacing", "Umathordrelspacing", "Umathoverbarkern", "Umathoverbarrule", "Umathoverbarvgap", "Umathoverdelimiterbgap", "Umathoverdelimitervgap", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", "Umathpunctopenspacing", "Umathpunctopspacing", "Umathpunctordspacing", "Umathpunctpunctspacing", "Umathpunctrelspacing", "Umathquad", "Umathradicaldegreeafter", "Umathradicaldegreebefore", "Umathradicaldegreeraise", "Umathradicalkern", "Umathradicalrule", "Umathradicalvgap", "Umathrelbinspacing", "Umathrelclosespacing", "Umathrelinnerspacing", "Umathrelopenspacing", "Umathrelopspacing", "Umathrelordspacing", "Umathrelpunctspacing", "Umathrelrelspacing", "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", "Umathstackdenomdown", "Umathstacknumup", "Umathstackvgap", "Umathsubshiftdown", "Umathsubshiftdrop", "Umathsubsupshiftdown", "Umathsubsupvgap", "Umathsubtopmax", "Umathsupbottommin", "Umathsupshiftdrop", "Umathsupshiftup", "Umathsupsubbottommax", "Umathunderbarkern", "Umathunderbarrule", "Umathunderbarvgap", "Umathunderdelimiterbgap", "Umathunderdelimitervgap", "Unosubscript", "Unosuperscript", "Uoverdelimiter", "Uradical", "Uroot", "Uskewed", "Uskewedwithdelims", "Ustack", "Ustartdisplaymath", "Ustartmath", "Ustopdisplaymath", "Ustopmath", "Usubscript", "Usuperscript", "Uunderdelimiter", "Uvextensible", "adjustspacing", "alignmark", "aligntab", "attribute", "attributedef", "automaticdiscretionary", "automatichyphenmode", "automatichyphenpenalty", "begincsname", "bodydir", "boxdir", "breakafterdirmode", "catcodetable", "clearmarks", "copyfont", "crampeddisplaystyle", "crampedscriptscriptstyle", "crampedscriptstyle", "crampedtextstyle", "draftmode", "dviextension", "dvifeedback", "dvivariable", "efcode", "etoksapp", "etokspre", "expanded", "expandglyphsinfont", "explicitdiscretionary", "explicithyphenpenalty", "fontid", "formatname", "gleaders", "hjcode", "hyphenationbounds", "hyphenationmin", "hyphenpenaltymode", "ifabsdim", "ifabsnum", "ifincsname", "ifprimitive", "ignoreligaturesinfont", "initcatcodetable", "insertht", "lastnamedcs", "lastsavedboxresourceindex", "lastsavedimageresourceindex", "lastsavedimageresourcepages", "lastxpos", "lastypos", "latelua", "leftghost", "leftmarginkern", "letcharcode", "letterspacefont", "linedir", "localbrokenpenalty", "localinterlinepenalty", "localleftbox", "localrightbox", "lpcode", "luaescapestring", "luafunction", "luatexbanner", "luatexrevision", "luatexversion", "mathdelimitersmode", "mathdir", "mathdisplayskipmode", "matheqnogapstep", "mathitalicsmode", "mathnolimitsmode", "mathoption", "mathpenaltiesmode", "mathrulesfam", "mathrulesmode", "mathscriptsmode", "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", "nohrule", "nokerns", "noligs", "normaldeviate", "nospaces", "novrule", "outputbox", "outputmode", "pagebottomoffset", "pagedir", "pageheight", "pageleftoffset", "pagerightoffset", "pagetopoffset", "pagewidth", "pardir", "pdfextension", "pdffeedback", "pdfvariable", "postexhyphenchar", "posthyphenchar", "prebinoppenalty", "predisplaygapfactor", "preexhyphenchar", "prehyphenchar", "prerelpenalty", "primitive", "protrudechars", "pxdimen", "quitvmode", "randomseed", "rightghost", "rightmarginkern", "rpcode", "saveboxresource", "savecatcodetable", "saveimageresource", "savepos", "scantextokens", "setfontid", "setrandomseed", "shapemode", "suppressfontnotfounderror", "suppressifcsnameerror", "suppresslongerror", "suppressmathparerror", "suppressoutererror", "synctex", "tagcode", "textdir", "toksapp", "tokspre", "tracingfonts", "uniformdeviate", "useboxresource", "useimageresource" }, ["omega"]={ "Omegaminorversion", "Omegarevision", "Omegaversion" }, ["pdftex"]={ "ifpdfabsdim", "ifpdfabsnum", "ifpdfprimitive", "pdfadjustspacing", "pdfannot", "pdfcatalog", "pdfcolorstack", "pdfcolorstackinit", "pdfcompresslevel", "pdfcopyfont", "pdfcreationdate", "pdfdecimaldigits", "pdfdest", "pdfdestmargin", "pdfdraftmode", "pdfeachlinedepth", "pdfeachlineheight", "pdfendlink", "pdfendthread", "pdffirstlineheight", "pdffontattr", "pdffontexpand", "pdffontname", "pdffontobjnum", "pdffontsize", "pdfgamma", "pdfgentounicode", "pdfglyphtounicode", "pdfhorigin", "pdfignoreddimen", "pdfignoreunknownimages", "pdfimageaddfilename", "pdfimageapplygamma", "pdfimagegamma", "pdfimagehicolor", "pdfimageresolution", "pdfincludechars", "pdfinclusioncopyfonts", "pdfinclusionerrorlevel", "pdfinfo", "pdfinfoomitdate", "pdfinsertht", "pdflastannot", "pdflastlinedepth", "pdflastlink", "pdflastobj", "pdflastxform", "pdflastximage", "pdflastximagepages", "pdflastxpos", "pdflastypos", "pdflinkmargin", "pdfliteral", "pdfmapfile", "pdfmapline", "pdfmajorversion", "pdfminorversion", "pdfnames", "pdfnoligatures", "pdfnormaldeviate", "pdfobj", "pdfobjcompresslevel", "pdfoutline", "pdfoutput", "pdfpageattr", "pdfpagebox", "pdfpageheight", "pdfpageref", "pdfpageresources", "pdfpagesattr", "pdfpagewidth", "pdfpkfixeddpi", "pdfpkmode", "pdfpkresolution", "pdfprimitive", "pdfprotrudechars", "pdfpxdimen", "pdfrandomseed", "pdfrefobj", "pdfrefxform", "pdfrefximage", "pdfreplacefont", "pdfrestore", "pdfretval", "pdfsave", "pdfsavepos", "pdfsetmatrix", "pdfsetrandomseed", "pdfstartlink", "pdfstartthread", "pdfsuppressoptionalinfo", "pdfsuppressptexinfo", "pdftexbanner", "pdftexrevision", "pdftexversion", "pdfthread", "pdfthreadmargin", "pdftracingfonts", "pdftrailer", "pdftrailerid", "pdfuniformdeviate", "pdfuniqueresname", "pdfvorigin", "pdfxform", "pdfxformattr", "pdfxformmargin", "pdfxformname", "pdfxformresources", "pdfximage" }, ["tex"]={ " ", "-", "/", "Uleft", "Umiddle", "Uright", "above", "abovedisplayshortskip", "abovedisplayskip", "abovewithdelims", "accent", "adjdemerits", "advance", "afterassignment", "aftergroup", "atop", "atopwithdelims", "badness", "baselineskip", "batchmode", "begingroup", "belowdisplayshortskip", "belowdisplayskip", "binoppenalty", "botmark", "boundary", "box", "boxmaxdepth", "brokenpenalty", "catcode", "char", "chardef", "cleaders", "closein", "closeout", "clubpenalty", "copy", "count", "countdef", "cr", "crcr", "csname", "csstring", "day", "deadcycles", "def", "defaulthyphenchar", "defaultskewchar", "delcode", "delimiter", "delimiterfactor", "delimitershortfall", "dimen", "dimendef", "directlua", "discretionary", "displayindent", "displaylimits", "displaystyle", "displaywidowpenalty", "displaywidth", "divide", "doublehyphendemerits", "dp", "dump", "edef", "else", "emergencystretch", "end", "endcsname", "endgroup", "endinput", "endlinechar", "eqno", "errhelp", "errmessage", "errorcontextlines", "errorstopmode", "escapechar", "everycr", "everydisplay", "everyhbox", "everyjob", "everymath", "everypar", "everyvbox", "exhyphenchar", "exhyphenpenalty", "expandafter", "fam", "fi", "finalhyphendemerits", "firstmark", "firstvalidlanguage", "floatingpenalty", "font", "fontdimen", "fontname", "futurelet", "gdef", "global", "globaldefs", "halign", "hangafter", "hangindent", "hbadness", "hbox", "hfil", "hfill", "hfilneg", "hfuzz", "hoffset", "holdinginserts", "hpack", "hrule", "hsize", "hskip", "hss", "ht", "hyphenation", "hyphenchar", "hyphenpenalty", "if", "ifcase", "ifcat", "ifdim", "ifeof", "iffalse", "ifhbox", "ifhmode", "ifinner", "ifmmode", "ifnum", "ifodd", "iftrue", "ifvbox", "ifvmode", "ifvoid", "ifx", "ignorespaces", "immediate", "indent", "input", "inputlineno", "insert", "insertpenalties", "interlinepenalty", "jobname", "kern", "language", "lastbox", "lastkern", "lastpenalty", "lastskip", "lccode", "leaders", "left", "lefthyphenmin", "leftskip", "leqno", "let", "limits", "linepenalty", "lineskip", "lineskiplimit", "long", "looseness", "lower", "lowercase", "mag", "mark", "mathaccent", "mathbin", "mathchar", "mathchardef", "mathchoice", "mathclose", "mathcode", "mathinner", "mathop", "mathopen", "mathord", "mathpunct", "mathrel", "mathsurround", "maxdeadcycles", "maxdepth", "meaning", "medmuskip", "message", "middle", "mkern", "month", "moveleft", "moveright", "mskip", "multiply", "muskip", "muskipdef", "newlinechar", "noalign", "noboundary", "noexpand", "noindent", "nolimits", "nonscript", "nonstopmode", "nulldelimiterspace", "nullfont", "number", "omit", "openin", "openout", "or", "outer", "output", "outputpenalty", "over", "overfullrule", "overline", "overwithdelims", "pagedepth", "pagefilllstretch", "pagefillstretch", "pagefilstretch", "pagegoal", "pageshrink", "pagestretch", "pagetotal", "par", "parfillskip", "parindent", "parshape", "parskip", "patterns", "pausing", "penalty", "postdisplaypenalty", "predisplaypenalty", "predisplaysize", "pretolerance", "prevdepth", "prevgraf", "protrusionboundary", "radical", "raise", "read", "relax", "relpenalty", "right", "righthyphenmin", "rightskip", "romannumeral", "scriptfont", "scriptscriptfont", "scriptscriptstyle", "scriptspace", "scriptstyle", "scrollmode", "setbox", "setlanguage", "sfcode", "shipout", "show", "showbox", "showboxbreadth", "showboxdepth", "showlists", "showthe", "skewchar", "skip", "skipdef", "spacefactor", "spaceskip", "span", "special", "splitbotmark", "splitfirstmark", "splitmaxdepth", "splittopskip", "string", "tabskip", "textfont", "textstyle", "the", "thickmuskip", "thinmuskip", "time", "toks", "toksdef", "tolerance", "topmark", "topskip", "tpack", "tracingcommands", "tracinglostchars", "tracingmacros", "tracingonline", "tracingoutput", "tracingpages", "tracingparagraphs", "tracingrestores", "tracingstats", "uccode", "uchyph", "underline", "unhbox", "unhcopy", "unkern", "unpenalty", "unskip", "unvbox", "unvcopy", "uppercase", "vadjust", "valign", "vbadness", "vbox", "vcenter", "vfil", "vfill", "vfilneg", "vfuzz", "voffset", "vpack", "vrule", "vsize", "vskip", "vsplit", "vss", "vtop", "wd", "widowpenalty", "wordboundary", "write", "xdef", "xleaders", "xspaceskip", "year" }, diff --git a/doc/context/documents/general/manuals/luatex.pdf b/doc/context/documents/general/manuals/luatex.pdf Binary files differindex 3e1da4004..40c2d4254 100644 --- a/doc/context/documents/general/manuals/luatex.pdf +++ b/doc/context/documents/general/manuals/luatex.pdf diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex a42008e9a..4b4aee23c 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex 6d3db3829..9c14fc46e 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex 10eb9ef10..7ff109649 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex 65133e823..d4c002678 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex 1dbc54a8a..25136fcfe 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex 6f5d34071..a5cc17168 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex 36b2f50d2..f34712008 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf diff --git a/doc/context/sources/general/manuals/luatex/luatex-lua.tex b/doc/context/sources/general/manuals/luatex/luatex-lua.tex index 3d7e14700..d95415b05 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-lua.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-lua.tex @@ -303,17 +303,17 @@ piecemeal: \type {string.utfcharacters(s)}: a string with a single \UTF-8 token in it \stopitem \startitem - \type {string.characters(s)} \NC a string containing one byte + \type {string.characters(s)}: a string containing one byte \stopitem \startitem - \type {string.characterpairs(s)} two strings each containing one byte or an + \type {string.characterpairs(s)}: two strings each containing one byte or an empty second string if the string length was odd \stopitem \startitem - \type {string.bytes(s)} a single byte value + \type {string.bytes(s)}: a single byte value \stopitem \startitem - \type {string.bytepairs(s)} two byte values or nil instead of a number as + \type {string.bytepairs(s)}: two byte values or nil instead of a number as its second return value if the string length was odd \stopitem \stopitemize @@ -335,8 +335,28 @@ always returns byte positions in a string, and \type {unicode.utf8.match} and are} \UNICODE|-|aware, they fall|-|back to non|-|\UNICODE|-|aware behavior when using the empty capture \type {()} but other captures work as expected. For the interpretation of character classes in \type {unicode.utf8} functions refer to -the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. Version -5.3 of \LUA\ will provide some native \UTF8 support. +the library sources at \hyphenatedurl {http://luaforge.net/projects/sln}. + +Version 5.3 of \LUA\ provides some native \UTF8 support but we have added a few +similar helpers too: + +\startitemize +\startitem + \type {string.utfvalue(s)}: returns the codepoints of the characters in the + given string +\stopitem +\startitem + \type {string.utfcharacter(c,...)}: returns a string with the characters of + the given code points +\stopitem +\startitem + \type {string.utflength(s)}: returns the length oif the given string +\stopitem +\stopitemize + +These three functions are relative fast and don't do much checking. They can be used +as building blocks for other helpers. + \blank diff --git a/doc/context/sources/general/manuals/luatex/luatex-math.tex b/doc/context/sources/general/manuals/luatex/luatex-math.tex index 9fb0c02ab..cf5489641 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-math.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-math.tex @@ -631,7 +631,7 @@ example. \stoptexdefinition \start - \setupbodyfont[cambria] + \switchtobodyfont[cambria] \starttabulate[|c|c|c|c|c|c|] \Whatever{0}% \Whatever{1}% @@ -641,6 +641,55 @@ example. This kind of parameters relate to the fact that italic correction in \OPENTYPE\ math is bound to fuzzy rules. So, control is the solution. +\section{Script boxes} + +If you want typeset text in math macro packages often provide something \type +{\text} which obeys the script sizes. As the definition can be anything there is +a good change that the kerning doesn't come out well when used in a script. Given +that the first glyph ends up in an \type {\hbox} we have some control over this. +And, as a bonus we also added control over the normal sublist kerning. The \type +{\mathscriptboxmode} parameter defaults to~1. + +\starttabulate[|l|l|] +\NC \type {0} \NC forget about kerning \NC \NR +\NC \type {1} \NC kern math sub lists with a valid glyph \NC \NR +\NC \type {2} \NC also kern math sub boxes that have a valid glyph \NC \NR +\NC \type {2} \NC only kern math sub boxes with a boundary node present\NC \NR +\stoptabulate + +Here we show some examples. Of course this doesn't solve all our problems, if +only because some fonts have characters with bounding boxes that compensate for +italics, while other fonts can lack kerns. + +\startbuffer[1] + $T_{\tf fluff}$ +\stopbuffer + +\startbuffer[2] + $T_{\text{fluff}}$ +\stopbuffer + +\startbuffer[3] + $T_{\text{\boundary1 fluff}}$ +\stopbuffer + +\unexpanded\def\Show#1#2#3% + {\doifelsenothing{#3} + {\small\typeinlinebuffer[#1]} + {\doifelse{#3}{-} + {\small\type{mode #2}} + {\switchtobodyfont[#3]\showfontkerns\showglyphs\mathscriptboxmode#2\relax\inlinebuffer[#1]}}} + +\starttabulate[|lT|c|c|c|c|c|] + \NC \NC \Show{1}{0}{} \NC\Show{1}{1}{} \NC \Show{2}{1}{} \NC \Show{2}{2}{} \NC \Show{3}{3}{} \NC \NR + \NC \NC \Show{1}{0}{-} \NC\Show{1}{1}{-} \NC \Show{2}{1}{-} \NC \Show{2}{2}{-} \NC \Show{3}{3}{-} \NC \NR + \NC modern \NC \Show{1}{0}{modern} \NC\Show{1}{1}{modern} \NC \Show{2}{1}{modern} \NC \Show{2}{2}{modern} \NC \Show{3}{3}{modern} \NC \NR + \NC lucidaot \NC \Show{1}{0}{lucidaot} \NC\Show{1}{1}{lucidaot} \NC \Show{2}{1}{lucidaot} \NC \Show{2}{2}{lucidaot} \NC \Show{3}{3}{lucidaot} \NC \NR + \NC pagella \NC \Show{1}{0}{pagella} \NC\Show{1}{1}{pagella} \NC \Show{2}{1}{pagella} \NC \Show{2}{2}{pagella} \NC \Show{3}{3}{pagella} \NC \NR + \NC cambria \NC \Show{1}{0}{cambria} \NC\Show{1}{1}{cambria} \NC \Show{2}{1}{cambria} \NC \Show{2}{2}{cambria} \NC \Show{3}{3}{cambria} \NC \NR + \NC dejavu \NC \Show{1}{0}{dejavu} \NC\Show{1}{1}{dejavu} \NC \Show{2}{1}{dejavu} \NC \Show{2}{2}{dejavu} \NC \Show{3}{3}{dejavu} \NC \NR +\stoptabulate + \section{Unscaled fences} The \type {\mathdelimitersmode} primitive is experimental and deals with the @@ -659,7 +708,7 @@ so that the same spacing applies as with unfenced variants. Here we show Cambria \stoptexdefinition \start - \setupbodyfont[cambria] + \switchtobodyfont[cambria] \starttabulate[|l|l|l|] \Whatever{0}\Whatever{1}\Whatever{2}\Whatever{3}% \Whatever{4}\Whatever{5}\Whatever{6}\Whatever{7}% diff --git a/doc/context/sources/general/manuals/luatex/luatex-style.tex b/doc/context/sources/general/manuals/luatex/luatex-style.tex index 547fd204a..a277a1178 100644 --- a/doc/context/sources/general/manuals/luatex/luatex-style.tex +++ b/doc/context/sources/general/manuals/luatex/luatex-style.tex @@ -89,7 +89,11 @@ \definecolor[keptcolor] [b=.5] \definecolor[othercolor][r=.5,g=.5] -\setupbodyfont[modern] % we need this in examples so we predefine +\usebodyfont[lucidaot] +\usebodyfont[pagella] +\usebodyfont[cambria] +%usebodyfont[dejavu] +\usebodyfont[modern] % we need this in examples so we predefine % \doifmodeelse {atpragma} { % diff --git a/metapost/context/base/mpiv/mp-luas.mpiv b/metapost/context/base/mpiv/mp-luas.mpiv index 99df0b861..d35701ec6 100644 --- a/metapost/context/base/mpiv/mp-luas.mpiv +++ b/metapost/context/base/mpiv/mp-luas.mpiv @@ -49,13 +49,13 @@ boolean context_luas ; context_luas := true ; % % Fourth variant: -string mfun_lua_bs ; mfun_lua_bs = "[[" ; -string mfun_lua_es ; mfun_lua_es = "]]" ; +string mfun_lua_bs ; mfun_lua_bs := "[[" ; +string mfun_lua_es ; mfun_lua_es := "]]" ; vardef mlib_luas_luacall(text t) = runscript("" for s = t : if string s : - & mfun_lua_bs & s & mfun_lua_es + & s elseif numeric s : & decimal s elseif boolean s : @@ -75,6 +75,7 @@ vardef mlib_luas_lualist(expr c)(text t) = hide(b := true) fi if string s : + % & ditto & s & ditto & mfun_lua_bs & s & mfun_lua_es elseif numeric s : & decimal s diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index a65197f10..579b05b0b 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lua"] = package.loaded["l-lua"] or true --- original size: 5125, stripped down to: 2881 +-- original size: 6056, stripped down to: 2916 if not modules then modules={} end modules ['l-lua']={ version=1.001, @@ -65,14 +65,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -1709,7 +1710,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-table"] = package.loaded["l-table"] or true --- original size: 39674, stripped down to: 23227 +-- original size: 40086, stripped down to: 23513 if not modules then modules={} end modules ['l-table']={ version=1.001, @@ -2757,6 +2758,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- of closure @@ -2765,7 +2784,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-io"] = package.loaded["l-io"] or true --- original size: 11790, stripped down to: 6961 +-- original size: 11823, stripped down to: 6945 if not modules then modules={} end modules ['l-io']={ version=1.001, @@ -2778,16 +2797,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -5041,7 +5059,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-unicode"] = package.loaded["l-unicode"] or true --- original size: 38263, stripped down to: 16330 +-- original size: 39076, stripped down to: 16665 if not modules then modules={} end modules ['l-unicode']={ version=1.001, @@ -5077,37 +5095,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -5158,19 +5182,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -5717,7 +5744,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 37003, stripped down to: 20839 +-- original size: 37217, stripped down to: 20835 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -5737,7 +5764,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -5998,7 +6025,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -6399,7 +6426,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -6436,7 +6463,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7705,7 +7732,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-sto"] = package.loaded["util-sto"] or true --- original size: 5918, stripped down to: 2756 +-- original size: 6449, stripped down to: 3069 if not modules then modules={} end modules ['util-sto']={ version=1.001, @@ -7824,6 +7851,25 @@ function table.setmetatablecall(t,f) end return t end +function table.setmetatableindices(t,f,n,c) + if type(t)~="table" then + f,t=t,{} + end + local m=getmetatable(t) + local i=f_index[f] or f + if m then + m.__index=i + m.__newindex=n + m.__call=c + else + setmetatable(t,{ + __index=i, + __newindex=n, + __call=c, + }) + end + return t +end function table.setmetatablekey(t,key,value) local m=getmetatable(t) if not m then @@ -9699,7 +9745,7 @@ do -- create closure to overcome 200 locals limit package.loaded["trac-inf"] = package.loaded["trac-inf"] or true --- original size: 8253, stripped down to: 5675 +-- original size: 8284, stripped down to: 5698 if not modules then modules={} end modules ['trac-inf']={ version=1.001, @@ -9830,8 +9876,9 @@ function statistics.show() local hashchar=tonumber(status.luatex_hashchars) local hashtype=status.luatex_hashtype local mask=lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", @@ -10034,7 +10081,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-lua"] = package.loaded["util-lua"] or true --- original size: 6406, stripped down to: 4574 +-- original size: 6333, stripped down to: 4543 if not modules then modules={} end modules ['util-lua']={ version=1.001, @@ -10053,7 +10100,6 @@ local report_lua=logs.reporter("system","lua") local report_mem=logs.reporter("system","lua memory") local tracestripping=false local tracememory=false -local forcestupidcompile=true luautilities.stripcode=true luautilities.alwaysstripcode=false luautilities.nofstrippedchunks=0 @@ -20757,8 +20803,8 @@ end -- of closure -- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua -- skipped libraries : - --- original bytes : 855185 --- stripped bytes : 309906 +-- original bytes : 858077 +-- stripped bytes : 311857 -- end library merge diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 54acbd16e..fb24a8705 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.10.24 10:30} +\newcontextversion{2017.10.29 15:44} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 99243fd9d..9bdd54063 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2017.10.24 10:30} +\edef\contextversion{2017.10.29 15:44} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii index 85297dd12..61ddaa391 100644 --- a/tex/context/base/mkii/mult-cs.mkii +++ b/tex/context/base/mkii/mult-cs.mkii @@ -796,6 +796,7 @@ \setinterfaceconstant{fieldoffset}{offsetpole} \setinterfaceconstant{file}{soubor} \setinterfaceconstant{filler}{filler} +\setinterfaceconstant{filter}{filter} \setinterfaceconstant{filtercommand}{filtercommand} \setinterfaceconstant{finalnamesep}{finalnamesep} \setinterfaceconstant{finalpagesep}{finalpagesep} diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii index 3fd291e1e..5f8545a90 100644 --- a/tex/context/base/mkii/mult-de.mkii +++ b/tex/context/base/mkii/mult-de.mkii @@ -796,6 +796,7 @@ \setinterfaceconstant{fieldoffset}{feldoffset} \setinterfaceconstant{file}{datei} \setinterfaceconstant{filler}{filler} +\setinterfaceconstant{filter}{filter} \setinterfaceconstant{filtercommand}{filtercommand} \setinterfaceconstant{finalnamesep}{finalnamesep} \setinterfaceconstant{finalpagesep}{finalpagesep} diff --git a/tex/context/base/mkiv/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua index ba767ccab..18a915692 100644 --- a/tex/context/base/mkiv/anch-pgr.lua +++ b/tex/context/base/mkiv/anch-pgr.lua @@ -17,7 +17,6 @@ if not modules then modules = { } end modules ['anch-pgr'] = { -- will discuss this issue. local tonumber = tonumber -local abs, div, floor, round, min, max = math.abs, math.div, math.floor, math.round, math.min, math.max local sort, concat = table.sort, table.concat local splitter = lpeg.splitat(":") local lpegmatch = lpeg.match diff --git a/tex/context/base/mkiv/char-def.lua b/tex/context/base/mkiv/char-def.lua index c35832cc3..58e1f2c44 100644 --- a/tex/context/base/mkiv/char-def.lua +++ b/tex/context/base/mkiv/char-def.lua @@ -64078,7 +64078,6 @@ characters.data={ direction="on", linebreak="al", mathclass="binary", - mathname="bullet", unicodeslot=0x2219, }, [0x221A]={ diff --git a/tex/context/base/mkiv/colo-icc.lua b/tex/context/base/mkiv/colo-icc.lua index f7ed561c1..638c6c4c4 100644 --- a/tex/context/base/mkiv/colo-icc.lua +++ b/tex/context/base/mkiv/colo-icc.lua @@ -8,7 +8,6 @@ if not modules then modules = { } end modules ['colo-icc'] = { local char, byte, gsub, match, format, strip = string.char, string.byte, string.gsub, string.match, string.format, string.strip local readstring, readnumber = io.readstring, io.readnumber -local formatters = string.formatters local colors = attributes and attributes.colors or { } -- when used in mtxrun diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 7127cfc4c..596562074 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.10.24 10:30} +\newcontextversion{2017.10.29 15:44} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/mkiv/cont-run.lua b/tex/context/base/mkiv/cont-run.lua index 657973f59..73620adb6 100644 --- a/tex/context/base/mkiv/cont-run.lua +++ b/tex/context/base/mkiv/cont-run.lua @@ -34,9 +34,9 @@ local logfilename = "sandbox.log" local function registerstats() statistics.register("sandboxing", function() if trace_files then - return string.format("%s calls, %s rejected, logdata in '%s'",nofcalls,nofrejected,logfilename) + return string.format("%i calls, %i rejected, logdata in '%s'",nofcalls,nofrejected,logfilename) else - return string.format("%s calls, %s rejected",nofcalls,nofrejected) + return string.format("%i calls, %i rejected",nofcalls,nofrejected) end end) registerstats = false diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index a2cf1f308..34a8d186c 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -41,7 +41,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.10.24 10:30} +\edef\contextversion{2017.10.29 15:44} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/core-con.lua b/tex/context/base/mkiv/core-con.lua index 41d0956cd..edba24f10 100644 --- a/tex/context/base/mkiv/core-con.lua +++ b/tex/context/base/mkiv/core-con.lua @@ -901,39 +901,39 @@ converters.verbose = verbose -- verbose english local words = { - [0] = "zero", - [1] = "one", - [2] = "two", - [3] = "three", - [4] = "four", - [5] = "five", - [6] = "six", - [7] = "seven", - [8] = "eight", - [9] = "nine", - [10] = "ten", - [11] = "eleven", - [12] = "twelve", - [13] = "thirteen", - [14] = "fourteen", - [15] = "fifteen", - [16] = "sixteen", - [17] = "seventeen", - [18] = "eighteen", - [19] = "nineteen", - [20] = "twenty", - [30] = "thirty", - [40] = "forty", - [50] = "fifty", - [60] = "sixty", - [70] = "seventy", - [80] = "eighty", - [90] = "ninety", - [100] = "hundred", - [1000] = "thousand", - [1000^2] = "million", - [1000^3] = "billion", - [1000^4] = "trillion", + [0] = "zero", + [1] = "one", + [2] = "two", + [3] = "three", + [4] = "four", + [5] = "five", + [6] = "six", + [7] = "seven", + [8] = "eight", + [9] = "nine", + [10] = "ten", + [11] = "eleven", + [12] = "twelve", + [13] = "thirteen", + [14] = "fourteen", + [15] = "fifteen", + [16] = "sixteen", + [17] = "seventeen", + [18] = "eighteen", + [19] = "nineteen", + [20] = "twenty", + [30] = "thirty", + [40] = "forty", + [50] = "fifty", + [60] = "sixty", + [70] = "seventy", + [80] = "eighty", + [90] = "ninety", + [100] = "hundred", + [1000] = "thousand", + [1000000] = "million", + [1000000000] = "billion", + [1000000000000] = "trillion", } local function translate(n) @@ -979,10 +979,10 @@ local function translate(n) end return n end - n = compose_two(n,1000^4) - n = compose_two(n,1000^3) - n = compose_two(n,1000^2) - n = compose_two(n,1000^1) + n = compose_two(n,1000000000000) + n = compose_two(n,1000000000) + n = compose_two(n,1000000) + n = compose_two(n,1000) if n > 0 then compose_one(n) end @@ -1007,55 +1007,55 @@ data.en = data.english -- verbose spanish (unchecked) local words = { - [1] = "uno", - [2] = "dos", - [3] = "tres", - [4] = "cuatro", - [5] = "cinco", - [6] = "seis", - [7] = "siete", - [8] = "ocho", - [9] = "nueve", - [10] = "diez", - [11] = "once", - [12] = "doce", - [13] = "trece", - [14] = "catorce", - [15] = "quince", - [16] = "dieciséis", - [17] = "diecisiete", - [18] = "dieciocho", - [19] = "diecinueve", - [20] = "veinte", - [21] = "veintiuno", - [22] = "veintidós", - [23] = "veintitrés", - [24] = "veinticuatro", - [25] = "veinticinco", - [26] = "veintiséis", - [27] = "veintisiete", - [28] = "veintiocho", - [29] = "veintinueve", - [30] = "treinta", - [40] = "cuarenta", - [50] = "cincuenta", - [60] = "sesenta", - [70] = "setenta", - [80] = "ochenta", - [90] = "noventa", - [100] = "ciento", - [200] = "doscientos", - [300] = "trescientos", - [400] = "cuatrocientos", - [500] = "quinientos", - [600] = "seiscientos", - [700] = "setecientos", - [800] = "ochocientos", - [900] = "novecientos", - [1000] = "mil", - [1000^2] = "millón", - [1000^3] = "mil millones", - [1000^4] = "billón", + [1] = "uno", + [2] = "dos", + [3] = "tres", + [4] = "cuatro", + [5] = "cinco", + [6] = "seis", + [7] = "siete", + [8] = "ocho", + [9] = "nueve", + [10] = "diez", + [11] = "once", + [12] = "doce", + [13] = "trece", + [14] = "catorce", + [15] = "quince", + [16] = "dieciséis", + [17] = "diecisiete", + [18] = "dieciocho", + [19] = "diecinueve", + [20] = "veinte", + [21] = "veintiuno", + [22] = "veintidós", + [23] = "veintitrés", + [24] = "veinticuatro", + [25] = "veinticinco", + [26] = "veintiséis", + [27] = "veintisiete", + [28] = "veintiocho", + [29] = "veintinueve", + [30] = "treinta", + [40] = "cuarenta", + [50] = "cincuenta", + [60] = "sesenta", + [70] = "setenta", + [80] = "ochenta", + [90] = "noventa", + [100] = "ciento", + [200] = "doscientos", + [300] = "trescientos", + [400] = "cuatrocientos", + [500] = "quinientos", + [600] = "seiscientos", + [700] = "setecientos", + [800] = "ochocientos", + [900] = "novecientos", + [1000] = "mil", + [1000000] = "millón", + [1000000000] = "mil millones", + [1000000000000] = "billón", } local function translate(n) @@ -1078,7 +1078,7 @@ local function translate(n) t[#t+1] = words[1000] -- x hundred (n.b. this will not give thirteen hundred because -- compose_one(n) is only called after - -- `n = compose(two(n, 1000^1))`. + -- n = compose(two(n, 1000)) elseif a > 0 then t[#t+1] = words[a*100] end @@ -1106,10 +1106,10 @@ local function translate(n) end return n end - n = compose_two(n,1000^4) - n = compose_two(n,1000^3) - n = compose_two(n,1000^2) - n = compose_two(n,1000^1) + n = compose_two(n,1000000000000) + n = compose_two(n,1000000000) + n = compose_two(n,1000000) + n = compose_two(n,1000) if n > 0 then compose_one(n) end diff --git a/tex/context/base/mkiv/core-env.lua b/tex/context/base/mkiv/core-env.lua index 583a6ed1e..0ef37a6d6 100644 --- a/tex/context/base/mkiv/core-env.lua +++ b/tex/context/base/mkiv/core-env.lua @@ -57,7 +57,7 @@ setmetatableindex(texmodes, function(t,k) local m = modes[k] if m then return m() - else + elseif k then local n = "mode>" .. k if cache[n].mode == 0 then return false @@ -65,6 +65,8 @@ setmetatableindex(texmodes, function(t,k) rawset(modes,k, function() return texgetcount(n) == 1 end) return texgetcount(n) == 1 -- 2 is prevented end + else + return false end end) setmetatablenewindex(texmodes, function(t,k) diff --git a/tex/context/base/mkiv/font-chk.lua b/tex/context/base/mkiv/font-chk.lua index d9bb497ad..106749078 100644 --- a/tex/context/base/mkiv/font-chk.lua +++ b/tex/context/base/mkiv/font-chk.lua @@ -10,6 +10,7 @@ if not modules then modules = { } end modules ['font-chk'] = { -- move to the nodes namespace local next = next +local floor = math.floor local context = context @@ -190,7 +191,7 @@ local variants = allocate { { tag = "yellow", r = .6, g = .6, b = 0 }, } -local pdf_blob = "pdf: q %0.6F 0 0 %0.6F 0 0 cm %s %s %s rg %s %s %s RG 10 M 1 j 1 J 0.05 w %s Q" +local pdf_blob = "pdf: q %.6F 0 0 %.6F 0 0 cm %s %s %s rg %s %s %s RG 10 M 1 j 1 J 0.05 w %s Q" local cache = { } -- saves some tables but not that impressive @@ -217,7 +218,7 @@ local function addmissingsymbols(tfmdata) -- we can have an alternative with rul local name = fake.name local privatename = formatters["placeholder %s %s"](name,tag) if not hasprivate(tfmdata,privatename) then - local hash = formatters["%s_%s_%s_%s_%s_%s"](name,tag,r,g,b,size) + local hash = formatters["%s_%s_%1.3f_%1.3f_%1.3f_%i"](name,tag,r,g,b,floor(size)) local char = cache[hash] if not char then char = { diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index 75d6b08a8..2dce9b6e4 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -14,6 +14,7 @@ local sort, insert, concat = table.sort, table.insert, table.concat local sortedkeys, sortedhash, serialize, fastcopy = table.sortedkeys, table.sortedhash, table.serialize, table.fastcopy local derivetable = table.derive local ioflush = io.flush +local round = math.round local trace_defining = false trackers.register("fonts.defining", function(v) trace_defining = v end) local trace_scaling = false trackers.register("fonts.scaling", function(v) trace_scaling = v end) @@ -1037,13 +1038,15 @@ function constructors.hashinstance(specification,force) specification.hash = hash end if size < 1000 and designsizes[hash] then - size = math.round(constructors.scaled(size,designsizes[hash])) - specification.size = size + size = round(constructors.scaled(size,designsizes[hash])) + else + size = round(size) end + specification.size = size if fallbacks then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. fallbacks + return hash .. ' @ ' .. size .. ' @ ' .. fallbacks else - return hash .. ' @ ' .. tostring(size) + return hash .. ' @ ' .. size end end diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua index 89466eca8..ec7eabb53 100644 --- a/tex/context/base/mkiv/font-ctx.lua +++ b/tex/context/base/mkiv/font-ctx.lua @@ -158,7 +158,7 @@ helpers.name = getfontname local addformatter = utilities.strings.formatters.add -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then addformatter(formatters,"font:name", [["'"..fontname(%s).."'"]], "local fontname = fonts.helpers.name") addformatter(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced") @@ -1056,7 +1056,6 @@ do -- else too many locals local scanboolean = scanners.boolean local setmacro = tokens.setters.macro - local scanners = interfaces.scanners -- function commands.definefont_one(str) @@ -1456,7 +1455,7 @@ do -- else too many locals name,id,nice_cs(cs),classfeatures,fontfeatures,classfallbacks,fontfallbacks,2) end -- resolved (when designsize is used): - local size = tfmdata.parameters.size or 655360 + local size = round(tfmdata.parameters.size or 655360) setmacro("somefontsize",size.."sp") -- ctx_setsomefontsize(size .. "sp") texsetcount("scaledfontsize",size) @@ -1493,7 +1492,7 @@ do -- else too many locals name,id,nice_cs(cs),classfeatures,fontfeatures,classfallbacks,fontfallbacks,"-") end -- resolved (when designsize is used): - local size = tfmdata.parameters.size or 655360 + local size = round(tfmdata.parameters.size or 655360) setmacro("somefontsize",size.."sp") -- ctx_setsomefontsize(size .. "sp") texsetcount("scaledfontsize",size) @@ -1507,7 +1506,7 @@ do -- else too many locals csnames[tfmdata] = specification.cs texdefinefont(global,cs,tfmdata) -- resolved (when designsize is used): - local size = fontdata[tfmdata].parameters.size or 0 + local size = round(fontdata[tfmdata].parameters.size or 0) -- ctx_setsomefontsize(size .. "sp") setmacro("somefontsize",size.."sp") texsetcount("scaledfontsize",size) @@ -1668,7 +1667,7 @@ do -- else too many locals function fonts.infofont() if infofont == 0 then - infofont = definers.define { name = "dejavusansmono", size = tex.sp("6pt") } + infofont = definers.define { name = "dejavusansmono", size = texsp("6pt") } end return infofont end @@ -1726,7 +1725,7 @@ function constructors.calculatescale(tfmdata,scaledpoints,relativeid,specificati -- scaledpoints = rscale * scaledpoints -- end -- end - return scaledpoints, delta + return round(scaledpoints), round(delta) end local designsizes = constructors.designsizes @@ -1744,17 +1743,19 @@ function constructors.hashinstance(specification,force) end if size < 1000 and designsizes[hash] then size = round(constructors.scaled(size,designsizes[hash])) - specification.size = size + else + size = round(size) end + specification.size = size if fallbacks then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. fallbacks + return hash .. ' @ ' .. size .. ' @ ' .. fallbacks else local scalemode = specification.scalemode local special = scalemode and specialscale[scalemode] if special then - return hash .. ' @ ' .. tostring(size) .. ' @ ' .. special + return hash .. ' @ ' .. size .. ' @ ' .. special else - return hash .. ' @ ' .. tostring(size) + return hash .. ' @ ' .. size end end end @@ -2116,14 +2117,14 @@ function loggers.reportdefinedfonts() local parameters = data.parameters or { } tn = tn + 1 t[tn] = { - format("%03i",id or 0), - format("%09i",parameters.size or 0), - properties.type or "real", - properties.format or "unknown", - properties.name or "", - properties.psname or "", - properties.fullname or "", - properties.sharedwith or "", + formatters["%03i"](id or 0), + formatters["%p" ](parameters.size or 0), + properties.type or "real", + properties.format or "unknown", + properties.name or "", + properties.psname or "", + properties.fullname or "", + properties.sharedwith or "", } end formatcolumns(t," ") diff --git a/tex/context/base/mkiv/font-def.lua b/tex/context/base/mkiv/font-def.lua index 19d980e48..97d25f180 100644 --- a/tex/context/base/mkiv/font-def.lua +++ b/tex/context/base/mkiv/font-def.lua @@ -512,7 +512,7 @@ function definers.read(specification,size,id) -- id can be optional, name can al local properties = tfmdata.properties or { } local parameters = tfmdata.parameters or { } report_defining("using %a font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a", - properties.format or "unknown", id, properties.name, parameters.size, properties.encodingbytes, + properties.format or "unknown", id or "-", properties.name, parameters.size, properties.encodingbytes, properties.encodingname, properties.fullname, basename(properties.filename)) end statistics.stoptiming(fonts) diff --git a/tex/context/base/mkiv/font-ext.lua b/tex/context/base/mkiv/font-ext.lua index 6020d6374..a393b18fe 100644 --- a/tex/context/base/mkiv/font-ext.lua +++ b/tex/context/base/mkiv/font-ext.lua @@ -772,7 +772,7 @@ local pop = { "pop" } -- local h = h * bp -- local v = setmetatableindex(function(t,w) -- -- local v = { "rule", h, w } --- local v = { "pdf", "origin", formatters["0 0 %0.6F %0.6F re F"](w*bp,h) } +-- local v = { "pdf", "origin", formatters["0 0 %.6F %.6F re F"](w*bp,h) } -- t[w] = v -- return v -- end) @@ -783,7 +783,7 @@ local pop = { "pop" } -- local forecache = setmetatableindex(function(t,h) -- local h = h * bp -- local v = setmetatableindex(function(t,w) --- local v = { "pdf", "origin", formatters["%0.6F w 0 0 %0.6F %0.6F re S"](0.25*65536*bp,w*bp,h) } +-- local v = { "pdf", "origin", formatters["%.6F w 0 0 %.6F %.6F re S"](0.25*65536*bp,w*bp,h) } -- t[w] = v -- return v -- end) @@ -799,7 +799,7 @@ local backcache = setmetatableindex(function(t,h) local v = setmetatableindex(function(t,d) local d = d * bp local v = setmetatableindex(function(t,w) - local v = { "pdf", "origin", formatters["%0.6F w 0 %0.6F %0.6F %0.6F re f"](r,-d,w*bp,h+d) } + local v = { "pdf", "origin", formatters["%.6F w 0 %.6F %.6F %.6F re f"](r,-d,w*bp,h+d) } t[w] = v return v end) @@ -816,8 +816,8 @@ local forecache = setmetatableindex(function(t,h) local d = d * bp local v = setmetatableindex(function(t,w) -- the frame goes through the boundingbox - -- local v = { "pdf", "origin", formatters["[] 0 d 0 J %0.6F w 0 %0.6F %0.6F %0.6F re S"](r,-d,w*bp,h+d) } - local v = { "pdf", "origin", formatters["[] 0 d 0 J %0.6F w %0.6F %0.6F %0.6F %0.6F re S"](r,r/2,-d+r/2,w*bp-r,h+d-r) } + -- local v = { "pdf", "origin", formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F re S"](r,-d,w*bp,h+d) } + local v = { "pdf", "origin", formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F %.6F re S"](r,r/2,-d+r/2,w*bp-r,h+d-r) } t[w] = v return v end) diff --git a/tex/context/base/mkiv/font-ini.mkvi b/tex/context/base/mkiv/font-ini.mkvi index c0121c18b..c4445b7b9 100644 --- a/tex/context/base/mkiv/font-ini.mkvi +++ b/tex/context/base/mkiv/font-ini.mkvi @@ -835,7 +835,7 @@ \fi \font_helpers_update_font_parameters \font_helpers_update_font_class_parameters - % \writestatus{fonts}{low level define: #csname/\somefontfile/\number\d_font_scaled_font_size/\fontface/\number\d_font_scaled_text_face}% + %\writestatus{fonts}{low level define: #csname/\somefontfile/\number\d_font_scaled_font_size/\fontface/\number\d_font_scaled_text_face}% \clf_definefont_two \ifx\fontclass\empty\s!false\else\s!true\fi {#csname}% diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index 0fc525805..ebc74b1d0 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -165,7 +165,7 @@ local function tounicode16sequence(unicodes) return concat(t) end -local function tounicode(unicode,name) +local function tounicode(unicode) if type(unicode) == "table" then local t = { } for l=1,#unicode do diff --git a/tex/context/base/mkiv/font-mps.lua b/tex/context/base/mkiv/font-mps.lua index 69b2af68c..cde34f2ae 100644 --- a/tex/context/base/mkiv/font-mps.lua +++ b/tex/context/base/mkiv/font-mps.lua @@ -21,9 +21,9 @@ fonts = fonts or { } local metapost = fonts.metapost or { } fonts.metapost = metapost -local f_moveto = formatters["(%F,%F)"] -local f_lineto = formatters["--(%F,%F)"] -local f_curveto = formatters["..controls(%F,%F)and(%F,%F)..(%F,%F)"] +local f_moveto = formatters["(%.6F,%.6F)"] +local f_lineto = formatters["--(%.6F,%.6F)"] +local f_curveto = formatters["..controls(%.6F,%.6F)and(%.6F,%.6F)..(%.6F,%.6F)"] local s_cycle = "--cycle" local f_nofill = formatters["nofill %s;"] @@ -32,8 +32,8 @@ local f_dofill = formatters["fill %s;"] local f_draw_trace = formatters["drawpathonly %s;"] local f_draw = formatters["draw %s;"] -local f_boundingbox = formatters["((%F,%F)--(%F,%F)--(%F,%F)--(%F,%F)--cycle)"] -local f_vertical = formatters["((%F,%F)--(%F,%F))"] +local f_boundingbox = formatters["((%.6F,%.6F)--(%.6F,%.6F)--(%.6F,%.6F)--(%.6F,%.6F)--cycle)"] +local f_vertical = formatters["((%.6F,%.6F)--(%.6F,%.6F))"] function metapost.boundingbox(d,factor) local bounds = d.boundingbox @@ -275,9 +275,9 @@ local parameters = fonts.hashes.parameters local shapes = fonts.hashes.shapes local topaths = metapost.paths -local f_code = formatters["mfun_do_outline_text_flush(%q,%i,%F,%F)(%,t);"] -local f_rule = formatters["mfun_do_outline_rule_flush(%q,%F,%F,%F,%F);"] -local f_bounds = formatters["checkbounds(%F,%F,%F,%F);"] +local f_code = formatters["mfun_do_outline_text_flush(%q,%i,%.6F,%.6F)(%,t);"] +local f_rule = formatters["mfun_do_outline_rule_flush(%q,%.6F,%.6F,%.6F,%.6F);"] +local f_bounds = formatters["checkbounds(%.6F,%.6F,%.6F,%.6F);"] local s_nothing = "(origin scaled 10)" local sc = 10 diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua index b9671ab18..872247d43 100644 --- a/tex/context/base/mkiv/font-ocl.lua +++ b/tex/context/base/mkiv/font-ocl.lua @@ -18,8 +18,8 @@ local tounicode = fonts.mappings.tounicode local otf = fonts.handlers.otf -local f_color = formatters["%f %f %f rg"] -local f_gray = formatters["%f g"] +local f_color = formatters["%.3f %.3f %.3f rg"] +local f_gray = formatters["%.3f g"] if context then diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua index 70f5e528f..be6d365f1 100644 --- a/tex/context/base/mkiv/grph-inc.lua +++ b/tex/context/base/mkiv/grph-inc.lua @@ -103,7 +103,7 @@ local v_local = variables["local"] local v_default = variables.default local v_auto = variables.auto -local maxdimen = 2^30-1 +local maxdimen = 0x3FFFFFFF -- 2^30-1 local ctx_doscalefigure = context.doscalefigure local ctx_relocateexternalfigure = context.relocateexternalfigure diff --git a/tex/context/base/mkiv/l-io.lua b/tex/context/base/mkiv/l-io.lua index 75e704a34..fa3ad3c4c 100644 --- a/tex/context/base/mkiv/l-io.lua +++ b/tex/context/base/mkiv/l-io.lua @@ -10,7 +10,7 @@ local io = io local open, flush, write, read = io.open, io.flush, io.write, io.read local byte, find, gsub, format = string.byte, string.find, string.gsub, string.format local concat = table.concat -local floor = math.floor +----- floor = math.floor local type = type if string.find(os.getenv("PATH"),";",1,true) then @@ -27,9 +27,9 @@ end -- to less intermediate large allocations. This phenomena was discussed on the -- luatex dev list. -local large = 2^24 -- 16 MB -local medium = large / 16 -- 1 MB -local small = medium / 8 +local large = 0x01000000 -- 2^24 16.777.216 +local medium = 0x00100000 -- 2^20 1.048.576 +local small = 0x00020000 -- 2^17 131.072 -- local function readall(f) -- local size = f:seek("end") @@ -54,7 +54,7 @@ local small = medium / 8 -- end local function readall(f) --- return f:read("*all") + -- return f:read("*all") local size = f:seek("end") if size > 0 then f:seek("set",0) diff --git a/tex/context/base/mkiv/l-lua.lua b/tex/context/base/mkiv/l-lua.lua index 88cde6d1e..aa2644b9f 100644 --- a/tex/context/base/mkiv/l-lua.lua +++ b/tex/context/base/mkiv/l-lua.lua @@ -17,28 +17,35 @@ if not modules then modules = { } end modules ['l-lua'] = { -- utf.* -- bit32 --- compatibility hacksand helpers +-- compatibility hacks and helpers -_MAJORVERSION, _MINORVERSION = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION, LUAMINORVERSION = string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION = tonumber(_MAJORVERSION) or 5 -_MINORVERSION = tonumber(_MINORVERSION) or 1 -_LUAVERSION = _MAJORVERSION + _MINORVERSION/10 +LUAMAJORVERSION = tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION = tonumber(LUAMINORVERSION) or 1 +LUAVERSION = LUAMAJORVERSION + LUAMINORVERSION/10 -if _LUAVERSION < 5.2 and jit then +if LUAVERSION < 5.2 and jit then -- -- we want loadstring cum suis to behave like 5.2 -- - _MINORVERSION = 2 - _LUAVERSION = 5.2 + MINORVERSION = 2 + LUAVERSION = 5.2 end +_LUAVERSION = LUAVERSION -- for old times sake, will go away + -- lpeg if not lpeg then lpeg = require("lpeg") end +-- if utf8 then +-- utf8lua = utf8 +-- utf8 = nil +-- end + -- basics: if loadstring then @@ -220,3 +227,32 @@ if not FFISUPPORTED then elseif not ffi.number then ffi.number = tonumber end + +-- if not bit32 then +-- bit32 = load ( [[ return { +-- band = function(a,b) +-- return (a & b) +-- end, +-- bnot = function(a) +-- return ~a & 0xFFFFFFFF +-- end, +-- bor = function(a,b) +-- return (a | b) & 0xFFFFFFFF +-- end, +-- btest = function(a,b) +-- return (a & b) ~= 0 +-- end, +-- bxor = function(a,b) +-- return (a ~ b) & 0xFFFFFFFF +-- end, +-- extract = function(a,b,c) +-- return (a >> b) & ~(-1 << (c or 1)) +-- end, +-- lshift = function(a,b) +-- return (a << b) & 0xFFFFFFFF +-- end, +-- rshift = function(a,b) +-- return (a >> b) +-- end, +-- } ]] ) () +-- end diff --git a/tex/context/base/mkiv/l-table.lua b/tex/context/base/mkiv/l-table.lua index e37c74f8b..ba8712ddb 100644 --- a/tex/context/base/mkiv/l-table.lua +++ b/tex/context/base/mkiv/l-table.lua @@ -1392,3 +1392,26 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end + +-- lua 5.3: + +if not table.move then + + function table.move(a1,f,e,t,a2) + if a2 and a1 ~= a2 then + for i=f,e do + a2[t] = a1[i] + t = t + 1 + end + return a2 + else + t = t + e - f + for i=e,f,-1 do + a1[t] = a1[i] + t = t - 1 + end + return a1 + end + end + +end diff --git a/tex/context/base/mkiv/l-unicode.lua b/tex/context/base/mkiv/l-unicode.lua index b913d0cfc..e4a182980 100644 --- a/tex/context/base/mkiv/l-unicode.lua +++ b/tex/context/base/mkiv/l-unicode.lua @@ -29,6 +29,9 @@ utf.values = utf.values or string.utfvalues -- string.characterpairs -- string.bytes -- string.bytepairs +-- string.utflength +-- string.utfvalues +-- string.utfcharacters local type = type local char, byte, format, sub, gmatch = string.char, string.byte, string.format, string.sub, string.gmatch @@ -64,53 +67,67 @@ end if not utf.char then - local floor, char = math.floor, string.char - - function utf.char(n) - if n < 0x80 then - -- 0aaaaaaa : 0x80 - return char(n) - elseif n < 0x800 then - -- 110bbbaa : 0xC0 : n >> 6 - -- 10aaaaaa : 0x80 : n & 0x3F - return char( - 0xC0 + floor(n/0x40), - 0x80 + (n % 0x40) - ) - elseif n < 0x10000 then - -- 1110bbbb : 0xE0 : n >> 12 - -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F - -- 10aaaaaa : 0x80 : n & 0x3F - return char( - 0xE0 + floor(n/0x1000), - 0x80 + (floor(n/0x40) % 0x40), - 0x80 + (n % 0x40) - ) - elseif n < 0x200000 then - -- 11110ccc : 0xF0 : n >> 18 - -- 10ccbbbb : 0x80 : (n >> 12) & 0x3F - -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F - -- 10aaaaaa : 0x80 : n & 0x3F - -- dddd : ccccc - 1 - return char( - 0xF0 + floor(n/0x40000), - 0x80 + (floor(n/0x1000) % 0x40), - 0x80 + (floor(n/0x40) % 0x40), - 0x80 + (n % 0x40) - ) - else - return "" + utf.char = string.utfcharacter or (utf8 and utf8.char) + + if not utf.char then + + -- no multiples + + local floor, char = math.floor, string.char + + function utf.char(n) + if n < 0x80 then + -- 0aaaaaaa : 0x80 + return char(n) + elseif n < 0x800 then + -- 110bbbaa : 0xC0 : n >> 6 + -- 10aaaaaa : 0x80 : n & 0x3F + return char( + 0xC0 + floor(n/0x40), + 0x80 + (n % 0x40) + ) + elseif n < 0x10000 then + -- 1110bbbb : 0xE0 : n >> 12 + -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F + -- 10aaaaaa : 0x80 : n & 0x3F + return char( + 0xE0 + floor(n/0x1000), + 0x80 + (floor(n/0x40) % 0x40), + 0x80 + (n % 0x40) + ) + elseif n < 0x200000 then + -- 11110ccc : 0xF0 : n >> 18 + -- 10ccbbbb : 0x80 : (n >> 12) & 0x3F + -- 10bbbbaa : 0x80 : (n >> 6) & 0x3F + -- 10aaaaaa : 0x80 : n & 0x3F + -- dddd : ccccc - 1 + return char( + 0xF0 + floor(n/0x40000), + 0x80 + (floor(n/0x1000) % 0x40), + 0x80 + (floor(n/0x40) % 0x40), + 0x80 + (n % 0x40) + ) + else + return "" + end end + end end if not utf.byte then - local utf8byte = patterns.utf8byte + utf.byte = string.utfvalue or (utf8 and utf8.codepoint) + + if not utf.byte then + + local utf8byte = patterns.utf8byte + + function utf.byte(c) + return lpegmatch(utf8byte,c) + end - function utf.byte(c) - return lpegmatch(utf8byte,c) end end @@ -253,83 +270,89 @@ end if not utf.len then - -- -- alternative 1: 0.77 - -- - -- local utfcharcounter = utfbom^-1 * Cs((p_utf8char/'!')^0) - -- - -- function utf.len(str) - -- return #lpegmatch(utfcharcounter,str or "") - -- end - -- - -- -- alternative 2: 1.70 - -- - -- local n = 0 - -- - -- local utfcharcounter = utfbom^-1 * (p_utf8char/function() n = n + 1 end)^0 -- slow - -- - -- function utf.length(str) - -- n = 0 - -- lpegmatch(utfcharcounter,str or "") - -- return n - -- end - -- - -- -- alternative 3: 0.24 (native unicode.utf8.len: 0.047) - - -- local n = 0 - -- - -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( Cp() * ( - -- -- patterns.utf8one ^1 * Cc(1) - -- -- + patterns.utf8two ^1 * Cc(2) - -- -- + patterns.utf8three^1 * Cc(3) - -- -- + patterns.utf8four ^1 * Cc(4) ) * Cp() / function(f,d,t) n = n + (t - f)/d end - -- -- )^0 ) -- just as many captures as below - -- - -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( - -- -- (Cmt(patterns.utf8one ^1,function(_,_,s) n = n + #s return true end)) - -- -- + (Cmt(patterns.utf8two ^1,function(_,_,s) n = n + #s/2 return true end)) - -- -- + (Cmt(patterns.utf8three^1,function(_,_,s) n = n + #s/3 return true end)) - -- -- + (Cmt(patterns.utf8four ^1,function(_,_,s) n = n + #s/4 return true end)) - -- -- )^0 ) -- not interesting as it creates strings but sometimes faster - -- - -- -- The best so far: - -- - -- local utfcharcounter = utfbom^-1 * P ( ( - -- Cp() * (patterns.utf8one )^1 * Cp() / function(f,t) n = n + t - f end - -- + Cp() * (patterns.utf8two )^1 * Cp() / function(f,t) n = n + (t - f)/2 end - -- + Cp() * (patterns.utf8three)^1 * Cp() / function(f,t) n = n + (t - f)/3 end - -- + Cp() * (patterns.utf8four )^1 * Cp() / function(f,t) n = n + (t - f)/4 end - -- )^0 ) - - -- function utf.len(str) - -- n = 0 - -- lpegmatch(utfcharcounter,str or "") - -- return n - -- end - - local n, f = 0, 1 + utf.len = string.utflength or (utf8 and utf8.len) + + if not utf.len then + + -- -- alternative 1: 0.77 + -- + -- local utfcharcounter = utfbom^-1 * Cs((p_utf8char/'!')^0) + -- + -- function utf.len(str) + -- return #lpegmatch(utfcharcounter,str or "") + -- end + -- + -- -- alternative 2: 1.70 + -- + -- local n = 0 + -- + -- local utfcharcounter = utfbom^-1 * (p_utf8char/function() n = n + 1 end)^0 -- slow + -- + -- function utf.length(str) + -- n = 0 + -- lpegmatch(utfcharcounter,str or "") + -- return n + -- end + -- + -- -- alternative 3: 0.24 (native unicode.utf8.len: 0.047) + + -- local n = 0 + -- + -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( Cp() * ( + -- -- patterns.utf8one ^1 * Cc(1) + -- -- + patterns.utf8two ^1 * Cc(2) + -- -- + patterns.utf8three^1 * Cc(3) + -- -- + patterns.utf8four ^1 * Cc(4) ) * Cp() / function(f,d,t) n = n + (t - f)/d end + -- -- )^0 ) -- just as many captures as below + -- + -- -- local utfcharcounter = lpeg.patterns.utfbom^-1 * P ( ( + -- -- (Cmt(patterns.utf8one ^1,function(_,_,s) n = n + #s return true end)) + -- -- + (Cmt(patterns.utf8two ^1,function(_,_,s) n = n + #s/2 return true end)) + -- -- + (Cmt(patterns.utf8three^1,function(_,_,s) n = n + #s/3 return true end)) + -- -- + (Cmt(patterns.utf8four ^1,function(_,_,s) n = n + #s/4 return true end)) + -- -- )^0 ) -- not interesting as it creates strings but sometimes faster + -- + -- -- The best so far: + -- + -- local utfcharcounter = utfbom^-1 * P ( ( + -- Cp() * (patterns.utf8one )^1 * Cp() / function(f,t) n = n + t - f end + -- + Cp() * (patterns.utf8two )^1 * Cp() / function(f,t) n = n + (t - f)/2 end + -- + Cp() * (patterns.utf8three)^1 * Cp() / function(f,t) n = n + (t - f)/3 end + -- + Cp() * (patterns.utf8four )^1 * Cp() / function(f,t) n = n + (t - f)/4 end + -- )^0 ) + + -- function utf.len(str) + -- n = 0 + -- lpegmatch(utfcharcounter,str or "") + -- return n + -- end + + local n, f = 0, 1 + + local utfcharcounter = patterns.utfbom^-1 * Cmt ( + Cc(1) * patterns.utf8one ^1 + + Cc(2) * patterns.utf8two ^1 + + Cc(3) * patterns.utf8three^1 + + Cc(4) * patterns.utf8four ^1, + function(_,t,d) -- due to Cc no string captures, so faster + n = n + (t - f)/d + f = t + return true + end + )^0 - local utfcharcounter = patterns.utfbom^-1 * Cmt ( - Cc(1) * patterns.utf8one ^1 - + Cc(2) * patterns.utf8two ^1 - + Cc(3) * patterns.utf8three^1 - + Cc(4) * patterns.utf8four ^1, - function(_,t,d) -- due to Cc no string captures, so faster - n = n + (t - f)/d - f = t - return true + function utf.len(str) + n, f = 0, 1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n, f = 0, 1 - lpegmatch(utfcharcounter,str or "") - return n - end + -- -- these are quite a bit slower: - -- -- these are quite a bit slower: + -- utfcharcounter = utfbom^-1 * (Cmt(P(1) * R("\128\191")^0, function() n = n + 1 return true end))^0 -- 50+ times slower + -- utfcharcounter = utfbom^-1 * (Cmt(P(1), function() n = n + 1 return true end) * R("\128\191")^0)^0 -- 50- times slower - -- utfcharcounter = utfbom^-1 * (Cmt(P(1) * R("\128\191")^0, function() n = n + 1 return true end))^0 -- 50+ times slower - -- utfcharcounter = utfbom^-1 * (Cmt(P(1), function() n = n + 1 return true end) * R("\128\191")^0)^0 -- 50- times slower + end end diff --git a/tex/context/base/mkiv/lpdf-col.lua b/tex/context/base/mkiv/lpdf-col.lua index fc251fddc..d1a1af97d 100644 --- a/tex/context/base/mkiv/lpdf-col.lua +++ b/tex/context/base/mkiv/lpdf-col.lua @@ -16,7 +16,6 @@ local formatters = string.formatters local backends, lpdf, nodes = backends, lpdf, nodes local allocate = utilities.storage.allocate -local formatters = string.formatters local nodeinjections = backends.pdf.nodeinjections local codeinjections = backends.pdf.codeinjections @@ -64,7 +63,7 @@ local f_rgb = formatters["%.3F %.3F %.3F rg %.3F %.3F %.3F RG"] local f_cmyk = formatters["%.3F %.3F %.3F %.3F k %.3F %.3F %.3F %.3F K"] local f_spot = formatters["/%s cs /%s CS %s SCN %s scn"] local f_tr = formatters["Tr%s"] -local f_cm = formatters["q %F %F %F %F %F %F cm"] +local f_cm = formatters["q %.6F %.6F %.6F %.6F %.6F %.6F cm"] local f_effect = formatters["%s Tc %s w %s Tr"] local f_tr_gs = formatters["/Tr%s gs"] local f_num_1 = tostring @@ -716,7 +715,7 @@ do local pdfcolor = lpdf.color local pdftransparency = lpdf.transparency - local f_slant = formatters["q 1 0 %F 1 0 0 cm"] + local f_slant = formatters["q 1 0 %.6F 1 0 0 cm"] -- local fillcolors = { -- red = { "pdf", "origin", "1 0 0 rg" }, diff --git a/tex/context/base/mkiv/lpdf-epa.lua b/tex/context/base/mkiv/lpdf-epa.lua index d615f2bef..ac0ca3c92 100644 --- a/tex/context/base/mkiv/lpdf-epa.lua +++ b/tex/context/base/mkiv/lpdf-epa.lua @@ -40,7 +40,7 @@ local escapetex = characters.filters.utf.private.escape local bookmarks = structures.bookmarks -local maxdimen = 2^30-1 +local maxdimen = 0x3FFFFFFF -- 2^30-1 local layerspec = { -- predefining saves time "epdflinks" @@ -231,7 +231,7 @@ function codeinjections.mergereferences(specification) if not a then report_link("missing link annotation") elseif w > width or h > height or w < 0 or h < 0 or abs(x) > (maxdimen/2) or abs(y) > (maxdimen/2) then - report_link("broken link rectangle [%f %f %f %f] (max: %f)",a_llx,a_lly,a_urx,a_ury,maxdimen/2) + report_link("broken link rectangle [%.6F %.6F %.6F %.6F] (max: %.6F)",a_llx,a_lly,a_urx,a_ury,maxdimen/2) else local linktype = a.S if linktype == "GoTo" then diff --git a/tex/context/base/mkiv/lpdf-fld.lua b/tex/context/base/mkiv/lpdf-fld.lua index e8a968713..29a520790 100644 --- a/tex/context/base/mkiv/lpdf-fld.lua +++ b/tex/context/base/mkiv/lpdf-fld.lua @@ -121,39 +121,39 @@ function codeinjections.setformsmethod(name) end local flag = { -- /Ff - ReadOnly = 2^ 0, -- 1 - Required = 2^ 1, -- 2 - NoExport = 2^ 2, -- 3 - MultiLine = 2^12, -- 13 - Password = 2^13, -- 14 - NoToggleToOff = 2^14, -- 15 - Radio = 2^15, -- 16 - PushButton = 2^16, -- 17 - PopUp = 2^17, -- 18 - Edit = 2^18, -- 19 - Sort = 2^19, -- 20 - FileSelect = 2^20, -- 21 - DoNotSpellCheck = 2^22, -- 23 - DoNotScroll = 2^23, -- 24 - Comb = 2^24, -- 25 - RichText = 2^25, -- 26 - RadiosInUnison = 2^25, -- 26 - CommitOnSelChange = 2^26, -- 27 + ReadOnly = 0x00000001, -- 2^ 0 + Required = 0x00000002, -- 2^ 1 + NoExport = 0x00000004, -- 2^ 2 + MultiLine = 0x00001000, -- 2^12 + Password = 0x00002000, -- 2^13 + NoToggleToOff = 0x00004000, -- 2^14 + Radio = 0x00008000, -- 2^15 + PushButton = 0x00010000, -- 2^16 + PopUp = 0x00020000, -- 2^17 + Edit = 0x00040000, -- 2^18 + Sort = 0x00080000, -- 2^19 + FileSelect = 0x00100000, -- 2^20 + DoNotSpellCheck = 0x00400000, -- 2^22 + DoNotScroll = 0x00800000, -- 2^23 + Comb = 0x01000000, -- 2^24 + RichText = 0x02000000, -- 2^25 + RadiosInUnison = 0x02000000, -- 2^25 + CommitOnSelChange = 0x04000000, -- 2^26 } local plus = { -- /F - Invisible = 2^0, -- 1 - Hidden = 2^1, -- 2 - Printable = 2^2, -- 3 - Print = 2^2, -- 3 - NoZoom = 2^3, -- 4 - NoRotate = 2^4, -- 5 - NoView = 2^5, -- 6 - ReadOnly = 2^6, -- 7 - Locked = 2^7, -- 8 - ToggleNoView = 2^8, -- 9 - LockedContents = 2^9, -- 10, - AutoView = 2^8, -- 6 + 9 ? + Invisible = 0x00000001, -- 2^0 + Hidden = 0x00000002, -- 2^1 + Printable = 0x00000004, -- 2^2 + Print = 0x00000004, -- 2^2 + NoZoom = 0x00000008, -- 2^3 + NoRotate = 0x00000010, -- 2^4 + NoView = 0x00000020, -- 2^5 + ReadOnly = 0x00000040, -- 2^6 + Locked = 0x00000080, -- 2^7 + ToggleNoView = 0x00000100, -- 2^8 + LockedContents = 0x00000200, -- 2^9 + AutoView = 0x00000100, -- 2^8 } -- todo: check what is interfaced diff --git a/tex/context/base/mkiv/lpdf-grp.lua b/tex/context/base/mkiv/lpdf-grp.lua index 9122bd027..34925fddd 100644 --- a/tex/context/base/mkiv/lpdf-grp.lua +++ b/tex/context/base/mkiv/lpdf-grp.lua @@ -270,7 +270,7 @@ function img.package(image) -- see lpdf-u3d ** local height = boundingbox[4] local xform = img.scan { attr = resources(), - stream = formatters["%F 0 0 %F 0 0 cm /%s Do"](width,height,imagetag), + stream = formatters["%.6F 0 0 %.6F 0 0 cm /%s Do"](width,height,imagetag), bbox = { 0, 0, width/basepoints, height/basepoints }, } img.immediatewrite(xform) @@ -280,7 +280,7 @@ end -- experimental local nofpatterns = 0 -local f_pattern = formatters["q /Pattern cs /%s scn 0 0 %F %F re f Q"] -- q Q is not really needed +local f_pattern = formatters["q /Pattern cs /%s scn 0 0 %.6F %.6F re f Q"] -- q Q is not really needed local texsavebox = tex.saveboxresource diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 1d59175ca..3e05bff77 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1074,7 +1074,7 @@ end function lpdf.rotationcm(a) local s, c = sind(a), cosd(a) - return format("%0.6F %0.6F %0.6F %0.6F 0 0 cm",c,s,-s,c) + return format("%.6F %.6F %.6F %.6F 0 0 cm",c,s,-s,c) end -- ! -> universaltime diff --git a/tex/context/base/mkiv/lpdf-mis.lua b/tex/context/base/mkiv/lpdf-mis.lua index 2b2fd81e3..5fe064030 100644 --- a/tex/context/base/mkiv/lpdf-mis.lua +++ b/tex/context/base/mkiv/lpdf-mis.lua @@ -455,7 +455,7 @@ end -- temp hack: the mediabox is not under our control and has a precision of 5 digits local factor = number.dimenfactors.bp -local f_value = formatters["%0.5F"] +local f_value = formatters["%0.6F"] local function boxvalue(n) -- we could share them return pdfverbose(f_value(factor * n)) diff --git a/tex/context/base/mkiv/lpdf-u3d.lua b/tex/context/base/mkiv/lpdf-u3d.lua index c9f4a0369..dfd4c1b06 100644 --- a/tex/context/base/mkiv/lpdf-u3d.lua +++ b/tex/context/base/mkiv/lpdf-u3d.lua @@ -461,7 +461,7 @@ local function insert3d(spec) -- width, height, factor, display, controls, label }, ProcSet = pdfarray { pdfconstant("PDF"), pdfconstant("ImageC") }, } - local pwd = pdfflushstreamobject(formatters["q /GS gs %F 0 0 %F 0 0 cm /IM Do Q"](factor*width,factor*height),pw) + local pwd = pdfflushstreamobject(formatters["q /GS gs %.6F 0 0 %.6F 0 0 cm /IM Do Q"](factor*width,factor*height),pw) annot.AP = pdfdictionary { N = pdfreference(pwd) } diff --git a/tex/context/base/mkiv/luat-ini.mkiv b/tex/context/base/mkiv/luat-ini.mkiv index e19b72d14..25ad7e139 100644 --- a/tex/context/base/mkiv/luat-ini.mkiv +++ b/tex/context/base/mkiv/luat-ini.mkiv @@ -98,8 +98,8 @@ {\setcatcodetable\luacatcodes \the\everyluacode} -\edef\luamajorversion{\ctxwrite{_MINORVERSION}} -\edef\luaminorversion{\ctxwrite{_MAJORVERSION}} +\edef\luamajorversion{\ctxwrite{LUAMINORVERSION}} +\edef\luaminorversion{\ctxwrite{LUAMAJORVERSION}} %D We need a way to pass strings safely to \LUA\ without the %D need for tricky escaping. Compare: diff --git a/tex/context/base/mkiv/math-ini.lua b/tex/context/base/mkiv/math-ini.lua index c4bb822d6..5c495dbd7 100644 --- a/tex/context/base/mkiv/math-ini.lua +++ b/tex/context/base/mkiv/math-ini.lua @@ -17,7 +17,8 @@ if not modules then modules = { } end modules ['math-ini'] = { local formatters, find = string.formatters, string.find local utfchar, utfbyte, utflength = utf.char, utf.byte, utf.length -local floor = math.floor +----- floor = math.floor +local sortedhash = table.sortedhash local toboolean = toboolean local context = context @@ -285,7 +286,7 @@ function mathematics.define(family) family = family or 0 family = families[family] or family local data = characters.data - for unicode, character in next, data do + for unicode, character in sortedhash(data) do local symbol = character.mathsymbol local mset, dset = true, true if symbol then @@ -300,7 +301,8 @@ function mathematics.define(family) end local spec = other.mathspec if spec then - for i, m in next, spec do + for i=1,#spec do + local m = spec[i] local class = m.class if class then class = classes[class] or class -- no real checks needed @@ -312,7 +314,8 @@ function mathematics.define(family) local mathclass = character.mathclass local mathspec = character.mathspec if mathspec then - for i, m in next, mathspec do + for i=1,#mathspec do + local m = mathspec[i] local name = m.name local class = m.class if not class then diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv index 03197162d..0dbee83bf 100644 --- a/tex/context/base/mkiv/math-ini.mkiv +++ b/tex/context/base/mkiv/math-ini.mkiv @@ -2343,6 +2343,13 @@ % \ruledhbox{$\mathtext{abc ffi}$} % \ruledhbox{$\mathword{abc ffi}$} +% I need to decide: +% +%mathscriptboxmode\zerocount % no kerning +%mathscriptboxmode\plusone % lists +\mathscriptboxmode\plustwo % lists and boxes +%mathscriptboxmode\plusthree % lists and boxes with \boundary=1 (also for testing and demo) + \unexpanded\def\mathtext {\mathortext{\math_text_choice_font\relax}\hbox} \unexpanded\def\mathword {\mathortext{\math_text_choice_word\relax}\hbox} diff --git a/tex/context/base/mkiv/math-map.lua b/tex/context/base/mkiv/math-map.lua index cf9353e95..f1b0c14e3 100644 --- a/tex/context/base/mkiv/math-map.lua +++ b/tex/context/base/mkiv/math-map.lua @@ -33,7 +33,6 @@ if not modules then modules = { } end modules ['math-map'] = { -- plus add them to the regular vectors below so that they honor \it etc local type, next = type, next -local floor, div = math.floor, math.div local merged, sortedhash = table.merged, table.sortedhash local extract = bit32.extract diff --git a/tex/context/base/mkiv/meta-fnt.lua b/tex/context/base/mkiv/meta-fnt.lua index e7e83c694..1f5670c66 100644 --- a/tex/context/base/mkiv/meta-fnt.lua +++ b/tex/context/base/mkiv/meta-fnt.lua @@ -190,7 +190,7 @@ statistics.register("metapost font generation", function() if total > 0 then local time = statistics.elapsedtime(flusher) if total > 0 then - return format("%i glyphs, %.3f seconds runtime, %i glyphs/second", total, time, total/time) + return format("%i glyphs, %.3f seconds runtime, %.1f glyphs/second", total, time, total/time) else return format("%i glyphs, %.3f seconds runtime", total, time) end @@ -201,7 +201,7 @@ statistics.register("metapost font loading",function() if variants > 0 then local time = statistics.elapsedtime(metapost.fonts) if variants > 0 then - return format("%.3f seconds, %i instances, %0.3f instances/second", time, variants, variants/time) + return format("%.3f seconds, %i instances, %.3f instances/second", time, variants, variants/time) else return format("%.3f seconds, %i instances", time, variants) end diff --git a/tex/context/base/mkiv/meta-tex.lua b/tex/context/base/mkiv/meta-tex.lua index 3c31e3e1e..d66eab069 100644 --- a/tex/context/base/mkiv/meta-tex.lua +++ b/tex/context/base/mkiv/meta-tex.lua @@ -126,7 +126,7 @@ do arguments = { "string", "string" } } - if _LUAVERSION < 5.2 then + if LUAVERSION < 5.2 then utilities.strings.formatters.add(formatters,"texexp", [[texexp(...)]], "local texexp = metapost.texexp") else utilities.strings.formatters.add(formatters,"texexp", [[texexp(...)]], { texexp = metapost.texexp }) diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index 83c1e49ee..b2d97226a 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -68,7 +68,7 @@ local f_pair = formatters["(%.16f,%.16f)"] local f_triplet = formatters["(%.16f,%.16f,%.16f)"] local f_quadruple = formatters["(%.16f,%.16f,%.16f,%.16f)"] -local function mpprint(...) +local function mpprint(...) -- we can optimize for n=1 for i=1,select("#",...) do local value = select(i,...) if value ~= nil then @@ -258,7 +258,7 @@ local function mpquoted(fmt,s,...) buffer[n] = lpegmatch(p,formatters[fmt](s,...)) elseif fmt then -- buffer[n] = '"' .. fmt .. '"' - buffer[n] = '"' .. lpegmatch(p,fmt) .. '"' + buffer[n] = lpegmatch(p,fmt) else -- something is wrong end diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index b0826425f..4542c1e85 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -292,6 +292,7 @@ return { "mathrulesfam", "mathrulesmode", "mathscriptsmode", + "mathscriptboxmode", "mathstyle", "mathsurroundmode", "mathsurroundskip", diff --git a/tex/context/base/mkiv/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua index 2cd1d1a0a..865f69c2c 100644 --- a/tex/context/base/mkiv/node-ltp.lua +++ b/tex/context/base/mkiv/node-ltp.lua @@ -138,7 +138,6 @@ local tonumber = tonumber local utfchar = utf.char local write, write_nl = texio.write, texio.write_nl local sub, formatters = string.sub, string.formatters -local round, floor = math.round, math.floor local insert, remove = table.insert, table.remove -- local fonts, nodes, node = fonts, nodes, node -- too many locals diff --git a/tex/context/base/mkiv/page-cst.lua b/tex/context/base/mkiv/page-cst.lua index cc35de877..1b537b288 100644 --- a/tex/context/base/mkiv/page-cst.lua +++ b/tex/context/base/mkiv/page-cst.lua @@ -9,7 +9,7 @@ if not modules then modules = { } end modules ["page-cst"] = { -- todo: check what is used local next, type, tonumber = next, type, tonumber -local ceil, floor, odd, round = math.ceil, math.floor, math.odd, math.round +local ceil, odd, round = math.ceil, math.odd, math.round local lower = string.lower local copy = table.copy diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua index 42435ed5b..0d8e64cea 100644 --- a/tex/context/base/mkiv/page-mix.lua +++ b/tex/context/base/mkiv/page-mix.lua @@ -17,7 +17,7 @@ if not modules then modules = { } end modules ["page-mix"] = { local next, type = next, type local concat = table.concat -local ceil, floor = math.ceil, math.floor +local ceil = math.ceil local trace_state = false trackers.register("mixedcolumns.trace", function(v) trace_state = v end) local trace_detail = false trackers.register("mixedcolumns.detail", function(v) trace_detail = v end) diff --git a/tex/context/base/mkiv/publ-dat.lua b/tex/context/base/mkiv/publ-dat.lua index 2cebb4379..fce69b158 100644 --- a/tex/context/base/mkiv/publ-dat.lua +++ b/tex/context/base/mkiv/publ-dat.lua @@ -138,14 +138,15 @@ local virtuals = allocate { } local defaulttypes = allocate { - author = "author", - editor = "author", - -- publisher = "author", - page = "pagenumber", - pages = "pagenumber", - keywords = "keyword", - doi = "url", - url = "url", + author = "author", + editor = "author", + translator = "author", + -- publisher = "author", + page = "pagenumber", + pages = "pagenumber", + keywords = "keyword", + doi = "url", + url = "url", } local defaultsets = allocate { @@ -265,11 +266,13 @@ local specifications = setmetatableindex(function(t,name) local fullname = resolvers.findfile(filename) or "" if fullname == "" then report("no data definition file %a for %a",filename,name) + t[name] = default return default end local specification = table.load(fullname) if not specification then report("invalid data definition file %a for %a",fullname,name) + t[name] = default return default end -- diff --git a/tex/context/base/mkiv/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua index 07160ec57..ed3050f35 100644 --- a/tex/context/base/mkiv/publ-ini.lua +++ b/tex/context/base/mkiv/publ-ini.lua @@ -2361,10 +2361,26 @@ do local citevariants = { } publications.citevariants = citevariants + local function btxvalidcitevariant(dataset,variant) + local citevariant = rawget(citevariants,variant) + if citevariant then + return variant, citevariant + end + local variant = specifications[dataset].types[variant] + if variant then + citevariant = rawget(citevariants,variant) + end + if citevariant then + return variant, citevariant + end + return "default", citevariants.default + end + local function btxhandlecite(specification) local dataset = specification.dataset or v_default local reference = specification.reference local variant = specification.variant + -- if not variant or variant == "" then variant = "default" end @@ -2403,7 +2419,10 @@ do -- ctx_btxsetdataset(dataset) -- - citevariants[variant](specification) -- we always fall back on default + local variant, citevariant = btxvalidcitevariant(dataset,variant) + specification.variant = variant -- the used one + -- + citevariant(specification) -- we always fall back on default end local function btxhandlenocite(specification) @@ -2745,11 +2764,15 @@ do local function simplegetter(first,last,field,specification) local value = first[field] if value then - ctx_btxsetfirst(value) - if last then - ctx_btxsetsecond(last[field]) + if type(value) == "string" then + ctx_btxsetfirst(value) + if last then + ctx_btxsetsecond(last[field]) + end + return true + else + report("missing data type definition for %a",field) end - return true end end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 92cff15e3..9cd88d681 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 9d368f7b8..4f6c0e8cb 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/supp-ran.lua b/tex/context/base/mkiv/supp-ran.lua index 8bfc09e58..1ad9293ee 100644 --- a/tex/context/base/mkiv/supp-ran.lua +++ b/tex/context/base/mkiv/supp-ran.lua @@ -24,7 +24,7 @@ local randomseed = math.randomseed local round = math.round local stack = { } local last = 1 -local maxcount = 2^30-1 -- 1073741823 +local maxcount = 0x3FFFFFFF -- 2^30-1 math.random = function(...) local n = random(...) diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index 03b6d0759..2c8263962 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -1188,6 +1188,7 @@ \ifdefined\mathsurroundmode \else \newcount\mathsurroundmode \fi \ifdefined\mathitalicsmode \else \newcount\mathitalicsmode \fi \ifdefined\mathdelimitersmode \else \newcount\mathdelimitersmode \fi +\ifdefined\mathscriptboxmode \else \newcount\mathscriptboxmode \fi \ifdefined\hyphenpenaltymode \else \newcount\hyphenpenaltymode \fi \ifdefined\automatichyphenpenalty \else \newcount\automatichyphenpenalty \fi diff --git a/tex/context/base/mkiv/toks-ini.lua b/tex/context/base/mkiv/toks-ini.lua index 0ce7b4836..312a8b318 100644 --- a/tex/context/base/mkiv/toks-ini.lua +++ b/tex/context/base/mkiv/toks-ini.lua @@ -101,28 +101,28 @@ end -- end local bits = { - escape = 2^ 0, - begingroup = 2^ 1, - endgroup = 2^ 2, - mathshift = 2^ 3, - alignment = 2^ 4, - endofline = 2^ 5, - parameter = 2^ 6, - superscript = 2^ 7, - subscript = 2^ 8, - ignore = 2^ 9, - space = 2^10, -- 1024 - letter = 2^11, - other = 2^12, - active = 2^13, - comment = 2^14, - invalid = 2^15, + escape = 0x00000001, -- 2^00 + begingroup = 0x00000002, -- 2^01 + endgroup = 0x00000004, -- 2^02 + mathshift = 0x00000008, -- 2^03 + alignment = 0x00000010, -- 2^04 + endofline = 0x00000020, -- 2^05 + parameter = 0x00000040, -- 2^06 + superscript = 0x00000080, -- 2^07 + subscript = 0x00000100, -- 2^08 + ignore = 0x00000200, -- 2^09 + space = 0x00000400, -- 2^10 -- 1024 + letter = 0x00000800, -- 2^11 + other = 0x00001000, -- 2^12 + active = 0x00002000, -- 2^13 + comment = 0x00004000, -- 2^14 + invalid = 0x00008000, -- 2^15 -- - character = 2^11 + 2^12, - whitespace = 2^13 + 2^10, -- / needs more checking + character = 0x00001800, -- 2^11 + 2^12 + whitespace = 0x00002400, -- 2^13 + 2^10 -- / needs more checking -- - open = 2^10 + 2^1, -- space + begingroup - close = 2^10 + 2^2, -- space + endgroup + open = 0x00000402, -- 2^10 + 2^01 -- space + begingroup + close = 0x00000404, -- 2^10 + 2^02 -- space + endgroup } -- for k, v in next, bits do bits[v] = k end diff --git a/tex/context/base/mkiv/trac-inf.lua b/tex/context/base/mkiv/trac-inf.lua index 99fe30a6e..5810e2059 100644 --- a/tex/context/base/mkiv/trac-inf.lua +++ b/tex/context/base/mkiv/trac-inf.lua @@ -196,8 +196,9 @@ function statistics.show() local hashchar = tonumber(status.luatex_hashchars) local hashtype = status.luatex_hashtype local mask = lua.mask or "ascii" - return format("engine: %s, used memory: %s, hash type: %s, hash chars: min(%s,40), symbol mask: %s (%s)", + return format("engine: %s %s, used memory: %s, hash type: %s, hash chars: min(%i,40), symbol mask: %s (%s)", jit and "luajit" or "lua", + LUAVERSION, statistics.memused(), hashtype or "default", hashchar and 2^hashchar or "unknown", diff --git a/tex/context/base/mkiv/typo-cap.lua b/tex/context/base/mkiv/typo-cap.lua index 9e4e9686a..ea0aad422 100644 --- a/tex/context/base/mkiv/typo-cap.lua +++ b/tex/context/base/mkiv/typo-cap.lua @@ -82,7 +82,7 @@ local run = 0 -- a trick to make neighbouring ranges work local blocked = { } local function set(tag,font) - if run == 2^6 then + if run == 0x40 then -- 2^6 run = 1 else run = run + 1 diff --git a/tex/context/base/mkiv/typo-del.mkiv b/tex/context/base/mkiv/typo-del.mkiv index afd446258..1ef7f74c6 100644 --- a/tex/context/base/mkiv/typo-del.mkiv +++ b/tex/context/base/mkiv/typo-del.mkiv @@ -790,7 +790,8 @@ \dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext \usedelimitedtextstyleandcolor\c!style\c!color \typo_delimited_start_content - \typo_delimited_attributed_e + \bgroup + \aftergroup\typo_delimited_attributed_e \let\next=} \def\typo_delimited_attributed_e @@ -806,6 +807,7 @@ \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext \usedelimitedtextstyleandcolor\c!style\c!color \typo_delimited_start_content + \bgroup \aftergroup\typo_delimited_fontdriven_e \let\next=} diff --git a/tex/context/base/mkiv/typo-dha.lua b/tex/context/base/mkiv/typo-dha.lua index c75fdbc3f..f7f3dee2e 100644 --- a/tex/context/base/mkiv/typo-dha.lua +++ b/tex/context/base/mkiv/typo-dha.lua @@ -85,7 +85,6 @@ local parfillskip_code = skipcodes.parfillskip local new_textdir = nodepool.textdir local hasbit = number.hasbit -local formatters = string.formatters local insert = table.insert local fonthashes = fonts.hashes diff --git a/tex/context/base/mkiv/typo-dir.lua b/tex/context/base/mkiv/typo-dir.lua index 8a9ec978e..5645cd433 100644 --- a/tex/context/base/mkiv/typo-dir.lua +++ b/tex/context/base/mkiv/typo-dir.lua @@ -28,7 +28,6 @@ if not modules then modules = { } end modules ['typo-dir'] = { local next, type = next, type local format, insert, sub, find, match = string.format, table.insert, string.sub, string.find, string.match -local formatters = string.formatters local nodes, node = nodes, node @@ -67,9 +66,9 @@ local v_local = variables["local"] local v_on = variables.on local v_yes = variables.yes -local m_enabled = 2^6 -- 64 -local m_global = 2^7 -local m_fences = 2^8 +local m_enabled = 0x00000040 -- 2^6 64 +local m_global = 0x00000080 -- 2^7 +local m_fences = 0x00000100 -- 2^8 local handlers = { } local methods = { } diff --git a/tex/context/base/mkiv/util-dim.lua b/tex/context/base/mkiv/util-dim.lua index 2bdb870e7..fd9351a28 100644 --- a/tex/context/base/mkiv/util-dim.lua +++ b/tex/context/base/mkiv/util-dim.lua @@ -429,7 +429,7 @@ end stringtodimen = string.todimen -- local variable defined earlier function number.toscaled(d) - return format("%0.5f",d/2^16) + return format("%0.5f",d/0x10000) -- 2^16 end --[[ldx-- diff --git a/tex/context/base/mkiv/util-lua.lua b/tex/context/base/mkiv/util-lua.lua index 6481435bd..27daa516f 100644 --- a/tex/context/base/mkiv/util-lua.lua +++ b/tex/context/base/mkiv/util-lua.lua @@ -21,7 +21,6 @@ local report_mem = logs.reporter("system","lua memory") local tracestripping = false local tracememory = false -local forcestupidcompile = true -- use internal bytecode compiler luautilities.stripcode = true -- support stripping when asked for luautilities.alwaysstripcode = false -- saves 1 meg on 7 meg compressed format file (2012.08.12) luautilities.nofstrippedchunks = 0 diff --git a/tex/context/base/mkiv/util-sto.lua b/tex/context/base/mkiv/util-sto.lua index bcd8c85a3..5b6915eaf 100644 --- a/tex/context/base/mkiv/util-sto.lua +++ b/tex/context/base/mkiv/util-sto.lua @@ -158,6 +158,29 @@ function table.setmetatablecall(t,f) return t end +-- the manual is somewhat fuzzy about this but suggests that one can best +-- set all fields before assigning a metatable + +function table.setmetatableindices(t,f,n,c) + if type(t) ~= "table" then + f, t = t, { } + end + local m = getmetatable(t) + local i = f_index[f] or f + if m then + m.__index = i + m.__newindex = n + m.__call = c + else + setmetatable(t,{ + __index = i, + __newindex = n, + __call = c, + }) + end + return t +end + function table.setmetatablekey(t,key,value) local m = getmetatable(t) if not m then diff --git a/tex/context/base/mkiv/util-str.lua b/tex/context/base/mkiv/util-str.lua index 6d8f198ab..d938ee449 100644 --- a/tex/context/base/mkiv/util-str.lua +++ b/tex/context/base/mkiv/util-str.lua @@ -22,7 +22,7 @@ local utfchar, utfbyte = utf.char, utf.byte local loadstripped = nil -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then loadstripped = function(str,shortcuts) return load(str) @@ -504,7 +504,7 @@ return function(%s) return %s end local preamble, environment = "", { } -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then preamble = [[ local lpeg=lpeg @@ -1007,6 +1007,14 @@ local direct = Cs ( * P(-1) / [[local format = string.format return function(str) return format("%0",str) end]] ) +-- local direct = Cs ( +-- P("%") +-- * (S("+- .") + R("09"))^0 +-- * S("sqidfgGeExXo") +-- * (1-P("%"))^0 +-- * P(-1) / [[local format = string.format return function(str) return format([==[%0]==],str) end]] +-- ) + local function make(t,str) local f local p @@ -1079,7 +1087,7 @@ strings.formatters = { } -- _connector_ is an experiment -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then function strings.formatters.new(noconcat) local t = { _type_ = "formatter", _connector_ = noconcat and "," or "..", _extensions_ = { }, _preamble_ = preamble, _environment_ = { } } @@ -1139,7 +1147,7 @@ patterns.luaquoted = Cs(Cc('"') * ((1-S('"\n'))^1 + P('"')/'\\"' + P('\n')/'\\n" -- escaping by lpeg is faster for strings without quotes, slower on a string with quotes, but -- faster again when other q-escapables are found (the ones we don't need to escape) -if _LUAVERSION < 5.2 then +if LUAVERSION < 5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 6dc681b55..93e6bb477 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.xml @@ -802,6 +802,7 @@ <cd:constant name='fieldoffset' value='offsetpole'/> <cd:constant name='file' value='soubor'/> <cd:constant name='filler' value='filler'/> + <cd:constant name='filter' value='filter'/> <cd:constant name='filtercommand' value='filtercommand'/> <cd:constant name='finalnamesep' value='finalnamesep'/> <cd:constant name='finalpagesep' value='finalpagesep'/> diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml index 271fea6d0..99b58bc74 100644 --- a/tex/context/interface/mkii/keys-de.xml +++ b/tex/context/interface/mkii/keys-de.xml @@ -802,6 +802,7 @@ <cd:constant name='fieldoffset' value='feldoffset'/> <cd:constant name='file' value='datei'/> <cd:constant name='filler' value='filler'/> + <cd:constant name='filter' value='filter'/> <cd:constant name='filtercommand' value='filtercommand'/> <cd:constant name='finalnamesep' value='finalnamesep'/> <cd:constant name='finalpagesep' value='finalpagesep'/> diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index 56cdbf3e9..7c6d3ba86 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -2,7 +2,7 @@ <!-- expanded and compacted i-context.xml --> <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> <cd:interface file="i-accent.xml"> - <cd:command file="enco-ini.mkiv" name="defineaccent"> + <cd:command file="enco-ini.mkiv" level="style" name="defineaccent"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -15,7 +15,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="definecharacter"> + <cd:command file="enco-ini.mkiv" level="style" name="definecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -25,7 +25,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="definecommand"> + <cd:command file="enco-ini.mkiv" level="style" name="definecommand"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -35,7 +35,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="definemathaccent"> + <cd:command file="enco-ini.mkiv" level="style" name="definemathaccent"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -45,7 +45,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildmathaccent"> + <cd:command file="enco-ini.mkiv" level="style" name="buildmathaccent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -55,7 +55,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextaccent"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextaccent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -65,119 +65,133 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextmacron"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextmacron"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextbottomdot"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomdot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextcedilla"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextcedilla"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextognek"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextognek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextbottomcomma"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextbottomcomma"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="d"> + <cd:command file="enco-ini.mkiv" level="style" name="d"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="buildtextgrave"> + <cd:command file="enco-ini.mkiv" level="style" name="buildtextgrave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="acute"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="acute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="grave"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="grave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="ddot"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="ddot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="tilde"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="tilde"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="bar"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="bar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="breve"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="breve"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="check"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="check"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="hat"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="hat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="vec"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="vec"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="dot"> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="dot"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="ring"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:character"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-acc.mkvi" level="document" name="dddot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -186,7 +200,7 @@ </cd:command> </cd:interface> <cd:interface file="i-align.xml"> - <cd:command file="spac-ali.mkiv" level="style" name="setupalign"> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="setupalign"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="broad"/> @@ -241,19 +255,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="usealignparameter"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="usealignparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="alignment" type="environment"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="alignment" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupalign"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="linealignment" type="environment"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="linealignment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="left"/> @@ -263,43 +277,43 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="leftaligned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="middlealigned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="rightaligned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="maxaligned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="midaligned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="centeraligned" type="environment"/> - <cd:command file="spac-ali.mkiv" level="document" name="leftaligned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="middlealigned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="maxaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="midaligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centeraligned" type="environment"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftaligned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="rightaligned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightaligned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="middlealigned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="middlealigned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="maxaligned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="maxaligned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="midaligned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="midaligned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="centeraligned"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centeraligned"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="alignedline"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="alignedline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="left"/> @@ -346,7 +360,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="document" name="wordright"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="wordright"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="right"/> @@ -355,7 +369,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="simplealignedbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -372,7 +386,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="simplealignedspreadbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedspreadbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -389,7 +403,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="simplealignedboxplus"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplealignedboxplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -409,7 +423,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="simplereversealignedbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -426,7 +440,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="simplereversealignedboxplus"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="simplereversealignedboxplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -446,7 +460,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="system" name="alignedbox"> + <cd:command category="alignment" file="pack-box.mkiv" level="system" name="alignedbox"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="left"/> @@ -467,7 +481,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="system" name="aligned"> + <cd:command category="alignment" file="pack-box.mkiv" level="system" name="aligned"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="left"/> @@ -487,44 +501,44 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttoright"/> - <cd:command file="spac-ali.mkiv" name="righttoleft"/> - <cd:command file="spac-ali.mkiv" name="raggedbottom"/> - <cd:command file="spac-ali.mkiv" name="alignbottom"/> - <cd:command file="spac-ali.mkiv" name="baselinebottom"/> - <cd:command file="spac-ali.mkiv" name="notragged"/> - <cd:command file="spac-ali.mkiv" name="raggedleft"/> - <cd:command file="spac-ali.mkiv" name="raggedcenter"/> - <cd:command file="spac-ali.mkiv" name="raggedright"/> - <cd:command file="spac-ali.mkiv" name="veryraggedleft"/> - <cd:command file="spac-ali.mkiv" name="veryraggedcenter"/> - <cd:command file="spac-ali.mkiv" name="veryraggedright"/> - <cd:command file="spac-ali.mkiv" name="raggedwidecenter"/> - <cd:command file="spac-ali.mkiv" name="centeredlastline"/> - <cd:command file="spac-ali.mkiv" name="flushedrightlastline"/> - <cd:command file="spac-ali.mkiv" name="ttraggedright"/> - <cd:command file="spac-ali.mkiv" name="forgetragged"/> - <cd:command file="spac-ali.mkiv" name="line"> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="lefttoright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="righttoleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedbottom"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="alignbottom"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="baselinebottom"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="notragged"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedcenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedleft"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedcenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="veryraggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="raggedwidecenter"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="centeredlastline"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="flushedrightlastline"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="ttraggedright"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="style" name="forgetragged"/> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="line"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftline"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="leftline"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="rightline"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="rightline"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="centerline"> + <cd:command category="alignment" file="spac-ali.mkiv" level="document" name="centerline"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="hanging" type="environment"> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="hanging" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="distance"> @@ -541,7 +555,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="hanging" type="environment" variant="argument"> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="hanging" type="environment" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="left"/> @@ -550,7 +564,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="fixed" type="environment"> + <cd:command category="alignment" file="spac-ver.mkiv" level="document" name="fixed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="low"/> @@ -692,7 +706,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="registerattachment"> + <cd:command file="scrn-wid.mkvi" level="document" name="registerattachment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -737,22 +751,22 @@ <cd:command file="scrn-wid.mkvi" level="document" name="placeattachments"/> </cd:interface> <cd:interface file="i-attribute.xml"> - <cd:command file="attr-ini.mkiv" level="system" name="pushattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="pushattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="popattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="popattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="installattributestack"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="installattributestack"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="defineattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="defineattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -765,7 +779,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="definesystemattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="definesystemattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -778,12 +792,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="newattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="newattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="dosetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dosetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -793,46 +807,46 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="doresetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="doresetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="dogetattribute"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dogetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="dogetattributeid"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="dogetattributeid"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="resetallattributes"/> - <cd:command file="attr-ini.mkiv" level="system" name="savecurrentattributes"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="resetallattributes"/> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="savecurrentattributes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" level="system" name="restorecurrentattributes"> + <cd:command category="attribute" file="attr-ini.mkiv" level="system" name="restorecurrentattributes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="showattributes"/> + <cd:command category="attribute" file="attr-ini.mkiv" level="document" name="showattributes"/> </cd:interface> <cd:interface file="i-backend.xml"> - <cd:command file="back-ini.mkiv" level="style" name="setupbackend"> + <cd:command catehory="pdf" file="back-ini.mkiv" level="style" name="setupbackend"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -846,7 +860,28 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="cd:name"/> + <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <cd:constant type="GRACoL2006_Coated1v2.icc"/> + <cd:constant type="ISO Coated v2 300% (ECI)"/> + <cd:constant type="ISO Coated v2 (ECI)"/> + <cd:constant type="ISOnewspaper26v4"/> + <cd:constant type="ISOnewspaper26v4_gr"/> + <cd:constant type="ISO Uncoated"/> + <cd:constant type="ISO Uncoated Yellowish"/> + <cd:constant type="ISO Web Coated"/> + <cd:constant type="Japan Color 2001 Coated"/> + <cd:constant type="Japan Color 2002 Newspaper"/> + <cd:constant type="Japan Web Coated (Ad)"/> + <cd:constant type="SNAP 2007"/> + <cd:constant type="SWOP2006_Coated3v2.icc"/> + <cd:constant type="SWOP2006_Coated5v2.icc"/> + <cd:constant type="Uncoated FOGRA29 (ISO 12647-2:2004)"/> + <cd:constant type="Web Coated FOGRA28 (ISO 12647-2:2004)"/> + <cd:constant type="PSR_LWC_PLUS_V2_PT"/> + <cd:constant type="PSR_LWC_STD_V2_PT"/> + <cd:constant type="PSR_SC_PLUS_V2_PT"/> + <cd:constant type="PSR_SC_STD_V2_PT"/> + <cd:constant type="PSRgravureMF"/> </cd:parameter> <cd:parameter name="space"> <cd:constant type="yes"/> @@ -858,7 +893,20 @@ <cd:parameter name="format"> <cd:constant type="version"/> <cd:constant type="default"/> - <cd:constant type="cd:name"/> + <cd:constant type="PDF/X-1a:2001"/> + <cd:constant type="PDF/X-1a:2003"/> + <cd:constant type="PDF/X-3:2002"/> + <cd:constant type="PDF/X-3:2003"/> + <cd:constant type="PDF/X-4"/> + <cd:constant type="PDF/X-4p"/> + <cd:constant type="PDF/X-5g"/> + <cd:constant type="PDF/X-5pg"/> + <cd:constant type="PDF/X-5n"/> + <cd:constant type="PDF/A-1a:2005"/> + <cd:constant type="PDF/A-1b:2005"/> + <cd:constant type="PDF/A-2a"/> + <cd:constant type="PDF/A-3a"/> + <cd:constant type="PDF/UA-1"/> </cd:parameter> <cd:parameter name="level"> <cd:constant type="cd:number"/> @@ -875,7 +923,7 @@ </cd:command> </cd:interface> <cd:interface file="i-background.xml"> - <cd:command file="pack-bck.mkvi" level="style" name="definebackground"> + <cd:command category="background" file="pack-bck.mkvi" level="style" name="definebackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -888,7 +936,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" level="style" name="setupbackground"> + <cd:command category="background" file="pack-bck.mkvi" level="style" name="setupbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -920,7 +968,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" generated="yes" level="document" name="background" type="environment" variant="example"> + <cd:command category="background" file="pack-bck.mkvi" generated="yes" level="document" name="background" type="environment" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -933,14 +981,14 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" level="document" name="background" type="environment"> + <cd:command category="background" file="pack-bck.mkvi" level="document" name="background" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbackground"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" generated="yes" level="document" name="background" variant="example"> + <cd:command category="background" file="pack-bck.mkvi" generated="yes" level="document" name="background" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -951,12 +999,12 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" level="document" name="background"> + <cd:command category="background" file="pack-bck.mkvi" level="document" name="background"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" level="document" name="backgroundline"> + <cd:command category="background colors" file="pack-bck.mkvi" level="document" name="backgroundline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -964,7 +1012,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" level="style" name="setupbackgrounds"> + <cd:command category="background" file="page-bck.mkiv" level="style" name="setupbackgrounds"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="top"/> @@ -985,7 +1033,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" level="style" name="setupbackgrounds" variant="page"> + <cd:command category="background" file="page-bck.mkiv" level="style" name="setupbackgrounds" variant="page"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -1004,14 +1052,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="page-bck.mkiv" name="background" type="environment"> + <cd:command begin="push" category="background" end="pop" file="page-bck.mkiv" level="system" name="background" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" level="system" name="doifelsesomebackground"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifelsesomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1024,7 +1072,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" level="system" name="doifsomebackgroundelse"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackgroundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1037,7 +1085,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" level="system" name="doifsomebackground"> + <cd:command category="background conditional" file="page-bck.mkiv" level="system" name="doifsomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1052,7 +1100,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bar.xml"> - <cd:command file="node-rul.mkiv" level="style" name="definebar"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="definebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1065,7 +1113,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="setupbar"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="setupbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -1135,7 +1183,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="setupbars"> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="setupbars"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -1145,7 +1193,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" level="document" name="bar" variant="instance"> + <cd:command category="rules" file="node-rul.mkiv" generated="yes" level="document" name="bar" variant="instance"> <cd:sequence> <cd:instance value="bar"/> </cd:sequence> @@ -1171,38 +1219,38 @@ <cd:constant value="hiddenbar"/> </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" level="document" name="bar" type="environment"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="bar" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="document" name="setbar"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="setbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="document" name="directsetbar"> + <cd:command category="rules" file="node-rul.mkiv" level="document" name="directsetbar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="node-rul.mkiv" level="system" name="bar" type="environment"> + <cd:command begin="push" category="rules" end="pop" file="node-rul.mkiv" level="system" name="bar" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="resetbar"/> + <cd:command category="rules" file="node-rul.mkiv" level="style" name="resetbar"/> </cd:interface> <cd:interface file="i-blackrule.xml"> - <cd:command file="pack-mrl.mkiv" level="style" name="setupblackrules"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="style" name="setupblackrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -1245,21 +1293,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="blackrule"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrule"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="blackrules"> + <cd:command category="rules colors" file="pack-mrl.mkiv" level="document" name="blackrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="vl"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="vl"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -1273,7 +1321,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="somekindoftab"> + <cd:command category="rules" file="tabl-mis.mkiv" level="style" name="somekindoftab"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="alternative"> @@ -1295,9 +1343,24 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="rules" file="grph-rul.mkiv" level="style" name="frule"> + <cd:arguments> + <cd:keywords delimiters="none" list="yes"> + <cd:constant method="none" prefix="width␣" type="cd:dimension"/> + <cd:constant method="none" prefix="height␣" type="cd:dimension"/> + <cd:constant method="none" prefix="depth␣" type="cd:dimension"/> + <cd:constant method="none" prefix="radius␣" type="cd:dimension"/> + <cd:constant method="none" prefix="line␣" type="cd:dimension"/> + <cd:constant method="none" prefix="type␣" type="cd:text"/> + <cd:constant method="none" prefix="data␣" type="cd:text"/> + <cd:constant method="none" prefix="name␣" type="cd:text"/> + </cd:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-bleed.xml"> - <cd:command file="pack-box.mkiv" level="style" name="setupbleeding"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="setupbleeding"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -1340,7 +1403,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="bleed"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="bleed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> @@ -1348,11 +1411,11 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="bleedwidth"/> - <cd:command file="pack-box.mkiv" name="bleedheight"/> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="bleedwidth"/> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="bleedheight"/> </cd:interface> <cd:interface file="i-block.xml"> - <cd:command file="strc-blk.mkiv" level="style" name="defineblock"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="defineblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1365,7 +1428,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" level="style" name="setupblock"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="setupblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -1390,7 +1453,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="begin" end="end" file="strc-blk.mkiv" generated="yes" level="document" name="block" type="environment" variant="example"> + <cd:command begin="begin" category="structure" end="end" file="strc-blk.mkiv" generated="yes" level="document" name="block" type="environment" variant="example"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -1402,7 +1465,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="hideblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="hideblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -1412,7 +1475,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="keepblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="style" name="keepblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -1422,7 +1485,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" level="document" name="useblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="useblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -1438,7 +1501,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" level="document" name="processblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="processblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -1454,7 +1517,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" level="document" name="selectblocks"> + <cd:command category="structure" file="strc-blk.mkiv" level="document" name="selectblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -1472,7 +1535,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bookmark.xml"> - <cd:command file="strc-bkm.mkiv" level="style" name="setupbookmark"> + <cd:command category="pdf" file="strc-bkm.mkiv" level="style" name="setupbookmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -1512,7 +1575,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-bkm.mkiv" level="document" name="bookmark"> + <cd:command category="pdf" file="strc-bkm.mkiv" level="document" name="bookmark"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> @@ -1523,7 +1586,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="src-bkm.mkiv" name="placebookmarks"> + <cd:command category="pdf" file="src-bkm.mkiv" level="style" name="placebookmarks"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -1540,7 +1603,7 @@ </cd:command> </cd:interface> <cd:interface file="i-boxes.xml"> - <cd:command file="supp-box.mkiv" name="doiftext"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1553,7 +1616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelsetext"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1566,7 +1629,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doiftextelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doiftextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -2178,6 +2241,16 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="flushbox"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="supp-box.mkiv" level="system" name="restorebox"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -2198,7 +2271,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifelsebox"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelsebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2214,7 +2287,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifboxelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifboxelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2483,7 +2556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2497,7 +2570,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2578,7 +2651,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="righttolefthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttolefthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2586,7 +2659,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="lefttorighthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2594,7 +2667,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="righttoleftvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2602,7 +2675,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="lefttorightvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2610,7 +2683,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="righttoleftvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="righttoleftvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2618,7 +2691,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="lefttorightvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="lefttorightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2626,7 +2699,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="autodirhbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2634,7 +2707,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="autodirvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2642,7 +2715,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="autodirvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="autodirvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2650,7 +2723,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="leftorrighthbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2658,7 +2731,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="leftorrightvbox"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2666,7 +2739,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" level="system" name="leftorrightvtop"> + <cd:command category="alignment" file="spac-ali.mkiv" level="system" name="leftorrightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2734,7 +2807,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" level="system" name="doifelseboxincache"> + <cd:command category="conditional" file="supp-box.mkiv" level="system" name="doifelseboxincache"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2810,7 +2883,7 @@ </cd:command> </cd:interface> <cd:interface file="i-buffer.xml"> - <cd:command file="buff-ini.mkiv" level="system" name="doifelsebuffer"> + <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifelsebuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2823,7 +2896,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="system" name="doifbufferelse"> + <cd:command category="buffer conditional" file="buff-ini.mkiv" level="system" name="doifbufferelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2836,21 +2909,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="system" name="resetbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="resetbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="document" name="buffer" type="environment"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="buffer" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="system" name="grabbufferdata"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="grabbufferdata"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:category"/> @@ -2866,7 +2939,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="system" name="grabbufferdatadirect"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="grabbufferdatadirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2879,14 +2952,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="set" end="end" file="buff-ini.mkiv" level="system" name="buffer" type="environment"> + <cd:command begin="set" category="buffer" end="end" file="buff-ini.mkiv" level="system" name="buffer" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="style" name="setupbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="setupbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -2901,7 +2974,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="style" name="definebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="definebuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2914,28 +2987,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="document" name="getbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getdefinedbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="system" name="getdefinedbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" level="document" name="inlinebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="inlinebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" generated="yes" level="document" name="buffer" type="environment" variant="instance"> + <cd:command evel="document" file="buff-ini.mkiv" generated="yes" lcategory="buffer" name="buffer" type="environment" variant="instance"> <cd:sequence> <cd:instance value="buffer"/> </cd:sequence> @@ -2943,13 +3016,13 @@ <cd:constant value="hiding"/> </cd:instances> </cd:command> - <cd:command file="buff-ini.mkiv" generated="yes" level="document" name="getbuffer" variant="instance"> + <cd:command category="buffer" file="buff-ini.mkiv" generated="yes" level="document" name="getbuffer" variant="instance"> <cd:sequence> <cd:string value="get"/> <cd:instance value="buffer"/> </cd:sequence> </cd:command> - <cd:command file="buff-ini.mkiv" name="processtexbuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="processtexbuffer"> <cd:sequence> <cd:string value="processTEXbuffer"/> </cd:sequence> @@ -2959,7 +3032,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="savebuffer" variant="list"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="savebuffer" variant="list"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:buffer"/> @@ -2969,7 +3042,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="savebuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="savebuffer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="list"> @@ -2985,28 +3058,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="ctxluabuffer"> + <cd:command category="buffer lua" file="buff-ini.mkiv" level="style" name="ctxluabuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="mkvibuffer"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="mkvibuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getbufferdata"> + <cd:command category="buffer" file="buff-ini.mkiv" level="style" name="getbufferdata"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" level="document" name="typebuffer"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="document" name="typebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -3016,17 +3089,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" level="document" name="typeinlinebuffer"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:buffer"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptype"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance"> <cd:sequence> <cd:string value="type"/> <cd:instance value="buffer"/> @@ -3037,7 +3100,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typedefinedbuffer"> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="system" name="typedefinedbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:buffer"/> @@ -3047,9 +3110,55 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="prettyprintbuffer"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="buffer verbatim" file="lxml-ini.mkiv" level="style" name="inlineprettyprintbuffer"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="buffer verbatim" file="buff-ver.mkiv" level="style" name="typeinlinebuffer"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:buffer"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptype"/> + </cd:assignments> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-button.xml"> - <cd:command file="scrn-but.mkvi" level="style" name="definebutton"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="definebutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3062,7 +3171,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" level="style" name="setupbutton"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="setupbutton"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3097,7 +3206,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" generated="yes" name="button" variant="example"> + <cd:command catehory="pdf" file="scrn-but.mkvi" generated="yes" level="document" name="button" variant="example"> <cd:sequence> <cd:variable value="button"/> </cd:sequence> @@ -3116,7 +3225,7 @@ <cd:constant value="button"/> </cd:instances> </cd:command> - <cd:command file="scrn-but.mkvi" name="button"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="document" name="button"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbutton"/> @@ -3129,28 +3238,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="overlaybutton"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="overlaybutton" variant="direct"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="overlaybutton" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="MPmenubuttons"> + <cd:command catehory="pdf" file="scrn-but.mkvi" level="style" name="MPmenubuttons"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="overlayrollbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="overlayrollbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -3160,7 +3269,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definepushbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3170,7 +3279,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="pushbutton"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="pushbutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3180,7 +3289,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definepushsymbol"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="definepushsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3192,7 +3301,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="rollbutton" variant="interactionmenu"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="interactionmenu"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3208,7 +3317,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="rollbutton" variant="button"> + <cd:command catehory="pdf" file="scrn-fld.mkvi" level="style" name="rollbutton" variant="button"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -3223,7 +3332,7 @@ </cd:command> </cd:interface> <cd:interface file="i-capitals.xml"> - <cd:command file="typo-cap.mkiv" level="style" name="definecapitals"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="definecapitals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3236,7 +3345,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="style" name="setupcapitals"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="setupcapitals"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3257,7 +3366,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="setcharactercasing"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="setcharactercasing"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3276,211 +3385,211 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="WORD"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="WORD"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="word"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="word"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="Word"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="Word"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="Words"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="Words"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="camel"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="camel"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="WORDS"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="WORDS"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" level="document" name="words"> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="words"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudosmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudosmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoSmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoSmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoSmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoSmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="pseudoMixedCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="pseudoMixedCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realsmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realsmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realSmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realSmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="realSmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="realSmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="notsmallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="notsmallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="smallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" levle="style" name="smallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Smallcapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="Smallcapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="SmallCapped"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="SmallCapped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="autocap"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="autocap"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="mixedcaps"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="mixedcaps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="kap"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="kap"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="Caps"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="Caps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="uppercased"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="uppercased"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="lowercased"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="lowercased"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="randomizetext"> + <cd:command category="fonts" file="typo-cap.mkiv" level="style" name="randomizetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="randomized" type="environment"/> + <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="randomized" type="environment"/> </cd:interface> <cd:interface file="i-catcodes.xml"> - <cd:command file="catc-ctx.mkiv" level="system" name="texcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" level="system" name="contextcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" level="system" name="contextdefinitioncode" type="environment"/> - <cd:command begin="un" end="" file="catc-def.mkiv" level="system" name="protect" type="environment"/> - <cd:command file="catc-ini.mkiv" level="system" name="newcatcodetable"> + <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="texcode" type="environment"/> + <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextcode" type="environment"/> + <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextdefinitioncode" type="environment"/> + <cd:command begin="un" category="catcode" end="" file="catc-def.mkiv" level="system" name="protect" type="environment"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="newcatcodetable"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="extendedcatcodetable" type="environment"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="extendedcatcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" level="system" name="installactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="installactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" level="system" name="defineactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="defineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -3490,7 +3599,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" level="system" name="installanddefineactivecharacter"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="installanddefineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -3500,16 +3609,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" level="system" name="makecharacteractive"> + <cd:command category="catcode" file="catc-act.mkiv" level="system" name="makecharacteractive"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="permitcircumflexescape"/> - <cd:command file="catc-ini.mkiv" level="system" name="permitcaretescape"/> - <cd:command file="catc-ini.mkiv" level="system" name="letcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="permitcircumflexescape"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="permitcaretescape"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="letcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -3519,7 +3628,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="defcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="defcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -3531,7 +3640,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="uedcatcodecommand"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="uedcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -3543,21 +3652,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"/> - <cd:command file="catc-ini.mkiv" level="system" name="restorecatcodes"/> - <cd:command file="catc-ini.mkiv" level="system" name="setcatcodetable"> + <cd:command begin="push" category="catcode" end="pop" file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="restorecatcodes"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="setcatcodetable"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" level="system" name="tracecatcodetables"/> - <cd:command file="catc-ini.mkiv" level="system" name="catcodetablename"/> - <cd:command file="catc-sym.mkiv" level="system" name="rescan"> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="tracecatcodetables"/> + <cd:command category="catcode" file="catc-ini.mkiv" level="system" name="catcodetablename"/> + <cd:command category="catcode" file="catc-sym.mkiv" level="system" name="rescan"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="catc-sym.mkiv" level="system" name="rescanwithsetup"> + <cd:command category="catcode" file="catc-sym.mkiv" level="system" name="rescanwithsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3567,46 +3676,50 @@ </cd:command> </cd:interface> <cd:interface file="i-character.xml"> - <cd:command file="catc-sym.mkiv" name="letteropenbrace"/> - <cd:command file="catc-sym.mkiv" name="letterclosebrace"/> - <cd:command file="catc-sym.mkiv" name="letterampersand"/> - <cd:command file="catc-sym.mkiv" name="letterless"/> - <cd:command file="catc-sym.mkiv" name="lettermore"/> - <cd:command file="catc-sym.mkiv" name="letterhash"/> - <cd:command file="catc-sym.mkiv" name="letterdoublequote"/> - <cd:command file="catc-sym.mkiv" name="lettersinglequote"/> - <cd:command file="catc-sym.mkiv" name="letterdollar"/> - <cd:command file="catc-sym.mkiv" name="letterpercent"/> - <cd:command file="catc-sym.mkiv" name="letterhat"/> - <cd:command file="catc-sym.mkiv" name="letterunderscore"/> - <cd:command file="catc-sym.mkiv" name="letterbar"/> - <cd:command file="catc-sym.mkiv" name="lettertilde"/> - <cd:command file="catc-sym.mkiv" name="letterbackslash"/> - <cd:command file="catc-sym.mkiv" name="letterslash"/> - <cd:command file="catc-sym.mkiv" name="letterquestionmark"/> - <cd:command file="catc-sym.mkiv" name="letterat"/> - <cd:command file="catc-sym.mkiv" name="lettercolon"/> - <cd:command file="catc-sym.mkiv" name="letterescape"/> - <cd:command file="catc-sym.mkiv" name="letterbgroup"/> - <cd:command file="catc-sym.mkiv" name="letteregroup"/> - <cd:command file="catc-sym.mkiv" name="letterleftbrace"/> - <cd:command file="catc-sym.mkiv" name="letterrightbrace"/> - <cd:command file="catc-sym.mkiv" name="letterexclamationmark"/> - <cd:command file="char-ini.mkiv" name="utfchar"> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteropenbrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterclosebrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterampersand"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterless"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettermore"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterhash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterdoublequote"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettersinglequote"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterdollar"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterpercent"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterhat"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterunderscore"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbar"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettertilde"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbackslash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterslash"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterquestionmark"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterat"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="lettercolon"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftparenthesis"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightparenthesis"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftbracket"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightbracket"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterescape"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterbgroup"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letteregroup"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterleftbrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterrightbrace"/> + <cd:command category="characters" file="catc-sym.mkiv" level="document" name="letterexclamationmark"/> + <cd:command category="characters fonts" file="char-ini.mkiv" level="document" name="utfchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="safechar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="safechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="checkedchar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="checkedchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3616,47 +3729,47 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="textormathchar"> + <cd:command category="characters fonts" file="char-ini.mkiv" level="style" name="textormathchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="char-ini.mkiv" name="chardescription"> + <cd:command category="characters" file="char-ini.mkiv" level="style" name="chardescription"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="percent"/> - <cd:command file="enco-ini.mkiv" name="procent"/> - <cd:command file="enco-ini.mkiv" name="ampersand"/> - <cd:command file="enco-ini.mkiv" name="dollar"/> - <cd:command file="enco-ini.mkiv" name="hash"/> - <cd:command file="enco-ini.mkiv" name="hyphen"/> - <cd:command file="enco-ini.mkiv" name="lowerleftsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerleftdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerrightsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="lowerrightdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperrightsingleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperrightdoubleninequote"/> - <cd:command file="enco-ini.mkiv" name="upperleftsinglesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperleftdoublesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperrightsinglesixquote"/> - <cd:command file="enco-ini.mkiv" name="upperrightdoublesixquote"/> - <cd:command file="enco-ini.mkiv" name="leftsubguillemot"/> - <cd:command file="enco-ini.mkiv" name="rightsubguillemot"/> - <cd:command file="enco-ini.mkiv" name="textcontrolspace"/> - <cd:command file="enco-ini.mkiv" name="textvisiblespace"/> - <cd:command file="enco-ini.mkiv" name="textminus"/> - <cd:command file="enco-ini.mkiv" name="textplus"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="percent"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="procent"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="ampersand"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="dollar"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="hash"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="hyphen"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerleftsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerleftdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerrightsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="lowerrightdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightsingleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightdoubleninequote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftsinglesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperleftdoublesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightsinglesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="upperrightdoublesixquote"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="leftsubguillemot"/> + <cd:command category="characters" file="enco-ini.mkiv" level="style" name="rightsubguillemot"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textcontrolspace"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textvisiblespace"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textminus"/> + <cd:command category="characters" file="enco-ini.mkiv" level="document" name="textplus"/> </cd:interface> <cd:interface file="i-characteralign.xml"> - <cd:command file="typo-tal.mkiv" level="system" name="singalcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="singalcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3666,7 +3779,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" level="system" name="setcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3678,9 +3791,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> - <cd:command file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> - <cd:command file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -3689,21 +3802,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" level="system" name="checkcharacteralign"> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="checkcharacteralign"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-characterspacing.xml"> - <cd:command file="typo-spa.mkiv" level="style" name="definecharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="definecharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" level="style" name="setupcharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="setupcharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3725,7 +3838,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" name="setcharacterspacing"> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="setcharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3733,10 +3846,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-spa.mkiv" name="resetcharacterspacing"/> + <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="resetcharacterspacing"/> </cd:interface> <cd:interface file="i-characterstripping.xml"> - <cd:command file="typo-rep.mkiv" name="setcharacterstripping"> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="setcharacterstripping"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3744,13 +3857,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-rep.mkiv" name="resetcharacterstripping"/> - <cd:command file="typo-rep.mkiv" name="forcecharacterstripping"/> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="resetcharacterstripping"/> + <cd:command category="language" file="typo-rep.mkiv" level="style" name="forcecharacterstripping"/> </cd:interface> <cd:interface file="i-charwidth.xml"> - <cd:command file="typo-lan.mkiv" name="charwidthlanguage"/> - <cd:command file="typo-lan.mkiv" name="averagecharwidth"/> - <cd:command file="typo-lan.mkiv" name="languagecharwidth"> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="charwidthlanguage"/> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="averagecharwidth"/> + <cd:command category="language" file="typo-lan.mkiv" level="style" name="languagecharwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -3759,12 +3872,12 @@ </cd:command> </cd:interface> <cd:interface file="i-chemical.xml"> - <cd:command file="chem-ini.mkiv" name="molecule"> + <cd:command file="chem-ini.mkiv" level="document" name="molecule"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="chem-ini.mkiv" name="chem"> + <cd:command file="chem-ini.mkiv" level="document" name="chem"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -3777,7 +3890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" level="style" name="setupchemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="setupchemical"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3880,7 +3993,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" level="style" name="setupchemicalframed"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="setupchemicalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3890,7 +4003,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemical"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3898,7 +4011,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemicalsymbol"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemicalsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3908,21 +4021,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalsymbol"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalsymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicaltext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicaltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemical" type="environment"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemical" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3932,7 +4045,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemical"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemical"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -3945,28 +4058,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicaltoptext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicaltoptext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalbottext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalbottext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="chemicalmidtext"> + <cd:command category="graphics" file="chem-str.mkiv" level="document" name="chemicalmidtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" level="style" name="definechemicals"> + <cd:command category="graphics" file="chem-str.mkiv" level="style" name="definechemicals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4019,7 +4132,7 @@ </cd:command> </cd:interface> <cd:interface file="i-clipping.xml"> - <cd:command file="grph-trf.mkiv" level="style" name="setupclipping"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setupclipping"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -4080,7 +4193,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="document" name="clip"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="clip"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> @@ -4090,7 +4203,7 @@ </cd:command> </cd:interface> <cd:interface file="i-collector.xml"> - <cd:command file="pack-box.mkiv" level="style" name="definecollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="definecollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4103,7 +4216,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="style" name="setupcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="setupcollector"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -4157,7 +4270,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="setcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="setcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4168,28 +4281,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="resetcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="resetcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="flushcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="flushcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="composedcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="composedcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="adaptcollector"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="adaptcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4199,7 +4312,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="collectedtext"> + <cd:command category="graphics" file="pack-box.mkiv" level="document" name="collectedtext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> @@ -4222,7 +4335,7 @@ </cd:command> </cd:interface> <cd:interface file="i-color.xml"> - <cd:command category="colors" file="colo-ext.mkiv" name="negatecolorbox"> + <cd:command category="colors" file="colo-ext.mkiv" level="system" name="negatecolorbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -4230,7 +4343,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ext.mkiv" name="colorintent" type="environment"> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="colorintent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="knockout"/> @@ -4239,10 +4352,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ext.mkiv" name="overprint" type="environment"/> - <cd:command category="colors" file="colo-ext.mkiv" name="knockout" type="environment"/> - <cd:command category="colors" file="colo-ext.mkiv" name="textcolorintent" type="environment"/> - <cd:command category="colors" file="colo-grp.mkiv" name="definecolorgroup"> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="overprint" type="environment"/> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="knockout" type="environment"/> + <cd:command category="colors" file="colo-ext.mkiv" level="document" name="textcolorintent" type="environment"/> + <cd:command category="colors" file="colo-grp.mkiv" level="style" name="definecolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4256,7 +4369,7 @@ <cd:triplet list="yes"/> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4321,7 +4434,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definecolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definecolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4331,7 +4444,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="defineglobalcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineglobalcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4341,7 +4454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="defineglobalcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineglobalcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4351,7 +4464,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definenamedcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definenamedcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4361,7 +4474,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definenamedcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definenamedcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4371,7 +4484,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="defineprocesscolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineprocesscolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4384,7 +4497,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definespotcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definespotcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4425,7 +4538,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definemultitonecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definemultitonecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4443,7 +4556,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="1"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="1"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4453,7 +4566,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="2"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="2"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4485,7 +4598,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="3"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definetransparency" variant="3"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4495,14 +4608,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="switchtocolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="switchtocolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" level="document" name="color"> + <cd:command _error_="category="colors" file="colo-ini.mkiv"" level="document" name="color"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4510,7 +4623,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="coloronly"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="coloronly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4518,7 +4631,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="transparent"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="transparent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4526,7 +4639,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="graycolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="graycolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4557,7 +4670,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="coloronly" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="coloronly" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -4592,29 +4705,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="currentcolor" type="environment"/> - <cd:command category="colors" file="colo-ini.mkiv" name="colorset" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="currentcolor" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="usecolors"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="usecolors"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="setupcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="setupcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="setupcolors"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="setupcolors"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -4682,7 +4795,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="definepalet" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="definepalet" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4692,22 +4805,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="getpaletsize"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="getpaletsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="paletsize"/> - <cd:command category="colors" file="colo-ini.mkiv" name="setuppalet"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="paletsize"/> + <cd:command ategory="colors" clevel="style" file="colo-ini.mkiv" name="setuppalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="setcolormodell"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="setcolormodell"> <cd:arguments> <cd:keywords> <cd:constant type="black"/> @@ -4720,8 +4833,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="protectedcolors" type="environment"/> - <cd:command category="colors" file="colo-ini.mkiv" name="defineintermediatecolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="protectedcolors" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="defineintermediatecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4740,7 +4853,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifelsecolor"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifelsecolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4753,7 +4866,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifcolorelse"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4766,7 +4879,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifcolor"> + <cd:command category="colors conditional" file="color-ini.mkiv" level="system" name="doifcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4776,77 +4889,77 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="textcolor" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="textcolor" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="MPcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="MPcoloronly"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPcoloronly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="MPtransparency"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPtransparency"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPoptions"> + <cd:command category="colors" file="colo-ini.mkiv" level="style" name="MPoptions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="colorvalue"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="grayvalue"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="grayvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="colorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="colorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="transparencycomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="transparencycomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" name="processcolorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="processcolorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifelseblack"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelseblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4859,7 +4972,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifblackelse"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4872,7 +4985,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4882,7 +4995,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse"> + <cd:command category="colors conditional" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4892,35 +5005,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showcolorbar"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showcolor"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showcolorset"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showcolorcomponents"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorcomponents"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showpalet"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showpalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4934,14 +5047,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="comparepalet"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="comparepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="showcolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="showcolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4955,7 +5068,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="colors" file="colo-run.mkiv" name="comparecolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" level="document" name="comparecolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4964,7 +5077,7 @@ </cd:command> </cd:interface> <cd:interface file="i-columns.xml"> - <cd:command file="page-mul.mkiv" level="style" name="setupcolumns"> + <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumns"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -5013,14 +5126,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" level="document" name="columns" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" level="document" name="columns" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumns"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" level="style" name="setupcolumnspan"> + <cd:command category="columns" file="page-mul.mkiv" level="style" name="setupcolumnspan"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -5030,14 +5143,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="columnspan" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" name="columnspan" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="setsimplecolumnhsize"> + <cd:command category="columns" file="page-mul.mkiv" name="setsimplecolumnhsize"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -5055,7 +5168,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="simplecolumns" type="environment"> + <cd:command category="columns" file="page-mul.mkiv" name="simplecolumns" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setsimplecolumnhsize"/> @@ -5064,7 +5177,7 @@ </cd:command> </cd:interface> <cd:interface file="i-combination.xml"> - <cd:command file="pack-com.mkiv" level="style" name="definecombination"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="definecombination"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5077,7 +5190,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="style" name="setupcombination"> + <cd:command category="tables" file="pack-com.mkiv" level="style" name="setupcombination"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5137,7 +5250,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="combination" type="environment" variant="matrix"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="combination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -5147,7 +5260,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="combination" type="environment"> + <cd:command category="tables" file="pack-com.mkiv" level="document" name="combination" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -5157,7 +5270,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix"> + <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -5165,7 +5278,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" level="document" name="floatcombination" type="environment"> + <cd:command category="float tables" file="pack-com.mkiv" level="document" name="floatcombination" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -5539,7 +5652,7 @@ </cd:command> </cd:interface> <cd:interface file="i-comment.xml"> - <cd:command file="scrn-wid.mkvi" level="style" name="definecomment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definecomment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5552,7 +5665,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="setupcomment"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupcomment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5636,7 +5749,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="comment" variant="instance"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="comment" variant="instance"> <cd:sequence> <cd:instance value="comment"/> </cd:sequence> @@ -5655,7 +5768,7 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="comment" type="environment" variant="instance"> + <cd:command category="pdf" file="scrn-wid.mkvi" generated="yes" level="document" name="comment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="comment"/> </cd:sequence> @@ -5671,318 +5784,318 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" level="document" name="placecomments"/> + <cd:command category="pdf" file="scrn-wid.mkvi" level="document" name="placecomments"/> </cd:interface> <cd:interface file="i-conversion.xml"> - <cd:command category="counter" file="core-con.mkiv" name="numbers"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Numbers"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="Numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="romannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Romannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="abjadnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="abjadnodotnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnodotnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="abjadnaivenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="abjadnaivenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="languagecharacters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="languagecharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="languageCharacters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="languageCharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="alphabeticnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Alphabeticnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="thainumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="thainumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="devanagarinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="devanagarinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="gurmurkhinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="gurmurkhinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="gujaratinumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="gujaratinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="tibetannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="tibetannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="greeknumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Greeknumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="arabicnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="persiannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="arabicdecimals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicdecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="persiandecimals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="persiandecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="arabicexnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="arabicexnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="koreannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="koreannumeralsp"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="koreannumeralsc"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreannumeralsc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="koreanparentnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreanparentnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="koreancirclenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="koreancirclenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="chinesenumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="chinesecapnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chinesecapnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="chineseallnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="chineseallnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="character"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Character"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="characters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="Characters"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="Characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="monthlong"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="monthlong"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="monthshort"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="monthshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="convertmonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="convertmonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="month"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="month"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="MONTH"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="MONTH"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="MONTHLONG"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="MONTHLONG"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="MONTHSHORT"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="MONTHSHORT"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="weekday"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="weekday"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="WEEKDAY"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="WEEKDAY"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="dayoftheweek"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="dayoftheweek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5995,7 +6108,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="getdayoftheweek"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="getdayoftheweek"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6008,7 +6121,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseleapyear"> + <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifelseleapyear"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6021,7 +6134,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifleapyearelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="style" name="doifleapyearelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6034,7 +6147,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="dayspermonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="dayspermonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6044,7 +6157,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="getdayspermonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="getdayspermonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6054,7 +6167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" level="document" name="currentdate"> + <cd:command category="counter language" file="core-con.mkiv" level="document" name="currentdate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="year"/> @@ -6097,7 +6210,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" level="document" name="date"> + <cd:command category="counter language" file="core-con.mkiv" level="document" name="date"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -6115,14 +6228,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="rawdate"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="rawdate"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="currentdate"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" level="document" name="currenttime"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="currenttime"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -6131,7 +6244,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="processmonth"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="processmonth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6144,7 +6257,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="processyear"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="processyear"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6160,7 +6273,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="defineconversion"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="defineconversion"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -6173,7 +6286,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="defineconversion" variant="list"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="defineconversion" variant="list"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -6263,7 +6376,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="uconvertnumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="uconvertnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:inherit name="convertnumber"/> @@ -6273,7 +6386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="system" name="doifelseconversiondefined"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversiondefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6286,7 +6399,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="system" name="doifconversiondefinedelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversiondefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6299,7 +6412,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="system" name="doifelseconversionnumber"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifelseconversionnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6315,7 +6428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" level="system" name="doifconversionnumberelse"> + <cd:command category="counter conditional" file="core-con.mkiv" level="system" name="doifconversionnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6331,7 +6444,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="wordtonumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="wordtonumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -6345,91 +6458,91 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="highordinalstr"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="highordinalstr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="ordinalstr"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="ordinalstr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="ordinaldaynumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="ordinaldaynumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="verbosenumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="verbosenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="VerboseNumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="VerboseNumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="smallcappedromannumerals"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="smallcappedromannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="smallcappedcharacters"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="smallcappedcharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="sloveniannumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="sloveniannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="slovenianNumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="slovenianNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="spanishnumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="spanishNumerals"> + <cd:command category="counter language" file="core-con.mkiv" level="style" name="spanishNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="unihex"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="unihex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="core-con.mkiv" name="continuednumber"> + <cd:command category="counter" file="core-con.mkiv" level="style" name="continuednumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -6556,7 +6669,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifelsecounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsecounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6569,7 +6682,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifcounterelse"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6582,7 +6695,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6592,7 +6705,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifnotcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifnotcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6891,7 +7004,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6904,7 +7017,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6917,7 +7030,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifdefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifdefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6927,7 +7040,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifundefinedcounter"> + <cd:command category="counter conditional" file="strc-num.mkiv" level="system" name="doifundefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6937,7 +7050,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-ini.mkvi" name="defineresetset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineresetset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6967,7 +7080,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-ini.mkvi" name="defineconversionset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineconversionset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6983,7 +7096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-ini.mkvi" name="defineprefixset"> + <cd:command category="counter" file="strc-ini.mkvi" level="style" name="defineprefixset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7285,7 +7398,7 @@ <cd:command category="language" file="typo-del.mkiv" level="document" name="subsentence" type="environment"/> </cd:interface> <cd:interface file="i-description.xml"> - <cd:command file="strc-des.mkvi" level="style" name="definedescription"> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="definedescription"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7298,7 +7411,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" level="style" name="setupdescription"> + <cd:command category="structure" file="strc-des.mkvi" level="style" name="setupdescription"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7426,7 +7539,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -7447,7 +7560,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example:title"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -7460,7 +7573,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" variant="example"> + <cd:command category="structure" file="strc-des.mkvi" generated="yes" level="document" name="description" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -7479,7 +7592,7 @@ </cd:command> </cd:interface> <cd:interface file="i-digits.xml"> - <cd:command file="typo-dig.mkiv" name="setdigitsmanipulation"> + <cd:command file="typo-dig.mkiv" level="system" name="setdigitsmanipulation"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -7487,15 +7600,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dig.mkiv" name="resetdigitsmanipulation"/> - <cd:command file="typo-dig.mkiv" name="equaldigits"> + <cd:command file="typo-dig.mkiv" level="system" name="resetdigitsmanipulation"/> + <cd:command file="typo-dig.mkiv" level="document" name="equaldigits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dig.mkiv" name="dummydigit"/> + <cd:command file="typo-dig.mkiv" level="document" name="dummydigit"/> </cd:interface> <cd:interface file="i-dimension.xml"> <cd:command file="mult-dim.mkvi" level="system" name="assigndimension"> @@ -7578,7 +7691,7 @@ </cd:command> </cd:interface> <cd:interface file="i-direction.xml"> - <cd:command file="typo-dir.mkiv" level="style" name="setupdirections"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setupdirections"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -7603,16 +7716,16 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-dir.mkiv" name="setdirection"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="setdirection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-dir.mkiv" name="resetdirection"/> - <cd:command file="supp-dir.mkiv" name="showdirsinmargin"/> - <cd:command file="supp-dir.mkiv" level="system" name="istltdir"> + <cd:command category="language alignment" file="typo-dir.mkiv" level="style" name="resetdirection"/> + <cd:command category="alignment" file="supp-dir.mkiv" level="document" name="showdirsinmargin"/> + <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istltdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7620,7 +7733,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" level="system" name="istrtdir"> + <cd:command category="alignment" file="supp-dir.mkiv" level="system" name="istrtdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7630,10 +7743,10 @@ </cd:command> </cd:interface> <cd:interface file="i-document.xml"> - <cd:command file="file-job.mkvi" level="document" name="text" type="environment"/> - <cd:command begin="autostart" end="autostop" file="file-job.mkvi" name="text" type="environment"/> - <cd:command file="file-job.mkvi" level="system" name="notext" type="environment"/> - <cd:command file="file-job.mkvi" level="document" name="environment" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="text" type="environment"/> + <cd:command begin="autostart" category="structure" end="autostop" file="file-job.mkvi" level="system" name="text" type="environment"/> + <cd:command category="structure" file="file-job.mkvi" level="system" name="notext" type="environment"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7641,7 +7754,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="environment" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7649,29 +7762,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="environment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useenvironment"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useenvironment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="currentenvironment"/> - <cd:command file="file-job.mkvi" level="document" name="project" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentenvironment"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7679,7 +7792,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="project" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7687,29 +7800,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="project"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="project" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="project" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useproject"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useproject"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="currentproject"/> - <cd:command file="file-job.mkvi" level="document" name="product" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentproject"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7717,7 +7830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="product" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7725,29 +7838,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="product"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="product" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="product" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="useproduct"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="useproduct"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="currentproduct"/> - <cd:command file="file-job.mkvi" level="document" name="component" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentproduct"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7755,7 +7868,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="component" type="environment" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7763,36 +7876,36 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="component"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="document" name="component" variant="string"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="component" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="usecomponent"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="usecomponent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="currentcomponent"/> - <cd:command file="file-job.mkvi" level="document" name="document" type="environment"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="currentcomponent"/> + <cd:command category="structure" file="file-job.mkvi" level="document" name="document" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="style" name="setupdocument"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="setupdocument"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -7819,14 +7932,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="presetdocument"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="presetdocument"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="documentvariable"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="documentvariable"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="file-job.mkvi" level="style" name="unexpandeddocumentvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7876,7 +7996,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="usedummystyleandcolor"> + <cd:command category="fonts colors" file="mult-aux.mkiv" level="system" name="usedummystyleandcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7886,14 +8006,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="usedummystyleparameter"> + <cd:command category="fonts" file="mult-aux.mkiv" level="system" name="usedummystyleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" level="system" name="usedummycolorparameter"> + <cd:command category="colors" file="mult-aux.mkiv" level="system" name="usedummycolorparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7902,7 +8022,7 @@ </cd:command> </cd:interface> <cd:interface file="i-effect.xml"> - <cd:command file="attr-eff.mkiv" level="style" name="defineeffect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="style" name="defineeffect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7915,7 +8035,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" level="style" name="setupeffect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="style" name="setupeffect"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7942,19 +8062,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" level="document" name="effect" type="environment"> + <cd:command category="pdf" file="attr-eff.mkiv" level="document" name="effect" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" generated="yes" level="document" name="effect" type="environment" variant="example"> + <cd:command category="pdf" file="attr-eff.mkiv" generated="yes" level="document" name="effect" type="environment" variant="example"> <cd:sequence> <cd:variable value="effect"/> </cd:sequence> </cd:command> - <cd:command file="attr-eff.mkiv" level="document" name="effect"> + <cd:command category="pdf" file="attr-eff.mkiv" level="document" name="effect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7964,7 +8084,7 @@ </cd:command> </cd:interface> <cd:interface file="i-enumeration.xml"> - <cd:command file="strc-enu.mkvi" level="style" name="defineenumeration"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="defineenumeration"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7977,7 +8097,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" level="style" name="setupenumeration"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="setupenumeration"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8153,7 +8273,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" level="style" name="setupenumerations"> + <cd:command category="structure" file="strc-enu.mkvi" level="style" name="setupenumerations"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8163,7 +8283,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example"> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -8184,7 +8304,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example:title"> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -8197,7 +8317,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" variant="example"> + <cd:command category="structure" file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -8216,7 +8336,7 @@ </cd:command> </cd:interface> <cd:interface file="i-export.xml"> - <cd:command file="back-exp.mkiv" level="system" name="setelementexporttag"> + <cd:command category="xml" file="back-exp.mkiv" level="system" name="setelementexporttag"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8233,7 +8353,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-exp.mkiv" level="style" name="setupexport"> + <cd:command category="xml" file="back-exp.mkiv" level="style" name="setupexport"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> @@ -8283,14 +8403,14 @@ </cd:command> </cd:interface> <cd:interface file="i-field.xml"> - <cd:command file="scrn-fld.mkvi" level="system" name="presetfieldsymbols"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="system" name="presetfieldsymbols"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="definefieldcategory"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldcategory"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8303,7 +8423,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldcategory"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupfieldcategory"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8418,7 +8538,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8431,7 +8551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8444,7 +8564,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="definefieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldbody"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8457,7 +8577,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupfieldbody"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8470,7 +8590,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fieldbody"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fieldbody"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8480,7 +8600,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldbodyset"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldbodyset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8490,7 +8610,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doifelsefieldbody"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doifelsefieldbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8503,7 +8623,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doiffieldbodyelse"> + <cd:command category="pdf conditional" file="scrn-fld.mkvi" level="system" name="doiffieldbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -8516,7 +8636,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8541,7 +8661,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definesubfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definesubfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8554,7 +8674,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="clonefield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="clonefield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8570,7 +8690,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="copyfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="copyfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8580,7 +8700,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fitfieldframed"> + <cd:command category="pdf background rules" file="scrn-fld.mkvi" level="document" name="fitfieldframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -8588,7 +8708,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fitfield"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fitfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8598,7 +8718,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8608,7 +8728,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8619,7 +8739,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8648,7 +8768,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfield"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8671,7 +8791,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setupfields"> + <cd:command category="pdf background" file="scrn-fld.mkvi" level="style" name="setupfields"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -8691,7 +8811,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="field"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="field"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8701,7 +8821,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="definefieldstack"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definefieldstack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8714,7 +8834,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="fieldstack"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="document" name="fieldstack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8729,7 +8849,7 @@ </cd:command> </cd:interface> <cd:interface file="i-figure.xml"> - <cd:command category="graphics" file="grph-fig.mkiv" name="figure" type="environment"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="figure" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8742,7 +8862,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="referring"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="referring"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8751,7 +8871,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="marking"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="marking"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8760,7 +8880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="remark"> + <cd:command category="graphics" file="grph-fig.mkiv" level="document" name="remark"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -8772,7 +8892,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="colorbar"> + <cd:command category="colors" file="grph-fig.mkiv" level="document" name="colorbar"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:color"/> @@ -8781,21 +8901,21 @@ </cd:command> </cd:interface> <cd:interface file="i-file.xml"> - <cd:command file="file-ini.mkvi" name="input"> + <cd:command category="structure" file="file-ini.mkvi" level="document" name="input"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="input" variant="string"> + <cd:command category="structure" file="file-ini.mkvi" level="document" name="input" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doiffile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8805,7 +8925,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifnotfile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifnotfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8815,7 +8935,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifelsefile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8828,7 +8948,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doiffileelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8841,24 +8961,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="jobfilename"/> - <cd:command file="core-sys.mkiv" name="jobfilesuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilebarename"/> - <cd:command file="core-sys.mkiv" name="inputfilerealsuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilesuffix"/> - <cd:command file="core-sys.mkiv" name="inputfilename"/> - <cd:command file="core-sys.mkiv" name="outputfilename"/> - <cd:command file="file-ini.mkvi" level="system" name="readingfile" type="environment"/> - <cd:command begin="push" end="pop" file="file-ini.mkvi" level="system" name="endofline" type="environment"/> - <cd:command file="file-ini.mkvi" level="system" name="restoreendofline"/> - <cd:command file="file-ini.mkvi" level="system" name="inputgivenfile"> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="jobfilename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="jobfilesuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilebarename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilerealsuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilesuffix"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="inputfilename"/> + <cd:command category="structure" file="core-sys.mkiv" level="system" name="outputfilename"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="readingfile" type="environment"/> + <cd:command begin="push" category="structure" end="pop" file="file-ini.mkvi" level="system" name="endofline" type="environment"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="restoreendofline"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="inputgivenfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifelsepath"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8871,7 +8991,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifpathelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8884,7 +9004,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifelsefileexists"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsefileexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8897,7 +9017,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doiffileexistselse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doiffileexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8910,7 +9030,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifelsepathexists"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelsepathexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8923,7 +9043,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifpathexistselse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifpathexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8936,7 +9056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifelseparentfile"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifelseparentfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8949,7 +9069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="doifparentfileelse"> + <cd:command category="structure conditional" file="file-ini.mkvi" level="system" name="doifparentfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8962,21 +9082,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="splitfilename"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="splitofffull"/> - <cd:command file="file-ini.mkvi" level="system" name="splitoffpath"/> - <cd:command file="file-ini.mkvi" level="system" name="splitoffbase"/> - <cd:command file="file-ini.mkvi" level="system" name="splitoffname"/> - <cd:command file="file-ini.mkvi" level="system" name="splitofftype"/> - <cd:command file="file-ini.mkvi" level="system" name="splitoffkind"/> - <cd:command file="file-ini.mkvi" level="system" name="splitoffroot"/> - <cd:command file="file-job.mkvi" level="system" name="doifelseinputfile"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitofffull"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffpath"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffbase"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffname"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitofftype"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffkind"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="splitoffroot"/> + <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifelseinputfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8989,7 +9109,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="doifinputfileelse"> + <cd:command category="structure conditional" file="file-job.mkvi" level="system" name="doifinputfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9002,45 +9122,45 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" level="system" name="processfile"> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="processfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="style" name="usepath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usepath"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="style" name="usesubpath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usesubpath"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="file-job.mkvi" name="path" type="environment"> + <cd:command begin="push" category="structure" end="pop" file="file-job.mkvi" level="system" name="path" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:path"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="resetpath"/> - <cd:command file="file-job.mkvi" name="allinputpaths"/> - <cd:command file="file-ini.mkvi" name="locatefilepath"> + <cd:command category="structure" file="file-job.mkvi" level="style" name="resetpath"/> + <cd:command category="structure" file="file-job.mkvi" level="system" name="allinputpaths"/> + <cd:command category="structure" file="file-ini.mkvi" level="system" name="locatefilepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="locatedfilepath"/> - <cd:command file="file-job.mkvi" level="style" name="usezipfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="locatedfilepath"/> + <cd:command category="structure" file="file-job.mkvi" level="style" name="usezipfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -9050,91 +9170,98 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="processfilemany"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfilemany"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="processfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfileonce"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="processfilenone"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="processfilenone"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadtexfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadtexfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadluafile"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadcldfile"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="loadanyfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadanyfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="loadtexfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadtexfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="loadluafileonce"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadluafileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="loadcldfileonce"> + <cd:command category="structure lua" file="file-job.mkvi" level="system" name="loadcldfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="loadanyfileonce"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="loadanyfileonce"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" level="system" name="continueifinputfile"> + <cd:command category="structure" file="file-job.mkvi" level="system" name="continueifinputfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readjobfile"> + <cd:command category="structure" file="file-job.mkvi" level="document" name="samplefile"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readjobfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9147,7 +9274,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readlocfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readlocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9160,7 +9287,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readsysfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsysfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9173,7 +9300,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readfixfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfixfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9189,7 +9316,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readsetfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readsetfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -9205,7 +9332,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9218,14 +9345,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="ReadFile"> + <cd:command category="structure" file="file-res.mkvi" level="system" name="ReadFile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readtexfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="readtexfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9238,7 +9365,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="readxmlfile"> + <cd:command category="structure conditional xml" file="file-res.mkvi" level="system" name="readxmlfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9251,7 +9378,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="doifelselocfile"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doifelselocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9264,7 +9391,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="doiflocfileelse"> + <cd:command category="structure conditional" file="file-res.mkvi" level="system" name="doiflocfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9277,14 +9404,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" level="system" name="locfilename"> + <cd:command category="structure" file="file-res.mkvi" level="system" name="locfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" level="system" name="definefilesynonym"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="definefilesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9294,7 +9421,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" level="system" name="definefilefallback"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="definefilefallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9304,7 +9431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" level="system" name="truefilename"> + <cd:command category="structure" file="file-sys.mkvi" level="system" name="truefilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -9313,7 +9440,7 @@ </cd:command> </cd:interface> <cd:interface file="i-filler.xml"> - <cd:command file="spac-flr.mkiv" level="style" name="definefiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="definefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9326,7 +9453,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" level="style" name="setupfiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="setupfiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9393,7 +9520,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="filler"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="filler"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -9405,7 +9532,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="checkedfiller"> + <cd:command category="rules" file="spac-flr.mkiv" level="style" name="checkedfiller"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="sym"/> @@ -9418,7 +9545,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="definelinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9431,7 +9558,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="setuplinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9487,7 +9614,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="setuplinefillers"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9497,7 +9624,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="linefiller" type="environment"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -9508,7 +9635,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setlinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -9518,7 +9645,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinline.xml"> - <cd:command file="pack-mrl.mkiv" level="style" name="setupfillinlines"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinlines"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9545,7 +9672,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="fillinline"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillinline"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> @@ -9554,7 +9681,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinrule.xml"> - <cd:command file="pack-mrl.mkiv" level="style" name="setupfillinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9593,7 +9720,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="fillinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillinrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9606,7 +9733,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="fillintext"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="fillintext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9621,7 +9748,7 @@ </cd:command> </cd:interface> <cd:interface file="i-firstline.xml"> - <cd:command file="typo-fln.mkiv" level="style" name="definefirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="definefirstline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9634,7 +9761,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" level="style" name="setupfirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="style" name="setupfirstline"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9658,14 +9785,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="setfirstline"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="document" name="setfirstline"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" level="system" name="applytofirstcharacter"> + <cd:command category="fonts colors" file="typo-fln.mkiv" level="system" name="applytofirstcharacter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -9675,7 +9802,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fittingpage.xml"> - <cd:command file="page-app.mkiv" level="style" name="definefittingpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="definefittingpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9688,7 +9815,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" level="style" name="setupfittingpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupfittingpage"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9716,7 +9843,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" level="document" name="fittingpage" type="environment"> + <cd:command category="background layout" file="page-app.mkiv" level="document" name="fittingpage" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9726,7 +9853,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance"> + <cd:command category="background layout" file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance"> <cd:sequence> <cd:instance value="fittingpage"/> </cd:sequence> @@ -9740,14 +9867,14 @@ <cd:constant value="MPpage"/> </cd:instances> </cd:command> - <cd:command file="page-app.mkiv" level="style" name="setupTEXpage"> + <cd:command category="background layout" file="page-app.mkiv" level="style" name="setupTEXpage"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-fig.mkiv" level="style" name="setupMPpage"> + <cd:command category="background layout metapost" file="meta-fig.mkiv" level="style" name="setupMPpage"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> @@ -9755,7 +9882,1037 @@ </cd:arguments> </cd:command> </cd:interface> - <error/> + <cd:interface file="i-floats.xml"> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="definefloat"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:singular"/> + <cd:constant type="cd:plural"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfloat"/> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="definefloat" variant="name"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:plural"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:singular"/> + </cd:keywords> + </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setupfloat"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="indentnext"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="default"> + <cd:inherit name="placefloat"/> + </cd:parameter> + <cd:parameter name="fallback"> + <cd:inherit name="placefloat"/> + </cd:parameter> + <cd:parameter name="inner"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="sidemethod"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="textmethod"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="sidealign"> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant default="yes" type="normal"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:constant type="cd:string"/> + </cd:parameter> + <cd:parameter name="local"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="availablewidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="availableheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="minwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="flushleft"/> + <cd:constant type="flushright"/> + <cd:constant type="center"/> + <cd:constant type="max"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + </cd:parameter> + <cd:parameter name="leftmargindistance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargindistance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="innermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="outermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="bottombefore"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="bottomafter"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="xmlsetup"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="catcodes"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="freeregion"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafter"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="height"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="offset"> + <cd:constant type="cd:dimension"/> + <cd:constant type="none"/> + <cd:constant type="overlay"/> + </cd:parameter> + <cd:parameter name="sidespacebefore"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="sidespaceafter"> + <cd:constant type="none"/> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="sidethreshold"> + <cd:constant type="old"/> + <cd:constant default="yes" type="dimension"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="ntop"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="nbottom"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant default="yes" type="big"/> + <cd:constant type="line"/> + <cd:constant type="depth"/> + </cd:parameter> + <cd:parameter name="nlines"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="cache"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setupfloats"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupfloatcaption"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="suffix"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixseparator"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixstopper"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="low"/> + <cd:constant type="high"/> + <cd:constant type="grid"/> + <cd:constant type="overlay"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="hang"/> + <cd:constant type="top"/> + <cd:constant default="yes" type="bottom"/> + <cd:constant type="stretch"/> + <cd:constant type="none"/> + <cd:constant type="default"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="numbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafter"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="topoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="bottomoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="number"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + <cd:constant type="none"/> + </cd:parameter> + <cd:parameter name="group"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="innermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="outermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant default="yes" type="fit"/> + <cd:constant type="max"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="minwidth"> + <cd:constant default="yes" type="fit"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" variant="instance"> + <cd:sequence> + <cd:string value="place"/> + <cd:instance value="float"/> + </cd:sequence> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:reference"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="document" name="placefloat"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:reference"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" type="environment" variant="instance"> + <cd:sequence> + <cd:string value="place"/> + <cd:instance value="float"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="bookmark"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="marking"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="list"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="document" name="placefloat" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:singular"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="title"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="bookmark"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="marking"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="list"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:reference"/> + </cd:parameter> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="cd:key"> + <cd:constant type="cd:value"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="floattext" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="float"/> + <cd:string value="text"/> + </cd:sequence> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:reference"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + <cd:instances> + <cd:constant value="chemical"/> + <cd:constant value="figure"/> + <cd:constant value="table"/> + <cd:constant value="intermezzo"/> + <cd:constant value="graphic"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="placelistoffloats" variant="instance"> + <cd:sequence> + <cd:string value="placelistof"/> + <cd:instance value="floats"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" generated="yes" level="document" name="completelistoffloats" variant="instance"> + <cd:sequence> + <cd:string value="completelistof"/> + <cd:instance value="floats"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:instances> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="floatuserdataparameter"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:key"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelserightpagefloat"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifrightpagefloatelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelseoddpagefloat"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifoddpagefloatelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifelsemainfloatbody"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="strc-flt.mkvi" level="system" name="doifmainfloatbodyelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="style" name="setuplocalfloats"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="noflocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="resetlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="somelocalfloat"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="getlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="flushlocalfloats"/> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="getlocalfloat"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="strc-flt.mkvi" level="system" name="forcelocalfloats"/> + <cd:command category="structure counter" file="tabl-tsp.mkiv" level="style" name="setupfloatsplitting"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="lines"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="conversion"> + <cd:constant type="cd:name"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="tabl-tsp.mkiv" level="system" name="splitfloat"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfloatsplitting"/> + </cd:assignments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:command"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="structure conditional" file="tabl-tsp.mkiv" level="system" name="doifnotinsidesplitfloat"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-flt.mkiv" level="document" name="placenamedfloat"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:reference"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-flt.mkiv" level="document" name="placefloatwithsetups"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="split"/> + <cd:constant type="always"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="backspace"/> + <cd:constant type="cutspace"/> + <cd:constant type="inleft"/> + <cd:constant type="inright"/> + <cd:constant type="inmargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="leftedge"/> + <cd:constant type="rightedge"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="inneredge"/> + <cd:constant type="outeredge"/> + <cd:constant type="text"/> + <cd:constant type="opposite"/> + <cd:constant type="reset"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant method="none" prefix="cd:sign" type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="grid"/> + <cd:constant type="high"/> + <cd:constant type="low"/> + <cd:constant type="fit"/> + <cd:constant type="90"/> + <cd:constant type="180"/> + <cd:constant type="270"/> + <cd:constant type="nonumber"/> + <cd:constant type="none"/> + <cd:constant type="local"/> + <cd:constant type="here"/> + <cd:constant type="force"/> + <cd:constant type="margin"/> + <cd:constant method="none" prefix="cd:sign" type="hang"/> + <cd:constant type="hanging"/> + <cd:constant type="tall"/> + <cd:constant type="both"/> + <cd:constant type="middle"/> + <cd:constant type="offset"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="auto"/> + <cd:constant type="page"/> + <cd:constant type="leftpage"/> + <cd:constant type="rightpage"/> + <cd:constant type="somewhere"/> + <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:reference"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-fontfamily.xml"> <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> <cd:arguments> @@ -9975,7 +11132,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sel.mkvi" name="definefontfamilypreset"> + <cd:command category="fonts" file="font-sel.mkvi" level="system" name="definefontfamilypreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9985,7 +11142,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sel.mkvi" name="definefontfamilypreset" variant="name"> + <cd:command category="fonts" file="font-sel.mkvi" level="system" name="definefontfamilypreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10032,7 +11189,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-col.mkvi" name="resetfontfallback"> + <cd:command category="fonts" file="font-col.mkvi" level="style" name="resetfontfallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10042,18 +11199,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-emp.mkvi" name="emphasistypeface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="emphasisboldface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="normalitalicface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="normalslantedface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="normalboldface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="normaltypeface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="swaptypeface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="typeface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="boldface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="italicface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="slantedface"/> - <cd:command category="fonts" file="font-emp.mkvi" name="swapface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="emphasistypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="emphasisboldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalboldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalitalicface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normalslantedface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="normaltypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="swaptypeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="typeface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="boldface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="italicface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="slantedface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="swapface"/> + <cd:command category="fonts" file="font-emp.mkvi" level="document" name="em"/> <cd:command category="fonts" file="font-fea.mkvi" level="style" name="definefontfeature"> <cd:arguments> <cd:keywords> @@ -10150,6 +11308,10 @@ <cd:parameter name="boundingbox"> <cd:constant type="yes"/> <cd:constant type="no"/> + <cd:constant type="background"/> + <cd:constant type="frame"/> + <cd:constant type="empty"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="compose"> <cd:constant type="yes"/> @@ -10237,7 +11399,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="adaptfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="adaptfontfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10247,7 +11409,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="fontfeaturelist"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="fontfeaturelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10257,72 +11419,72 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="addfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="addfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="addfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="addfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="subtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="subtractfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="subtractfeature" variant="direct"> + <cd:command ategory="fonts" clevel="style" file="font-fea.mkvi" name="subtractfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="replacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="replacefeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="replacefeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="replacefeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="resetandaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetandaddfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="resetandaddfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetandaddfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="resetfeature"/> - <cd:command category="fonts" file="font-fea.mkvi" name="revivefeature"/> - <cd:command category="fonts" file="font-fea.mkvi" name="setfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="resetfeature"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="revivefeature"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="setfontfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="feature"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="feature"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -10339,12 +11501,12 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:keywords> + <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="feature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" level="document" name="feature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -10361,12 +11523,12 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature"> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10379,7 +11541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse"> + <cd:command category="fonts conditional" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10392,35 +11554,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="doaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doaddfeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="dosubtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="dosubtractfeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="doreplacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doreplacefeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fea.mkvi" name="doresetandafffeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doresetandafffeature"> <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fil.mkvi" name="fontclass" type="environment"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="fontclass" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -10428,7 +11590,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fil.mkvi" name="classfont"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="classfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10463,7 +11625,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fil.mkvi" name="definefontfile"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="definefontfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10503,7 +11665,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fil.mkvi" level="system" name="doifelsefontsynonym"> + <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doifelsefontsynonym"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10516,7 +11678,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-fil.mkvi" level="system" name="doiffontsynonymelse"> + <cd:command category="fonts conditional" file="font-fil.mkvi" level="system" name="doiffontsynonymelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10546,22 +11708,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-gds.mkvi" name="loadfontgoodies"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="loadfontgoodies"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-gds.mkvi" name="setfontcolorsheme"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="setfontcolorsheme"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-gds.mkvi" name="resetfontcolorsheme"/> - <cd:command category="fonts" file="font-ini.mkvi" level="document" name="definedfont"> + <cd:command category="fonts" file="font-gds.mkvi" level="style" name="resetfontcolorsheme"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definedfont"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> @@ -10575,7 +11737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="bodyfontsize"/> + <cd:command ategory="fonts" clevel="system" file="font-ini.mkvi" name="bodyfontsize"/> <cd:command category="fonts" file="font-ini.mkvi" level="system" name="normalizebodyfontsize"> <cd:arguments> <cd:csname/> @@ -10601,7 +11763,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definefontstyle"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontstyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -10611,14 +11773,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definefontsize"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definefontalternative"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefontalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10651,7 +11813,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definefrozenfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="definefrozenfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10661,7 +11823,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definebodyfontenvironment"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definebodyfontenvironment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -10883,7 +12045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkiv" name="fastswitchtobodyfont"> + <cd:command category="fonts" file="font-ini.mkiv" level="system" name="fastswitchtobodyfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -10895,33 +12057,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="usebodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="usebodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="usebodyfontparameter"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="usebodyfontparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="fontchar"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="fontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="fontcharbyindex"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="fontcharbyindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="tochar"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="tochar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant method="range" prefix="e" type="cd:name"/> @@ -10936,7 +12098,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkiv" name="switchstyleonly"> + <cd:command ategory="fonts" clevel="style" file="font-ini.mkiv" name="switchstyleonly"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -10958,12 +12120,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkiv" name="switchstyleonly" variant="command"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="switchstyleonly" variant="command"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="definebodyfontswitch"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definebodyfontswitch"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10973,11 +12135,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="setsmallbodyfont"/> - <cd:command category="fonts" file="font-ini.mkvi" name="setbigbodyfont"/> - <cd:command category="fonts" file="font-ini.mkvi" name="setmainbodyfont"/> - <cd:command category="fonts" file="font-ini.mkvi" name="restoreglobalbodyfont"/> - <cd:command category="fonts" file="font-ini.mkvi" name="predefinefont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setsmallbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setbigbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="setmainbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="restoreglobalbodyfont"/> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="predefinefont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10987,28 +12149,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="predefinedfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="predefinedfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showbodyfont"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showbodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showbodyfontenvironment"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showbodyfontenvironment"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showfont"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> @@ -11018,7 +12180,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showfontstyle"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontstyle"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -11045,86 +12207,86 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showligature"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showligature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showligatures"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showligatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showfontstrip"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontstrip"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showminimalbaseline"/> - <cd:command category="fonts" file="font-run.mkiv" name="showkerning"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showminimalbaseline"/> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showkerning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showcharratio"> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showcharratio"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-run.mkiv" name="showfontparameters"/> - <cd:command category="fonts" file="font-pre.mkiv" name="setsmallcaps"/> - <cd:command category="fonts" file="font-pre.mkiv" name="setoldstyle"/> - <cd:command category="fonts" file="font-pre.mkiv" name="settabular"/> - <cd:command category="fonts" file="font-pre.mkiv" name="setsuperiors"/> - <cd:command category="fonts" file="font-pre.mkiv" name="tinyfont"/> - <cd:command category="fonts" file="font-pre.mkiv" name="infofont"/> - <cd:command category="fonts" file="font-pre.mkiv" name="infofontbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallbodyfont"/> - <cd:command category="fonts" file="font-pre.mkiv" name="bigbodyfont"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smaller"/> - <cd:command category="fonts" file="font-pre.mkiv" name="bigger"/> - <cd:command category="fonts" file="font-pre.mkiv" name="normal"/> - <cd:command category="fonts" file="font-pre.mkiv" name="bold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="mono"/> - <cd:command category="fonts" file="font-pre.mkiv" name="monobold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="slanted"/> - <cd:command category="fonts" file="font-pre.mkiv" name="italic"/> - <cd:command category="fonts" file="font-pre.mkiv" name="boldslanted"/> - <cd:command category="fonts" file="font-pre.mkiv" name="slantedbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="bolditalic"/> - <cd:command category="fonts" file="font-pre.mkiv" name="italicbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="small"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallnormal"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smalltype"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallslanted"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallboldslanted"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallslantedbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallbolditalic"/> - <cd:command category="fonts" file="font-pre.mkiv" name="smallitalicbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="sans"/> - <cd:command category="fonts" file="font-pre.mkiv" name="sansserif"/> - <cd:command category="fonts" file="font-pre.mkiv" name="roman"/> - <cd:command category="fonts" file="font-pre.mkiv" name="serif"/> - <cd:command category="fonts" file="font-pre.mkiv" name="regular"/> - <cd:command category="fonts" file="font-pre.mkiv" name="handwritten"/> - <cd:command category="fonts" file="font-pre.mkiv" name="calligraphic"/> - <cd:command category="fonts" file="font-pre.mkiv" name="sansnormal"/> - <cd:command category="fonts" file="font-pre.mkiv" name="sansbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="serifnormal"/> - <cd:command category="fonts" file="font-pre.mkiv" name="serifbold"/> - <cd:command category="fonts" file="font-pre.mkiv" name="mononormal"/> - <cd:command category="fonts" file="font-pre.mkiv" name="monobold"/> + <cd:command category="fonts" file="font-run.mkiv" level="document" name="showfontparameters"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setsmallcaps"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setoldstyle"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="settabular"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="setsuperiors"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="tinyfont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="infofont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="infofontbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="smallbodyfont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="bigbodyfont"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="smaller"/> + <cd:command category="fonts" file="font-pre.mkiv" level="style" name="bigger"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="normal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="bold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="mono"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="monobold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="slanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="italic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="boldslanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="slantedbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="bolditalic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="italicbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="small"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smalltype"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallslanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallboldslanted"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallslantedbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallbolditalic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="smallitalicbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sans"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansserif"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="roman"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serif"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="regular"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="handwritten"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="calligraphic"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="sansbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serifnormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="serifbold"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="mononormal"/> + <cd:command category="fonts" file="font-pre.mkiv" level="document" name="monobold"/> <cd:command category="fonts" file="font-sol.mkvi" level="style" name="definefontsolution"> <cd:arguments> <cd:keywords> @@ -11169,15 +12331,15 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sol.mkvi" name="setfontsolution"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="setfontsolution"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sol.mkvi" name="resetfontsolution"/> - <cd:command category="fonts" file="font-sol.mkvi" name="fontsolution" type="environment"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="resetfontsolution"/> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="fontsolution" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11197,15 +12359,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="applyalternativestyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="applyalternativestyle"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="dontconvertfont"/> - <cd:command category="fonts" file="font-sty.mkvi" name="redoconvertfont"/> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="setupalternativestyles"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="method"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="auto"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="dontconvertfont"/> + <cd:command category="fonts" file="font-sty.mkvi" level="system" name="redoconvertfont"/> <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definestyle"> <cd:arguments> <cd:keywords> @@ -11238,12 +12410,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" generated="yes" name="style" type="environment" variant="instance"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" level="document" name="style" type="environment" variant="instance"> <cd:sequence> <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" generated="yes" name="style" variant="instance"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" level="document" name="style" variant="instance"> <cd:sequence> <cd:instance value="style"/> </cd:sequence> @@ -11253,7 +12425,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="style" type="environment" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" type="environment" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11261,14 +12433,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="style" type="environment"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="style" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11279,7 +12451,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="style"> + <cd:command category="fonts" file="font-sty.mkvi" level="document" name="style"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -11316,14 +12488,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sty.mkvi" name="styleinstance"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="styleinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="doifelseitalic"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelseitalic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11333,7 +12505,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="doifitalicelse"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifitalicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11343,28 +12515,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="getprivateslot"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="getprivateslot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-ini.mkvi" name="getprivatechar"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="getprivatechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="glyphfontfile"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="glyphfontfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="getnamedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getnamedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11374,7 +12546,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="getnamedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getnamedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11384,7 +12556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="getglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11395,7 +12567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="getglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="getglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11406,7 +12578,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="resolvedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="resolvedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11424,7 +12596,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="resolvedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" level="style" name="resolvedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11442,14 +12614,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="setfont"> + <cd:command category="fonts" file="font-sym.mkvi" level="system" name="setfont"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="doifelsefontchar"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doifelsefontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11465,7 +12637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-sym.mkvi" name="doiffontcharelse"> + <cd:command category="fonts conditional" file="font-sym.mkvi" level="system" name="doiffontcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11481,15 +12653,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-tra.mkiv" name="showchardata"> + <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showchardata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-tra.mkiv" name="showfontdata"/> - <cd:command category="fonts" file="font-tra.mkiv" name="doifelsefontpresent"> + <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showfontdata"/> + <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doifelsefontpresent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11502,7 +12674,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-tra.mkiv" name="doiffontpresentelse"> + <cd:command category="fonts conditional" file="font-tra.mkiv" level="system" name="doiffontpresentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11515,7 +12687,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-tra.mkiv" name="showotfcomposition"> + <cd:command category="fonts" file="font-tra.mkiv" level="document" name="showotfcomposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11532,16 +12704,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="font-var.mkvi" name="fontclass"/> - <cd:command category="fonts" file="font-var.mkvi" name="fontbody"/> - <cd:command category="fonts" file="font-var.mkvi" name="fontstyle"/> - <cd:command category="fonts" file="font-var.mkvi" name="fontalternative"/> - <cd:command category="fonts" file="font-var.mkvi" name="fontsize"/> - <cd:command category="fonts" file="font-var.mkvi" name="fontface"/> - <cd:command category="fonts" file="type-ini.mkvi" name="typescriptone"/> - <cd:command category="fonts" file="type-ini.mkvi" name="typescripttwo"/> - <cd:command category="fonts" file="type-ini.mkvi" name="typescriptthree"/> - <cd:command category="fonts" file="type-ini.mkvi" name="typescriptcollection" type="environment"> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontclass"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontbody"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontstyle"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontalternative"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontsize"/> + <cd:command category="fonts" file="font-var.mkvi" level="system" name="fontface"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptone"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescripttwo"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptthree"/> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="typescriptcollection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11588,8 +12760,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="type-ini.mkvi" name="quittypescriptscanning"/> - <cd:command category="fonts" file="type-ini.mkvi" name="definetypescriptsynonym"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="quittypescriptscanning"/> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="definetypescriptsynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11618,7 +12790,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="type-ini.mkvi" name="definetypescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="definetypescriptprefix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11628,7 +12800,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="type-ini.mkvi" name="typescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" level="system" name="typescriptprefix"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -11741,7 +12913,7 @@ </cd:command> </cd:interface> <cd:interface file="i-form.xml"> - <cd:command file="scrn-fld.mkvi" level="style" name="setupforms"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setupforms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -11758,7 +12930,7 @@ </cd:command> </cd:interface> <cd:interface file="i-formula.xml"> - <cd:command category="mathematics" file="math-for.mkiv" name="defineformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="defineformula"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11790,6 +12962,11 @@ <cd:constant type="flushright"/> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + <cd:constant type="page"/> + </cd:parameter> <cd:parameter name="strut"> <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> @@ -11827,6 +13004,10 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:parameter> <cd:parameter name="margin"> @@ -11855,6 +13036,10 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant default="yes" type="none"/> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="expansion"> <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> @@ -11871,10 +13056,6 @@ <cd:parameter name="catcodes"> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="split"> - <cd:constant type="yes"/> - <cd:constant default="yes" type="no"/> - </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -11889,7 +13070,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="definesubformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="definesubformula"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11937,6 +13118,10 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> @@ -11954,10 +13139,40 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula" type="environment" variant="assignment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="option"> + <cd:constant type="packed"/> + <cd:constant type="tight"/> + <cd:constant type="middle"/> + <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> + <cd:inherit name="setupbodyfont"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="standard"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="snaptogrid"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="system" name="defineformulaalternative"> <cd:arguments> <cd:keywords> @@ -11978,6 +13193,10 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant method="none" prefix="-" type="line"/> + <cd:constant method="none" prefix="-" type="halfline"/> <cd:inherit name="setupbodyfont"/> </cd:keywords> <cd:content/> @@ -11993,7 +13212,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="strc-mat.mkiv" name="subformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="subformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12002,7 +13221,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="strc-mat.mkiv" name="namedsubformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="namedsubformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12070,14 +13289,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="strc-mat" name="formulanumber"> + <cd:command category="mathematics" file="strc-mat" level="document" name="formulanumber"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="strc-mat" name="placecurrentformulanumber"/> + <cd:command category="mathematics" file="strc-mat" level="system" name="placecurrentformulanumber"/> + <cd:command category="mathematics" file="strc-mat" level="document" name="alignhere" scope="formula"/> + <cd:command category="mathematics" file="strc-mat" level="document" name="breakhere" scope="formula"/> </cd:interface> <cd:interface file="i-fraction.xml"> <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="definemathfraction"> @@ -12133,15 +13354,6 @@ <cd:parameter name="right"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:parameter name="inlinethreshold"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="displaythreshold"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="fences"> - <cd:constant type="cd:string"/> - </cd:parameter> <cd:parameter name="rulethickness"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -12154,6 +13366,17 @@ <cd:constant default="yes" type="none"/> <cd:constant type="overlay"/> </cd:parameter> + <cd:parameter name="inlinethreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="displaythreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="fences"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -12220,7 +13443,7 @@ </cd:command> </cd:interface> <cd:interface file="i-framed.xml"> - <cd:command file="pack-rul.mkiv" level="style" name="defineframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12233,7 +13456,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="setupframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12429,21 +13652,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="frameddimension"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="frameddimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedparameter"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="document" name="framed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12451,7 +13674,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance"> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance"> <cd:sequence> <cd:instance value="framed"/> </cd:sequence> @@ -12466,7 +13689,7 @@ <cd:constant value="fitfieldframed"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="normalframedwithsettings"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="normalframedwithsettings"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -12474,7 +13697,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="document" name="framed" type="environment"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="framed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -12484,7 +13707,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="fastlocalframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="fastlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12495,7 +13718,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="localframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12506,7 +13729,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="directlocalframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="directlocalframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12514,7 +13737,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="localframedwithsettings"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="localframedwithsettings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12525,7 +13748,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="document" name="placeframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="placeframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12536,7 +13759,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="document" name="inframed"> + <cd:command category="background rules" file="pack-rul.mkiv" level="document" name="inframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12544,7 +13767,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="definemathframed"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="definemathframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12557,7 +13780,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="setupmathframed"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" level="style" name="setupmathframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12567,7 +13790,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance"> + <cd:command category="background rules mathematics" file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance"> <cd:sequence> <cd:instance value="mathframed"/> </cd:sequence> @@ -12583,7 +13806,7 @@ <cd:constant value="mcframed"/> </cd:instances> </cd:command> - <cd:command file="math-for.mkiv" level="style" name="defineformulaframed"> + <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="defineformulaframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12596,7 +13819,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" level="style" name="setupformulaframed"> + <cd:command category="background rules mathematics" file="math-for.mkiv" level="style" name="setupformulaframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12606,7 +13829,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="defineframedtext"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12619,7 +13842,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="setupframedtext"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12662,7 +13885,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="setupframedtexts"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedtexts"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12672,7 +13895,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance"> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -12686,7 +13909,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance"> + <cd:command category="background rules" file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -12705,7 +13928,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="defineframedcontent"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="defineframedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12718,7 +13941,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="style" name="setupframedcontent"> + <cd:command category="background rules" file="pack-rul.mkiv" level="style" name="setupframedcontent"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12750,7 +13973,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedcontent" type="environment"> + <cd:command category="background rules" file="pack-rul.mkiv" level="system" name="framedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -12758,7 +13981,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" level="system" name="installleftframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installleftframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12768,7 +13991,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" level="system" name="installrightframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installrightframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12778,7 +14001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" level="system" name="installtopframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installtopframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12788,7 +14011,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" level="system" name="installbottomframerenderer"> + <cd:command category="background rules" file="pack-fen.mkiv" level="system" name="installbottomframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -12799,6 +14022,92 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-framedtable.xml"> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="defineframedtable"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtable"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablerow"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="style" name="setupframedtablecolumn"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedtable" type="environment"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedrow" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="tables" file="tabl-frm.mkiv" level="document" name="framedcell" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-graphics.xml"> <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="defineexternalfigure"> <cd:arguments> @@ -12965,9 +14274,6 @@ <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> <cd:parameter name="xmax"> <cd:constant type="cd:number"/> </cd:parameter> @@ -13081,7 +14387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="doifelsefigure"> + <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doifelsefigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13094,7 +14400,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="doiffigureelse"> + <cd:command category="graphics conditional" file="grph-inc.mkiv" level="system" name="doiffigureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13128,42 +14434,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollection" type="environment"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="externalfigurecollectionmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="externalfigurecollectionparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13173,35 +14479,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="efcminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="efcmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="efcminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="efcmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="efcparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="efcparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13211,7 +14517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="grph-inc.mkiv" name="overlayfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="overlayfigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13267,7 +14573,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" level="document" name="typesetbuffer"> + <cd:command category="graphics buffer" file="grph-fig.mkiv" level="document" name="typesetbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -13278,7 +14584,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" level="style" name="definetypesetting"> + <cd:command category="graphics structure" file="grph-fig.mkiv" level="style" name="definetypesetting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13291,7 +14597,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" level="document" name="typesetfile"> + <cd:command category="graphics structure" file="grph-fig.mkiv" level="document" name="typesetfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13306,7 +14612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="pack-box.mkiv" name="backgroundimage"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="backgroundimage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13322,7 +14628,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="pack-box.mkiv" name="backgroundimagefill"> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="backgroundimagefill"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13340,7 +14646,7 @@ </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> - <cd:command category="layout" file="page-grd.mkiv" name="showgrid"> + <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -13358,7 +14664,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="spac-ver.mkiv" name="definegridsnapping"> + <cd:command category="layout" file="spac-ver.mkiv" level="style" name="definegridsnapping"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13420,6 +14726,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:csname/> @@ -13460,6 +14771,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> <cd:content/> @@ -13498,6 +14814,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> @@ -13514,8 +14835,8 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command category="layout" file="spac-ver.mkiv" name="showgridsnapping"/> - <cd:command file="meta-grd.mkiv" level="document" name="basegrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="showgridsnapping"/> + <cd:command category="graphics" file="meta-grd.mkiv" level="document" name="basegrid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -13572,7 +14893,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-grd.mkiv" level="document" name="grid"> + <cd:command category="graphics" file="meta-grd.mkiv" level="document" name="grid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -13581,7 +14902,7 @@ </cd:command> </cd:interface> <cd:interface file="i-help.xml"> - <cd:command file="scrn-hlp.mkvi" level="style" name="definehelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="style" name="definehelp"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13594,7 +14915,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" level="style" name="setuphelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="style" name="setuphelp"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13604,7 +14925,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" variant="instance"> + <cd:command category="pdf" file="scrn-hlp.mkvi" generated="yes" level="document" name="help" variant="instance"> <cd:sequence> <cd:instance value="help"/> </cd:sequence> @@ -13623,7 +14944,7 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" type="environment" variant="instance"> + <cd:command category="pdf" file="scrn-hlp.mkvi" generated="yes" level="document" name="help" type="environment" variant="instance"> <cd:sequence> <cd:instance value="help"/> </cd:sequence> @@ -13636,7 +14957,7 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" level="system" name="doifelsehelp"> + <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifelsehelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -13646,7 +14967,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" level="system" name="doifhelpelse"> + <cd:command category="pdf conditional" file="scrn-hlp.mkvi" level="system" name="doifhelpelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -13656,8 +14977,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="placehelp"/> - <cd:command file="scrn-hlp.mkvi" name="showhelp"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="placehelp"/> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="showhelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -13667,7 +14988,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="helptext"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="helptext"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:reference"/> @@ -13680,7 +15001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="helptext" type="environment"> + <cd:command category="pdf" file="scrn-hlp.mkvi" level="document" name="helptext" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:reference"/> @@ -13689,7 +15010,7 @@ </cd:command> </cd:interface> <cd:interface file="i-highlight.xml"> - <cd:command category="fonts" file="core-sys.mkiv" level="style" name="definehighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="definehighlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13702,7 +15023,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="core-sys.mkiv" level="style" name="setuphighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="style" name="setuphighlight"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13722,7 +15043,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example"> + <cd:command category="fonts colors" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -13732,7 +15053,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="core-sys.mkiv" level="document" name="highlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13742,14 +15063,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="core-sys.mkiv" level="document" name="highlight" type="environment"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="highlight" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="core-sys.mkiv" level="document" name="directhighlight"> + <cd:command category="fonts colors" file="core-sys.mkiv" level="document" name="directhighlight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13761,7 +15082,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hspace.xml"> - <cd:command file="spac-hor.mkiv" level="style" name="definehspace"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="definehspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -13774,7 +15095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="hspace"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="document" name="hspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -13800,22 +15121,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="hairspace"/> - <cd:command file="spac-hor.mkiv" name="thinspace"/> - <cd:command file="spac-hor.mkiv" name="medspace"/> - <cd:command file="spac-hor.mkiv" name="thickspace"/> - <cd:command file="spac-hor.mkiv" name="autoinsertnextspace"/> - <cd:command file="spac-ver.mkiv" name="hglue"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="hairspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="document" name="thinspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="medspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thickspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="autoinsertnextspace"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="hglue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="frenchspacing"/> - <cd:command file="spac-hor.mkiv" name="newfrenchspacing"/> - <cd:command file="spac-hor.mkiv" name="nonfrenchspacing"/> - <cd:command file="spac-hor.mkiv" level="style" name="setupspacing"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="frenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="newfrenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="nonfrenchspacing"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setupspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -13824,30 +15145,30 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="space"/> - <cd:command file="spac-hor.mkiv" level="system" name="removelastspace"/> - <cd:command file="spac-hor.mkiv" level="system" name="nospace"/> - <cd:command file="spac-hor.mkiv" name="fixedspace"/> - <cd:command file="spac-hor.mkiv" name="fixedspaces"/> - <cd:command file="spac-hor.mkiv" level="system" name="keepunwantedspaces"/> - <cd:command file="spac-hor.mkiv" level="system" name="removeunwantedspaces"/> - <cd:command file="spac-hor.mkiv" name="thinspace"/> - <cd:command file="spac-hor.mkiv" name="negthinspace"/> - <cd:command file="spac-hor.mkiv" name="enspace"/> - <cd:command file="spac-hor.mkiv" name="enskip"/> - <cd:command file="spac-hor.mkiv" name="quad"/> - <cd:command file="spac-hor.mkiv" name="qquad"/> - <cd:command file="spac-hor.mkiv" name="emspace"/> - <cd:command file="spac-hor.mkiv" name="dotfskip"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="space"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="removelastspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="nospace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="document" name="fixedspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="fixedspaces"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="keepunwantedspaces"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="removeunwantedspaces"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negthinspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enskip"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quad"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="qquad"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="emspace"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dotfskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="leftskipadaption"/> - <cd:command file="spac-hor.mkiv" level="system" name="rightskipadaption"/> - <cd:command file="spac-hor.mkiv" level="system" name="dosetleftskipadaption"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="leftskipadaption"/> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="rightskipadaption"/> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetleftskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -13857,7 +15178,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="dosetrightskipadaption"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="dosetrightskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -13867,7 +15188,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="doadaptleftskip"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -13877,7 +15198,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="doadaptrightskip"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="system" name="doadaptrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -13887,7 +15208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="activatespacehandler"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="activatespacehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -13897,7 +15218,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="quads"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quads"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -13906,7 +15227,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hyphenation.xml"> - <cd:command file="lang-hyp.mkiv" level="style" name="setuphyphenation"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="setuphyphenation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -13921,7 +15242,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="hyphenation" type="environment"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="hyphenation" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="original"/> @@ -13934,7 +15255,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" level="style" name="definehypenationfeatures"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="definehypenationfeatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13989,7 +15310,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" level="style" name="sethyphenationfeatures"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="sethyphenationfeatures"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13997,8 +15318,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="resethyphenationfeatures"/> - <cd:command file="lang-hyp.mkiv" name="registerhyphenationpattern"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="resethyphenationfeatures"/> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="registerhyphenationpattern"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14008,7 +15329,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="unregisterhyphenationpattern"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="unregisterhyphenationpattern"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14018,7 +15339,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="showhyphenationtrace"> + <cd:command category="language" file="lang-hyp.mkiv" level="document" name="showhyphenationtrace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14028,7 +15349,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="registerhyphenationexception"> + <cd:command category="language" file="lang-hyp.mkiv" level="style" name="registerhyphenationexception"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -14038,7 +15359,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" level="style" name="setuphyphenmark"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setuphyphenmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="sign"> @@ -14048,14 +15369,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" level="style" name="definebreakpoints"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="definebreakpoints"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" level="style" name="definebreakpoint"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="definebreakpoint"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14096,7 +15417,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" level="style" name="setbreakpoints"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="setbreakpoints"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -14104,76 +15425,76 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="resetbreakpoints"/> - <cd:command file="supp-box.mkiv" name="showhyphens"> + <cd:command category="language" file="typo-brk.mkiv" level="style" name="resetbreakpoints"/> + <cd:command category="language" file="supp-box.mkiv" level="document" name="showhyphens"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedword"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedword"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedpar"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedpar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedfile"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedcoloredword"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedcoloredword"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hyphenatedhbox"> + <cd:command category="language" file="supp-box.mkiv" level="document" name="hyphenatedhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlbefore"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlbefore"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlafter"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlafter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="sethyphenatedurlnormal"> + <cd:command category="language" file="lang-url.mkiv" level="style" name="sethyphenatedurlnormal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="hyphenatedurl"> + <cd:command category="language" file="lang-url.mkiv" level="document" name="hyphenatedurl"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-url.mkiv" name="hyphenatedfilename"> + <cd:command category="language" file="lang-url.mkiv" level="document" name="hyphenatedfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -14182,7 +15503,7 @@ </cd:command> </cd:interface> <cd:interface file="i-imposition.xml"> - <cd:command file="page-imp.mkiv" level="system" name="installshipoutmethod"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="installshipoutmethod"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14192,7 +15513,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" level="system" name="invokepageheandler"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="invokepageheandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -14202,7 +15523,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-imp.mkiv" name="setuparranging"> + <cd:command category="layout" file="page-imp.mkiv" level="style" name="setuparranging"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="disable"/> @@ -14260,7 +15581,7 @@ <cd:command begin="push" category="layout" end="pop" file="page-imp.mkiv" level="system" name="arrangedpages" type="environment"/> </cd:interface> <cd:interface file="i-indent.xml"> - <cd:command file="spac-hor.mkiv" level="style" name="defineindenting"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="defineindenting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14286,7 +15607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="style" name="setupindenting"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setupindenting"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="small"/> @@ -14310,16 +15631,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="synchronizeindenting"/> - <cd:command file="spac-hor.mkiv" level="system" name="useindentingparameter"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="synchronizeindenting"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentingparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="indentation"/> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="noindentation"/> - <cd:command coreprimitive="yes" file="spac-hor.mkiv" name="doindentation"/> - <cd:command file="spac-hor.mkiv" level="system" name="checknextindentation"> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="indentation"/> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="document" name="noindentation"/> + <cd:command category="whitespace" coreprimitive="yes" file="spac-hor.mkiv" level="system" name="doindentation"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="checknextindentation"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -14328,16 +15649,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="useindentnextparameter"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="useindentnextparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="system" name="dorechecknextindentation"/> - <cd:command begin="push" end="pop" file="spac-hor.mkiv" level="system" name="indentation" type="environment"/> + <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="dorechecknextindentation"/> + <cd:command begin="push" category="whitespace" end="pop" file="spac-hor.mkiv" level="system" name="indentation" type="environment"/> </cd:interface> <cd:interface file="i-indentedtext.xml"> - <cd:command file="strc-ind.mkiv" level="style" name="defineindentedtext"> + <cd:command category="structure" file="strc-ind.mkiv" level="style" name="defineindentedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14350,7 +15671,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" level="style" name="setupindentedtext"> + <cd:command category="structure" file="strc-ind.mkiv" level="style" name="setupindentedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14396,12 +15717,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" generated="yes" level="document" name="indentedtext" type="environment" variant="example"> + <cd:command category="structure" file="strc-ind.mkiv" generated="yes" level="document" name="indentedtext" type="environment" variant="example"> <cd:sequence> <cd:variable value="indentedtext"/> </cd:sequence> </cd:command> - <cd:command file="strc-ind.mkiv" level="document" name="indentedtext" type="environment"> + <cd:command category="structure" file="strc-ind.mkiv" level="document" name="indentedtext" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14423,7 +15744,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-drp.mkiv" level="style" name="setupinitial"> + <cd:command _error_="category="fonts" file="typo-drp.mkiv"" level="style" name="setupinitial"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14474,14 +15795,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-drp.mkiv" name="placeinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="document" name="placeinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-drp.mkiv" name="setinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="document" name="setinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14493,42 +15814,42 @@ </cd:command> </cd:interface> <cd:interface file="i-injector.xml"> - <cd:command file="typo-inj.mkiv" name="resetinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="resetinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="markinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="markinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checkinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checkinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checkpreviousinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checkpreviousinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="checknextinjector"> + <cd:command file="typo-inj.mkiv" level="system" name="checknextinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="setinjector"> + <cd:command file="typo-inj.mkiv" level="document" name="setinjector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14541,7 +15862,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-inj.mkiv" name="showinjector"> + <cd:command file="typo-inj.mkiv" level="document" name="showinjector"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14550,7 +15871,7 @@ </cd:command> </cd:interface> <cd:interface file="i-insertion.xml"> - <cd:command file="page-ins.mkiv" level="system" name="defineinsertion"> + <cd:command category="structure" file="page-ins.mkiv" level="system" name="defineinsertion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14563,7 +15884,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" level="system" name="setupinsertion"> + <cd:command category="structure" file="page-ins.mkiv" level="system" name="setupinsertion"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14579,7 +15900,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" level="system" name="doifelseinsertion"> + <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifelseinsertion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14592,7 +15913,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" level="system" name="doifinsertionelse"> + <cd:command category="structure conditional" file="page-ins.mkiv" level="system" name="doifinsertionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14607,7 +15928,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interaction.xml"> - <cd:command file="scrn-ini.mkvi" level="style" name="defineinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="defineinteraction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14620,7 +15941,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" level="style" name="setupinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="setupinteraction"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14718,14 +16039,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" level="style" name="setupinteraction" variant="name"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="style" name="setupinteraction" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="interaction" type="environment"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="system" name="interaction" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -14733,7 +16054,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setinteraction"> + <cd:command category="pdf" file="scrn-ini.mkvi" level="system" name="setinteraction"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -14741,7 +16062,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" level="system" name="doifelselocation"> + <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doifelselocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14751,7 +16072,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" level="system" name="doiflocationelse"> + <cd:command category="pdf conditional" file="scrn-ini.mkvi" level="system" name="doiflocationelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14763,7 +16084,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionbar.xml"> - <cd:command file="scrn-bar.mkvi" level="style" name="defineinteractionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="defineinteractionbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14776,7 +16097,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" level="style" name="setupinteractionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="setupinteractionbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14839,7 +16160,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="interactionbar"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="interactionbar"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14849,7 +16170,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="interactionbuttons"> + <cd:command category="pdf" file="scrn-bar.mkvi" level="style" name="interactionbuttons"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupinteractionbar"/> @@ -14863,7 +16184,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionmenu.xml"> - <cd:command file="scrn-but.mkvi" level="style" name="defineinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="defineinteractionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14876,7 +16197,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" level="style" name="setupinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="setupinteractionmenu"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14987,28 +16308,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="interactionmenu" type="environment"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="interactionmenu" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="resetinteractionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="resetinteractionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="includemenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="includemenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="interactionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="interactionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15018,7 +16339,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="menubutton" variant="interactionmenu"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="menubutton" variant="interactionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15034,7 +16355,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="menubutton" variant="button"> + <cd:command category="pdf" file="scrn-but.mkvi" level="style" name="menubutton" variant="button"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -15047,7 +16368,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="registermenubuttons"> + <cd:command category="pdf" file="scrn-but.mkvi" level="system" name="registermenubuttons"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15059,7 +16380,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionscreen.xml"> - <cd:command file="scrn-pag.mkvi" level="style" name="setupinteractionscreen"> + <cd:command category="pdf" file="scrn-pag.mkvi" level="style" name="setupinteractionscreen"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -15100,6 +16421,8 @@ <cd:constant type="portrait"/> <cd:constant type="page"/> <cd:constant type="paper"/> + <cd:constant type="attachment"/> + <cd:constant type="layer"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> @@ -15111,7 +16434,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-pag.mkvi" name="screen"> + <cd:command category="pdf" file="scrn-pag.mkvi" level="document" name="screen"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="page"/> @@ -15365,7 +16688,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interlinespace.xml"> - <cd:command file="spac-ver.mkiv" level="style" name="defineinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15378,7 +16701,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15418,7 +16741,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15433,14 +16756,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15450,7 +16773,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15465,14 +16788,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15482,7 +16805,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15497,21 +16820,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace"> <cd:arguments> <cd:assignments delimiters="braces" list="yes"> <cd:inherit name="setupinterlinespace"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -15526,21 +16849,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-interlinespace.xml"> - <cd:command file="spac-ver.mkiv" level="style" name="defineinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15553,7 +16876,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15593,7 +16916,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15608,14 +16931,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15625,7 +16948,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15640,14 +16963,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15657,7 +16980,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15672,21 +16995,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="switchtointerlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace"> <cd:arguments> <cd:assignments delimiters="braces" list="yes"> <cd:inherit name="setupinterlinespace"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -15701,21 +17024,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-italiccorrection.xml"> - <cd:command category="fonts" file="typo-itc.mkvi" name="setitaliccorrection"> + <cd:command category="fonts" file="typo-itc.mkvi" level="system" name="setitaliccorrection"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -15724,9 +17047,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="fonts" file="typo-itc.mkvi" name="resetitaliccorrection"/> - <cd:command category="fonts" file="typo-itc.mkvi" name="italiccorrection"/> - <cd:command category="fonts" file="typo-itc.mkvi" name="setupitaliccorrection"> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="resetitaliccorrection"/> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="italiccorrection"/> + <cd:command category="fonts" file="typo-itc.mkvi" level="style" name="setupitaliccorrection"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> @@ -15738,7 +17061,7 @@ </cd:command> </cd:interface> <cd:interface file="i-itemgroup.xml"> - <cd:command file="strc-itm.mkvi" level="style" name="defineitemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="style" name="defineitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15751,7 +17074,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroup"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15960,7 +17283,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16166,7 +17489,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroups"> + <cd:command category="structure counter" file="strc-itm.mkvi" level="style" name="setupitemgroups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16177,7 +17500,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance"> + <cd:command category="structure counter" file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -16198,7 +17521,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" level="document" name="itemgroup" type="environment" variant="instance"> + <cd:command category="structure" file="strc-itm.mkvi" generated="yes" level="document" name="itemgroup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -16214,7 +17537,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="itemgroup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16227,29 +17550,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="item" scope="itemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="item" scope="itemgroup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="noitem" scope="itemgroup"/> - <cd:command file="strc-itm.mkvi" level="document" name="itemtag" scope="itemgroup"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="noitem" scope="itemgroup"/> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="itemtag" scope="itemgroup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="item" scope="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="item" scope="itemgroup" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="head" scope="itemgroup" type="environment"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="head" scope="itemgroup" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -16259,7 +17582,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="item"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="item"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="item"/> @@ -16269,7 +17592,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -16281,7 +17604,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="none"> + <cd:command category="structure" file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="none"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> @@ -16291,7 +17614,7 @@ </cd:command> </cd:interface> <cd:interface file="i-items.xml"> - <cd:command file="typo-itm.mkiv" level="style" name="defineitems"> + <cd:command category="symbols" file="typo-itm.mkiv" level="style" name="defineitems"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16304,7 +17627,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" level="style" name="setupitems"> + <cd:command category="symbols" file="typo-itm.mkiv" level="style" name="setupitems"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16364,7 +17687,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" level="document" name="items"> + <cd:command category="symbols" file="typo-itm.mkiv" level="document" name="items"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> @@ -16376,7 +17699,7 @@ </cd:command> </cd:interface> <cd:interface file="i-javascript.xml"> - <cd:command file="java-ini.mkiv" level="system" name="JScode" type="environment"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="JScode" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16389,7 +17712,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" level="system" name="JSpreamble" type="environment"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="JSpreamble" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16403,7 +17726,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" level="system" name="setJSpreamble"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="setJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16411,7 +17734,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" level="system" name="addtoJSpreamble"> + <cd:command category="pdf" file="java-ini.mkiv" level="system" name="addtoJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16419,7 +17742,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" level="style" name="useJSscripts"> + <cd:command category="pdf" file="java-ini.mkiv" level="style" name="useJSscripts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -16431,7 +17754,7 @@ </cd:command> </cd:interface> <cd:interface file="i-kerning.xml"> - <cd:command file="typo-krn.mkiv" level="style" name="definecharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="definecharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16444,7 +17767,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" level="style" name="setupcharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupcharacterkerning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16470,7 +17793,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setcharacterkerning"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setcharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -16478,8 +17801,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="resetcharacterkerning"/> - <cd:command file="typo-krn.mkiv" generated="yes" level="document" name="characterkerning" variant="example"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="resetcharacterkerning"/> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" generated="yes" level="document" name="characterkerning" variant="example"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -16492,7 +17815,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" level="document" name="kerncharacters"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="kerncharacters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16502,7 +17825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" level="document" name="letterspacing"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="letterspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16512,7 +17835,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" level="document" name="stretched"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="document" name="stretched"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -16522,7 +17845,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" level="style" name="setupstretched"> + <cd:command category="fonts whitespace" file="typo-krn.mkiv" level="style" name="setupstretched"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -16531,7 +17854,7 @@ </cd:command> </cd:interface> <cd:interface file="i-label.xml"> - <cd:command file="strc-lab.mkiv" level="style" name="definelabel"> + <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16544,7 +17867,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" level="style" name="setuplabel"> + <cd:command category="structure" file="strc-lab.mkiv" level="style" name="setuplabel"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16665,6 +17988,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="stretch"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="shrink"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -16715,7 +18044,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" level="document" name="label" variant="example"> + <cd:command category="structure" file="strc-lab.mkiv" generated="yes" level="document" name="label" variant="example"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -16728,7 +18057,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" level="document" name="currentlabel" variant="example"> + <cd:command category="structure" file="strc-lab.mkiv" generated="yes" level="document" name="currentlabel" variant="example"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> @@ -16782,7 +18111,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="presetlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="presetlabeltext" variant="instance"> <cd:sequence> <cd:string value="preset"/> <cd:instance value="label"/> @@ -16810,7 +18139,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="copylabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="copylabeltext" variant="instance"> <cd:sequence> <cd:string value="copy"/> <cd:instance value="label"/> @@ -16838,7 +18167,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltext" type="environment" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltext" type="environment" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -16863,7 +18192,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labellanguage" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="system" name="labellanguage" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="language"/> @@ -16880,7 +18209,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltext" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -16902,7 +18231,7 @@ <cd:constant value="btxlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltexts" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="labeltexts" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="texts"/> @@ -16921,7 +18250,7 @@ <cd:constant value="mathlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="leftlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="leftlabeltext" variant="instance"> <cd:sequence> <cd:string value="left"/> <cd:instance value="label"/> @@ -16938,7 +18267,7 @@ <cd:constant value="mathlabel"/> </cd:instances> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="rightlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="rightlabeltext" variant="instance"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> @@ -17080,7 +18409,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifelselanguage"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelselanguage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17093,7 +18422,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-ini.mkiv" level="system" name="doiflanguageelse"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doiflanguageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17106,7 +18435,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifelsepatterns"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifelsepatterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17119,7 +18448,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifpatternselse"> + <cd:command category="language conditional" file="lang-ini.mkiv" level="system" name="doifpatternselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17163,8 +18492,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-ini.mkiv" name="currentlanguage"/> - <cd:command category="language" file="lang-ini.mkiv" name="currentmainlanguage"/> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="currentlanguage"/> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="currentmainlanguage"/> <cd:command category="language" file="lang-lab.mkiv" level="document" name="commalistsentence"> <cd:arguments> <cd:keywords list="yes"> @@ -17177,7 +18506,7 @@ </cd:command> </cd:interface> <cd:interface file="i-layer.xml"> - <cd:command file="pack-box.mkiv" level="style" name="setuplayeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="style" name="setuplayeredtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17194,7 +18523,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="layeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="layeredtext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplayer"/> @@ -17208,7 +18537,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="placelayeredtext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="placelayeredtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17225,7 +18554,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayerframed"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayerframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17239,7 +18568,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayerframed" variant="combination"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayerframed" variant="combination"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17251,7 +18580,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setlayertext"> + <cd:command category="background" file="pack-box.mkiv" level="document" name="setlayertext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17279,7 +18608,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="style" name="definelayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="definelayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17292,7 +18621,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="style" name="setuplayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="setuplayer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17422,42 +18751,42 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="resetlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="resetlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="flushlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="flushlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="tightlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="tightlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="placelayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="placelayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="composedlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="composedlayer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="setlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="document" name="setlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17474,7 +18803,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="system" name="definelayerpreset"> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="definelayerpreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17484,7 +18813,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="system" name="definelayerpreset" variant="name"> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="definelayerpreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17494,7 +18823,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="system" name="doifelselayerdata"> + <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doifelselayerdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17507,7 +18836,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" level="system" name="doiflayerdataelse"> + <cd:command category="background conditional" file="pack-lyr.mkiv" level="system" name="doiflayerdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17520,9 +18849,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="layerwidth"/> - <cd:command file="pack-lyr.mkiv" name="layerheight"/> - <cd:command file="pack-lyr.mkiv" name="setMPlayer"> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerwidth"/> + <cd:command category="background" file="pack-lyr.mkiv" level="system" name="layerheight"/> + <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="setMPlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17536,7 +18865,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="getMPlayer"> + <cd:command category="background metapost" file="pack-lyr.mkiv" level="document" name="getMPlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17768,7 +19097,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifelselayoutdefined"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelselayoutdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17781,7 +19110,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17810,14 +19139,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" name="layout" type="environment"> + <cd:command category="layout" file="page-lay.mkiv" level="document" name="layout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifelseoddpage"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelseoddpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -17827,7 +19156,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifoddpageelse"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifoddpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -17837,7 +19166,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -17850,7 +19179,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifbothsides"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifbothsides"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -17863,7 +19192,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-lay.mkiv" level="system" name="rightorleftpageaction"> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="rightorleftpageaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -17873,7 +19202,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-run.mkiv" name="showprint"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showprint"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setuppapersize"/> @@ -17886,7 +19215,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-run.mkiv" name="showframe"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showframe"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="top"/> @@ -17904,7 +19233,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-run.mkiv" name="showsetups"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showsetups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -17921,7 +19250,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-run.mkiv" name="showlayout"> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showlayout"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -17938,11 +19267,31 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-run.mkiv" name="showmargins"/> - <cd:command category="layout" file="page-spr.mkiv" name="spread" type="environment"/> + <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/> + <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelsetopofpage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiftopofpageelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-linenumber.xml"> - <cd:command file="page-lin.mkvi" level="style" name="definelinenumbering"> + <cd:command category="structure" file="page-lin.mkvi" level="style" name="definelinenumbering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17955,7 +19304,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="style" name="setuplinenumbering"> + <cd:command category="structure" file="page-lin.mkvi" level="style" name="setuplinenumbering"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18032,7 +19381,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="linenumbering" type="environment"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="linenumbering" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18056,7 +19405,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="linenumbering" type="environment" variant="argument"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="linenumbering" type="environment" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18067,28 +19416,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="someline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="someline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="startline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="startline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="stopline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="stopline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="system" name="doifelsesamelinereference"> + <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifelsesamelinereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18101,7 +19450,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse"> + <cd:command category="structure conditional" file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18114,7 +19463,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="inline"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="inline"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -18124,7 +19473,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" level="document" name="inlinerange"> + <cd:command category="structure" file="page-lin.mkvi" level="document" name="inlinerange"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -18337,7 +19686,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-ltb.mkiv" name="linetablecell" type="environment"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablecell" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -18347,7 +19696,7 @@ <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetable" type="environment"/> <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablehead" type="environment"/> <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="linetablebody" type="environment"/> - <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="processlinetablebuffer"> + <cd:command category="tables buffer" file="tabl-ltb.mkiv" level="document" name="processlinetablebuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> @@ -18363,7 +19712,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linewidth.xml"> - <cd:command file="pack-rul.mkiv" level="style" name="setuplinewidth"> + <cd:command category="layout" file="pack-rul.mkiv" level="style" name="setuplinewidth"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> @@ -18373,10 +19722,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="linewidth"/> + <cd:command category="layout" file="pack-rul.mkiv" level="style" name="linewidth"/> </cd:interface> <cd:interface file="i-list.xml"> - <cd:command file="strc-lst.mkvi" level="style" name="definelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18389,7 +19738,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="setuplist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplist"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:list"/> @@ -18650,7 +19999,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doifelselist"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelselist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -18663,7 +20012,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doiflistelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doiflistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -18676,7 +20025,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writebetweenlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writebetweenlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18689,7 +20038,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writedatatolist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writedatatolist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18704,7 +20053,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="writetolist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="writetolist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18720,7 +20069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="document" name="placelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="placelist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:list"/> @@ -18730,7 +20079,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placerawlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="placerawlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18740,7 +20089,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="document" name="completelist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="completelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18750,7 +20099,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="definecombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18763,7 +20112,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="setupcombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setupcombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18773,7 +20122,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="document" name="placecombinedlist"> + <cd:command category="structure" file="strc-lst.mkvi" level="document" name="placecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -18783,7 +20132,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="setupcombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="style" name="setupcombinedlist" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="combinedlist"/> @@ -18797,7 +20146,7 @@ <cd:constant value="content"/> </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" level="document" name="placecombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="document" name="placecombinedlist" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="combinedlist"/> @@ -18811,7 +20160,7 @@ <cd:constant value="content"/> </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" level="document" name="completecombinedlist" variant="instance"> + <cd:command category="structure" file="strc-lst.mkvi" generated="yes" level="document" name="completecombinedlist" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -18825,21 +20174,21 @@ <cd:constant value="content"/> </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" name="structurelistuservariable"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="structurelistuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="rawstructurelistuservariable"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="rawstructurelistuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -18849,7 +20198,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -18859,7 +20208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -18869,7 +20218,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse"> + <cd:command category="structure conditional" file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -18879,7 +20228,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="definelistextra"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelistextra"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18892,7 +20241,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="setuplistextra"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplistextra"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18907,7 +20256,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="definelistalternative"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="definelistalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18920,7 +20269,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="style" name="setuplistalternative"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="setuplistalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18953,7 +20302,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="determinelistcharacteristics"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="determinelistcharacteristics"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:list"/> @@ -18963,14 +20312,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="currentlistentrynumber"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrytitle"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrytitlerendered"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrypagenumber"/> - <cd:command file="strc-lst.mkvi" name="currentlistsymbol"/> - <cd:command file="strc-lst.mkvi" name="listlength"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrywrapper" type="environment"/> - <cd:command file="strc-lst.mkvi" level="system" name="currentlistentryreferenceattribute"> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrynumber"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrytitle"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrytitlerendered"/> + <cd:command category="structure" file="strc-lst.mkvi" level="style" name="currentlistentrypagenumber"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistsymbol"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="listlength"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrywrapper" type="environment"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentryreferenceattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="number"/> @@ -18980,8 +20329,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" level="system" name="currentlistentrydestinationattribute"/> - <cd:command file="strc-lst.mkvi" level="system" name="currentlistentrylimitedtext"> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrydestinationattribute"/> + <cd:command category="structure" file="strc-lst.mkvi" level="system" name="currentlistentrylimitedtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -18990,58 +20339,58 @@ </cd:command> </cd:interface> <cd:interface file="i-logo.xml"> - <cd:command file="cont-log.mkiv" name="TeX"/> - <cd:command file="cont-log.mkiv" name="ConTeXt"/> - <cd:command file="cont-log.mkiv" name="PPCHTeX"/> - <cd:command file="cont-log.mkiv" name="PRAGMA"/> - <cd:command file="cont-log.mkiv" name="LaTeX"/> - <cd:command file="cont-log.mkiv" name="TaBlE"/> - <cd:command file="cont-log.mkiv" name="PiCTeX"/> - <cd:command file="cont-log.mkiv" name="AmSTeX"/> - <cd:command file="cont-log.mkiv" name="LamSTeX"/> - <cd:command file="cont-log.mkiv" name="Context"/> - <cd:command file="cont-log.mkiv" name="MetaFont"/> - <cd:command file="cont-log.mkiv" name="MetaPost"/> - <cd:command file="cont-log.mkiv" name="MetaFun"/> - <cd:command file="cont-log.mkiv" name="eTeX"/> - <cd:command file="cont-log.mkiv" name="pdfTeX"/> - <cd:command file="cont-log.mkiv" name="pdfeTeX"/> - <cd:command file="cont-log.mkiv" name="Lua"/> - <cd:command file="cont-log.mkiv" name="luaTeX"/> - <cd:command file="cont-log.mkiv" name="luajitTeX"/> - <cd:command file="cont-log.mkiv" name="metaTeX"/> - <cd:command file="cont-log.mkiv" name="XeTeX"/> - <cd:command file="cont-log.mkiv" name="LuaTeX"/> - <cd:command file="cont-log.mkiv" name="LuajitTeX"/> - <cd:command file="cont-log.mkiv" name="MKII"/> - <cd:command file="cont-log.mkiv" name="MKIV"/> - <cd:command file="cont-log.mkiv" name="MKVI"/> - <cd:command file="cont-log.mkiv" name="MKIX"/> - <cd:command file="cont-log.mkiv" name="MKXI"/> - <cd:command file="cont-log.mkiv" name="MPII"/> - <cd:command file="cont-log.mkiv" name="MPIV"/> - <cd:command file="cont-log.mkiv" name="MPVI"/> - <cd:command file="cont-log.mkiv" name="METAFONT"/> - <cd:command file="cont-log.mkiv" name="METAPOST"/> - <cd:command file="cont-log.mkiv" name="PPCHTEX"/> - <cd:command file="cont-log.mkiv" name="CONTEXT"/> - <cd:command file="cont-log.mkiv" name="METAFUN"/> - <cd:command file="cont-log.mkiv" name="TEX"/> - <cd:command file="cont-log.mkiv" name="LATEX"/> - <cd:command file="cont-log.mkiv" name="PICTEX"/> - <cd:command file="cont-log.mkiv" name="TABLE"/> - <cd:command file="cont-log.mkiv" name="AMSTEX"/> - <cd:command file="cont-log.mkiv" name="LAMSTEX"/> - <cd:command file="cont-log.mkiv" name="INRSTEX"/> - <cd:command file="cont-log.mkiv" name="ETEX"/> - <cd:command file="cont-log.mkiv" name="PDFTEX"/> - <cd:command file="cont-log.mkiv" name="PDFETEX"/> - <cd:command file="cont-log.mkiv" name="LUATEX"/> - <cd:command file="cont-log.mkiv" name="LUAJITTEX"/> - <cd:command file="cont-log.mkiv" name="XETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ConTeXt"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PRAGMA"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TaBlE"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PiCTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AmSTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LamSTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Context"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFont"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaPost"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MetaFun"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="eTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="pdfeTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="Lua"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="luajitTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="metaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XeTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuaTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LuajitTeX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKII"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKIV"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKVI"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKIX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MKXI"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPII"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPIV"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="MPVI"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFONT"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAPOST"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PPCHTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="CONTEXT"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="METAFUN"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LATEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PICTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="TABLE"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="AMSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LAMSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="INRSTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="ETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="PDFETEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUATEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="LUAJITTEX"/> + <cd:command category="symbols" file="cont-log.mkiv" level="document" name="XETEX"/> </cd:interface> <cd:interface file="i-lohi.xml"> - <cd:command file="typo-scr.mkiv" level="style" name="definelow"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19054,7 +20403,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="setuplow"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19076,7 +20425,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="low" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="low" variant="instance"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> @@ -19087,12 +20436,12 @@ <cd:constant value="unitslow"/> </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="low"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="low"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="definehigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definehigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19105,7 +20454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="setuphigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuphigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19127,7 +20476,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="high" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="high" variant="instance"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> @@ -19138,12 +20487,12 @@ <cd:constant value="unitshigh"/> </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="high"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="high"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="definelowhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelowhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19156,7 +20505,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="setuplowhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplowhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19181,7 +20530,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="lowhigh" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="lowhigh" variant="instance"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -19194,7 +20543,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="lohi"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="lohi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19204,7 +20553,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="hilo"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="hilo"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19214,7 +20563,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="definelowmidhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="definelowmidhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19227,7 +20576,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="style" name="setuplowmidhigh"> + <cd:command category="fonts" file="typo-scr.mkiv" level="style" name="setuplowmidhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19249,7 +20598,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="lowmidhigh" variant="instance"> + <cd:command category="fonts" file="typo-scr.mkiv" generated="yes" level="document" name="lowmidhigh" variant="instance"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -19259,14 +20608,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="lomihi"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="lomihi"> <cd:arguments> <cd:content/> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" level="document" name="himilo"> + <cd:command category="fonts" file="typo-scr.mkiv" level="document" name="himilo"> <cd:arguments> <cd:content/> <cd:content/> @@ -19275,127 +20624,127 @@ </cd:command> </cd:interface> <cd:interface file="i-lua.xml"> - <cd:command file="back-exp.mkiv" level="system" name="taggedctxcommand"> + <cd:command category="lua" file="back-exp.mkiv" level="system" name="taggedctxcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" level="system" name="luafunction"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="luafunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" level="system" name="cldprocessfile"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldprocessfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" level="system" name="cldloadfile"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldloadfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" level="system" name="cldcontext"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="cldf-ini.mkiv" level="system" name="cldcommand"> + <cd:command category="lua" file="cldf-ini.mkiv" level="system" name="cldcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxdirectlua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxdirectlua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxlatelua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlatelua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxsprint"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxsprint"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxcommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxdirectcommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxdirectcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxlatecommand"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlatecommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxreport"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxreport"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxlua"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxlua"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="luacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="luacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="lateluacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="lateluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="directluacode"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="directluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="luaversion"/> - <cd:command file="luat-cod.mkiv" level="system" name="registerctxluafile"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="luaversion"/> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="registerctxluafile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -19405,32 +20754,32 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" level="system" name="ctxloadluafile"> + <cd:command category="lua" file="luat-cod.mkiv" level="system" name="ctxloadluafile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="lua" type="environment"/> - <cd:command file="luat-ini.mkiv" level="system" name="luacode" type="environment"/> - <cd:command file="luat-ini.mkiv" level="system" name="luamajorversion"/> - <cd:command file="luat-ini.mkiv" level="system" name="luaminorversion"/> - <cd:command file="luat-ini.mkiv" level="system" name="luaexpanded"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="lua" type="environment"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luacode" type="environment"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luamajorversion"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaminorversion"/> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="luaparameterset" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaparameterset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="luaparameterset"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaparameterset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19438,52 +20787,52 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="luaconditional"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="luaconditional"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="ctxluacode"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxluacode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="ctxfunctiondefinition" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunctiondefinition" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunctiondefinition" variant="example"> + <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunctiondefinition" variant="example"> <cd:sequence> <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="ctxfunction" type="environment"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="ctxfunction"> + <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunction" variant="example"> + <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunction" variant="example"> <cd:sequence> <cd:variable value="ctxfunction"/> </cd:sequence> </cd:command> </cd:interface> <cd:interface file="i-makeup.xml"> - <cd:command file="page-mak.mkvi" level="style" name="definemakeup"> + <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="definemakeup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19496,7 +20845,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" level="style" name="setupmakeup"> + <cd:command category="structure layout" file="page-mak.mkvi" level="style" name="setupmakeup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19588,7 +20937,8 @@ <cd:constant default="yes" type="empty"/> </cd:parameter> <cd:parameter name="style"> - <cd:inherit name="value-style"/> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="color"> <cd:constant type="cd:color"/> @@ -19596,7 +20946,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" level="document" name="makeup" type="environment"> + <cd:command category="structure layout" file="page-mak.mkvi" level="document" name="makeup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19606,7 +20956,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance"> + <cd:command category="structure layout" file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -19625,7 +20975,7 @@ </cd:command> </cd:interface> <cd:interface file="i-marginblock.xml"> - <cd:command file="page-mbk.mkvi" level="style" name="definemarginblock"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="definemarginblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19638,7 +20988,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mbk.mkvi" level="style" name="setupmarginblock"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="style" name="setupmarginblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19691,7 +21041,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mbk.mkvi" name="marginblock" type="environment"> + <cd:command category="structure layout" file="page-mbk.mkvi" level="document" name="marginblock" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -19700,7 +21050,7 @@ </cd:command> </cd:interface> <cd:interface file="i-margindata.xml"> - <cd:command file="typo-mar.mkiv" level="style" name="definemargindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="definemargindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19713,7 +21063,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" level="style" name="setupmargindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="setupmargindata"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19808,7 +21158,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" level="style" name="setupmarginframed"> + <cd:command category="structure" file="typo-mar.mkiv" level="style" name="setupmarginframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19818,7 +21168,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" generated="yes" level="document" name="margindata" variant="instance"> + <cd:command category="structure" file="typo-mar.mkiv" generated="yes" level="document" name="margindata" variant="instance"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -19854,7 +21204,7 @@ <cd:constant value="margintext"/> </cd:instances> </cd:command> - <cd:command file="typo-mar.mkiv" level="document" name="margindata"> + <cd:command category="structure" file="typo-mar.mkiv" level="document" name="margindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19873,14 +21223,14 @@ </cd:command> </cd:interface> <cd:interface file="i-marker.xml"> - <cd:command file="attr-mkr.mkiv" level="system" name="definemarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="definemarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" level="system" name="setmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="setmarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19890,14 +21240,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" level="system" name="resetmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="resetmarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" level="system" name="boxmarker"> + <cd:command category="attribute" file="attr-mkr.mkiv" level="system" name="boxmarker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19955,7 +21305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="setmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="setmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -19965,7 +21315,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="resetmarking"> + <cd:command file="strc-mar.mkiv" level="system" name="resetmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -19985,7 +21335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="system" name="doifelsemarking"> + <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifelsemarking"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -19998,7 +21348,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" level="system" name="doifmarkingelse"> + <cd:command category="conditional" file="strc-mar.mkiv" level="system" name="doifmarkingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -20294,7 +21644,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" level="system" name="inlineordisplaymath"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="inlineordisplaymath"> <cd:arguments> <cd:content/> <cd:content/> @@ -20355,7 +21705,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" generated="yes" name="mathcommand" variant="example"> + <cd:command category="mathematics" file="math-ini.mkiv" generated="yes" level="document" name="mathcommand" variant="example"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -20368,58 +21718,51 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathcommand"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="math-ini.mkiv" name="mathop"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mathop"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mbox"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mtext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mtext"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathfunction"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mathfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mfunction"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="mfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" level="system" name="mfunctionlabeltext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="mfunctionlabeltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="stackrel"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="stackrel"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="apply"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="apply"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="definemathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="definemathstyle"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20438,7 +21781,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="setupmathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="setupmathstyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="display"/> @@ -20455,7 +21798,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="setmathstyle"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="setmathstyle"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="display"/> @@ -20472,7 +21815,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathstyle" type="environment"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="mathstyle" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="display"/> @@ -20489,13 +21832,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="math-ini.mkiv" level="system" name="mathstyle" type="environment"/> - <cd:command file="math-ini.mkiv" level="system" name="usemathstyleparameter"> + <cd:command begin="push" category="mathematics" end="pop" file="math-ini.mkiv" level="system" name="mathstyle" type="environment"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="usemathstyleparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" level="system" name="usemathstyleparameter" type="environment"> + <cd:command category="mathematics" file="math-ini.mkiv" level="system" name="usemathstyleparameter" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -20649,71 +21992,71 @@ <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbf"/> <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbi"/> <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathbs"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathitalic"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathupright"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathdefault"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathscript"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathfraktur"/> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathblackboard"/> - <cd:command file="supp-mat.mkiv" name="displaymath"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathitalic"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathupright"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathdefault"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathscript"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathfraktur"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathblackboard"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="displaymath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="inlinemath"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="inlinemath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="textmath"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="style" name="textmath"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="imath" type="environment"/> - <cd:command file="supp-mat.mkiv" name="dmath" type="environment"/> - <cd:command file="supp-mat.mkiv" name="mathmode" type="environment"/> - <cd:command file="supp-mat.mkiv" name="nonmathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="imath" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="dmath" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="mathmode" type="environment"/> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="nonmathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="displaymathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="displaymathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="inlinemathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="inlinemathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="automathematics"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="automathematics"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="cramped"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="cramped"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedllap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedllap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedrlap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedrlap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-mat.mkiv" name="crampedclap"> + <cd:command category="mathematics" file="supp-mat.mkiv" level="system" name="crampedclap"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-del.mkiv" name="autointegral"> + <cd:command category="mathematics" file="math-del.mkiv" level="system" name="autointegral"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -20728,7 +22071,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathalignment.xml"> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathalignment"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathalignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20741,7 +22084,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathalignment"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathalignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20781,7 +22124,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -20797,7 +22140,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathcases.xml"> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathcases"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="definemathcases"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20810,7 +22153,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathcases"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" level="style" name="setupmathcases"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20839,7 +22182,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance"> + <cd:command category="mathematics alignment" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -21087,10 +22430,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-fen.mkiv" name="checkedfences" type="environment"/> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="checkedfences" type="environment"/> </cd:interface> <cd:interface file="i-mathmatrix.xml"> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathmatrix"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="definemathmatrix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21103,7 +22446,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathmatrix"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="style" name="setupmathmatrix"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21144,7 +22487,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance"> + <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -21158,7 +22501,7 @@ <cd:constant value="mathmatrix"/> </cd:instances> </cd:command> - <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="matrices" type="environment"> + <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -21194,6 +22537,18 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bordermatrix" type="environment"/> + <cd:command category="mathematics tables" file="math-pln.mkiv" level="document" name="bbordermatrix" type="environment"/> </cd:interface> <cd:interface file="i-mathornament.xml"> <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathornament"> @@ -21404,7 +22759,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -21420,17 +22775,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathextensible" variant="instance"> <cd:sequence> - <cd:variable value="mathextensible"/> + <cd:instance value="mathextensible"/> </cd:sequence> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> @@ -21438,8 +22787,92 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:constant value="xrel"/> + <cd:constant value="xequal"/> + <cd:constant value="xleftarrow"/> + <cd:constant value="xrightarrow"/> + <cd:constant value="xleftrightarrow"/> + <cd:constant value="xLeftarrow"/> + <cd:constant value="xRightarrow"/> + <cd:constant value="xLeftrightarrow"/> + <cd:constant value="xtwoheadleftarrow"/> + <cd:constant value="xtwoheadrightarrow"/> + <cd:constant value="xmapsto"/> + <cd:constant value="xhookleftarrow"/> + <cd:constant value="xhookrightarrow"/> + <cd:constant value="xleftharpoondown"/> + <cd:constant value="xleftharpoonup"/> + <cd:constant value="xrightharpoondown"/> + <cd:constant value="xrightharpoonup"/> + <cd:constant value="xrightoverleftarrow"/> + <cd:constant value="xleftrightharpoons"/> + <cd:constant value="xrightleftharpoons"/> + <cd:constant value="xtriplerel"/> + <cd:constant value="mrel"/> + <cd:constant value="mequal"/> + <cd:constant value="mleftarrow"/> + <cd:constant value="mrightarrow"/> + <cd:constant value="mleftrightarrow"/> + <cd:constant value="mLeftarrow"/> + <cd:constant value="mRightarrow"/> + <cd:constant value="mLeftrightarrow"/> + <cd:constant value="mtwoheadleftarrow"/> + <cd:constant value="mtwoheadrightarrow"/> + <cd:constant value="mmapsto"/> + <cd:constant value="mhookleftarrow"/> + <cd:constant value="mhookrightarrow"/> + <cd:constant value="mleftharpoondown"/> + <cd:constant value="mleftharpoonup"/> + <cd:constant value="mrightharpoondown"/> + <cd:constant value="mrightharpoonup"/> + <cd:constant value="mrightoverleftarrow"/> + <cd:constant value="mleftrightharpoons"/> + <cd:constant value="mrightleftharpoons"/> + <cd:constant value="mtriplerel"/> + <cd:constant value="eleftarrowfill"/> + <cd:constant value="erightarrowfill"/> + <cd:constant value="eleftrightarrowfill"/> + <cd:constant value="etwoheadrightarrowfill"/> + <cd:constant value="eleftharpoondownfill"/> + <cd:constant value="eleftharpoonupfill"/> + <cd:constant value="erightharpoondownfill"/> + <cd:constant value="erightharpoonupfill"/> + <cd:constant value="eoverbarfill"/> + <cd:constant value="eunderbarfill"/> + <cd:constant value="eoverbracefill"/> + <cd:constant value="eunderbracefill"/> + <cd:constant value="eoverparentfill"/> + <cd:constant value="eunderparentfill"/> + <cd:constant value="eoverbracketfill"/> + <cd:constant value="eunderbracketfill"/> + <cd:constant value="trel"/> + <cd:constant value="tequal"/> + <cd:constant value="tmapsto"/> + <cd:constant value="tleftarrow"/> + <cd:constant value="trightarrow"/> + <cd:constant value="tleftrightarrow"/> + <cd:constant value="tLeftarrow"/> + <cd:constant value="tRightarrow"/> + <cd:constant value="tLeftrightarrow"/> + <cd:constant value="ttwoheadleftarrow"/> + <cd:constant value="ttwoheadrightarrow"/> + <cd:constant value="thookleftarrow"/> + <cd:constant value="thookrightarrow"/> + <cd:constant value="tleftharpoondown"/> + <cd:constant value="tleftharpoonup"/> + <cd:constant value="trightharpoondown"/> + <cd:constant value="trightharpoonup"/> + <cd:constant value="trightoverleftarrow"/> + <cd:constant value="tleftrightharpoons"/> + <cd:constant value="trightleftharpoons"/> + <cd:constant value="ttriplerel"/> + <cd:constant value="cleftarrow"/> + <cd:constant value="crightarrow"/> + <cd:constant value="crightoverleftarrow"/> + </cd:instances> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathoverextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathoverextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -21453,7 +22886,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathoverextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathoverextensible" variant="example"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -21463,11 +22896,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathunderextensible"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathover"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bottom"/> + <cd:keywords> + <cd:constant type="top"/> <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21477,20 +22911,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathunderextensible" variant="example"> - <cd:sequence> - <cd:variable value="mathunderextensible"/> - </cd:sequence> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathover"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="top"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathdoubleextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathunderextensible"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="both"/> + <cd:constant type="bottom"/> <cd:constant type="vfenced"/> </cd:keywords> <cd:keywords> @@ -21499,14 +22937,11 @@ <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords> - <cd:constant type="cd:number"/> - </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathdoubleextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathunderextensible" variant="example"> <cd:sequence> - <cd:variable value="mathdoubleextensible"/> + <cd:variable value="mathunderextensible"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -21514,10 +22949,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathovertextextensible"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathunder"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:keywords> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21527,23 +22964,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathovertextextensible" variant="example"> - <cd:sequence> - <cd:variable value="mathovertextextensible"/> - </cd:sequence> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathunder"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="cd:number"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathundertextextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathdoubleextensible"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> <cd:keywords> <cd:constant type="cd:name"/> @@ -21551,11 +22990,14 @@ <cd:keywords> <cd:constant type="cd:number"/> </cd:keywords> + <cd:keywords> + <cd:constant type="cd:number"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathundertextextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathdoubleextensible" variant="instance"> <cd:sequence> - <cd:variable value="mathundertextextensible"/> + <cd:instance value="mathdoubleextensible"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -21565,1124 +23007,98 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:constant value="doublebar"/> + <cd:constant value="doublebrace"/> + <cd:constant value="doubleparent"/> + <cd:constant value="doublebracket"/> + <cd:constant value="overbarunderbar"/> + <cd:constant value="overbraceunderbrace"/> + <cd:constant value="overparentunderparent"/> + <cd:constant value="overbracketunderbracket"/> + </cd:instances> </cd:command> - <cd:command category="mathematics" file="math-sty.mkvi" name="definemathtriplet"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathdouble"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> <cd:keywords> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathtriplet" variant="example"> - <cd:sequence> - <cd:variable value="mathtriplet"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mathtriplet"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathdouble"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xhookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xhookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xrightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="xtriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mhookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mhookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mrightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="mtriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eleftarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="erightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eleftrightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="etwoheadrightarrowfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eleftharpoondownfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eleftharpoonupfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="erightharpoondownfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="erightharpoonupfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbarfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbarfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbracefill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbracefill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eoverparentfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eunderparentfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbracketfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbracketfill"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tequal"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tmapsto"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tLeftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tRightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tLeftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="ttwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="ttwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="thookleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="thookrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="tleftrightharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="trightleftharpoons"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="ttriplerel"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="cleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="crightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="crightoverleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="undertwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="undertwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbrace"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underparent"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbracket"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overleftrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overtwoheadleftarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overtwoheadrightarrow"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overleftharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overleftharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overrightharpoondown"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overrightharpoonup"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbrace"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overparent"> - <cd:arguments> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbracket"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant type="cd:number"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="doublebar"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="doublebrace"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="doubleparent"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathovertextextensible"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="doublebracket"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbarunderbar"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbraceunderbrace"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathovertextextensible" variant="instance"> + <cd:sequence> + <cd:instance value="mathovertextextensible"/> + </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overparentunderparent"> - <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathovertextextensible"/> + </cd:instances> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbracketunderbracket"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathundertextextensible"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbartext"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbracetext"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathundertextextensible" variant="instance"> + <cd:sequence> + <cd:instance value="mathundertextextensible"/> + </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22691,71 +23107,62 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathundertextextensible"/> + </cd:instances> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overparenttext"> + <cd:command category="mathematics" file="math-sty.mkvi" level="system" name="definemathtriplet"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="overbrackettext"> - <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbartext"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathtriplet" variant="example"> + <cd:sequence> + <cd:variable value="mathtriplet"/> + </cd:sequence> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbracetext"> - <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underparenttext"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="mathtriplet"> <cd:arguments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" name="underbrackettext"> - <cd:arguments> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> - <cd:keywords delimiters="braces"> + <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="singlebond"/> - <cd:command file="math-stc.mkvi" name="doublebond"/> - <cd:command file="math-stc.mkvi" name="triplebond"/> - <cd:command category="mathematics" file="math-stc.mkvi" name="definemathunstacked"> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="singlebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="doublebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="triplebond"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="definemathunstacked"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -22768,33 +23175,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathunstacked" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" level="document" name="mathunstacked" variant="example"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> </cd:command> - <cd:command file="math-stc.mkvi" name="And"/> - <cd:command file="math-stc.mkvi" name="impliedby"/> - <cd:command file="math-stc.mkvi" name="implies"/> - <cd:command file="math-stc.mkvi" name="iff"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="And"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="impliedby"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="implies"/> + <cd:command category="mathematics" file="math-stc.mkvi" level="document" name="iff"/> </cd:interface> <cd:interface file="i-metapost.xml"> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPdefinitions" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPdefinitions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPextensions" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPextensions" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPinitializations" type="environment"/> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPinclusions" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinitializations" type="environment"/> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -22804,7 +23211,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPinclusions"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPinclusions"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -22815,7 +23222,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="defineMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="defineMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22828,7 +23235,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="setupMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPinstance"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -22866,50 +23273,50 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="resetMPinstance"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="system" name="resetMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="processMPfigurefile"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPfigurefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPdrawing" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="resetMPdrawing"/> - <cd:command category="graphics" file="meta-ini.mkiv" name="getMPdrawing"/> - <cd:command begin="push" category="graphics" end="pop" file="meta-ini.mkiv" name="MPdrawing" type="environment"/> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPdrawing"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="resetMPdrawing"/> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="getMPdrawing"/> + <cd:command _error_="level="system" type="environment" begin="push" end="pop" category="graphics metapost" file="meta-ini.mkiv"" name="MPdrawing"/> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPdrawing"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPclip" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPclip" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPfontsizehskip"> + <cd:command category="graphics metapost fonts" file="meta-ini.mkiv" level="system" name="MPfontsizehskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setupMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="setupMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -22921,7 +23328,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="setMPvariables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -22933,7 +23340,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPvariable"> + <cd:command file="meta-ini.mkiv" level="style" name="setMPvariable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22945,7 +23352,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPrawvar"> + <cd:command file="meta-ini.mkiv" level="system" name="MPrawvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -22955,21 +23362,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPvariable"> + <cd:command file="meta-ini.mkiv" level="style" name="MPvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPvar"> + <cd:command file="meta-ini.mkiv" level="style" name="MPvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPvariables"> + <cd:command file="meta-ini.mkiv" level="style" name="useMPvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -22979,7 +23386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -22989,7 +23396,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23001,7 +23408,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="useMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23011,7 +23418,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="useMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23023,7 +23430,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="usableMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23033,7 +23440,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="reuseMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reuseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23045,7 +23452,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="reusableMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23055,7 +23462,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="reusableMPgraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="reusableMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23067,7 +23474,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPpagegraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23077,7 +23484,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPpagegraphic"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="uniqueMPpagegraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23089,21 +23496,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="processMPbuffer"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="processMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="runMPbuffer"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="runMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPenvironment" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPenvironment" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -23112,22 +23519,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="resetMPenvironment"/> - <cd:command category="graphics" file="meta-ini.mkiv" name="useMPenvironmentbuffer"> + <cd:command ategory="graphics" clevel="style" file="meta-ini.mkiv" name="resetMPenvironment"/> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPenvironmentbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPcode" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPcode"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPcode"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> @@ -23135,14 +23542,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPrun" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="MPrun" type="environment"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="useMPrun"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="document" name="useMPrun"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23152,14 +23559,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="useMPlibrary"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="useMPlibrary"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="setMPtext"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setMPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23169,28 +23576,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPtext"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPstring"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="MPbetex"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="MPbetex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="doifelseMPgraphic"> + <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifelseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23203,7 +23610,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="doifMPgraphicelse"> + <cd:command category="graphics metapost conditional" file="meta-ini.mkiv" level="style" name="doifMPgraphicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23216,14 +23623,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="staticMPfigure" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPfigure" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="staticMPgraphic" type="environment"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="staticMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23233,7 +23640,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="usestaticMPfigure"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="usestaticMPfigure"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -23243,7 +23650,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="graphics" file="meta-ini.mkiv" name="setupMPgraphics"> + <cd:command category="graphics metapost" file="meta-ini.mkiv" level="style" name="setupMPgraphics"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -23258,7 +23665,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mixedcolumns.xml"> - <cd:command file="page-mix.mkiv" level="style" name="definemixedcolumns"> + <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="definemixedcolumns"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23271,7 +23678,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" level="style" name="setupmixedcolumns"> + <cd:command category="structure layout" file="page-mix.mkiv" level="style" name="setupmixedcolumns"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23354,7 +23761,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment"> + <cd:command category="structure layout" file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23364,7 +23771,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance"> + <cd:command category="structure layout" file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -23380,91 +23787,91 @@ </cd:command> </cd:interface> <cd:interface file="i-modes.xml"> - <cd:command file="core-env.mkiv" level="system" name="newmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="newmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="resetmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="resetmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="newsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="newsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="setsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="setsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="resetsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="resetsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="preventmode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="preventmode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="enablemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="enablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="disablemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="disablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="globalpreventmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globalpreventmode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="globalenablemode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globalenablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="globaldisablemode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="globaldisablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="definemode"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="definemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -23476,14 +23883,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="booleanmodevalue"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="booleanmodevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelsemode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelsemode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23496,7 +23903,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifmodeelse"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmodeelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23509,7 +23916,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifmode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23519,7 +23926,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotmode"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotmode"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23529,21 +23936,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="mode" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="mode" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="notmode" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="notmode" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifelseallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23556,7 +23963,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifallmodeselse"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodeselse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23569,7 +23976,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23582,7 +23989,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotallmodes"> + <cd:command category="structure conditional" file="core-env.mkiv" level="style" name="doifnotallmodes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -23595,21 +24002,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="allmodes" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="allmodes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="notallmodes" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="notallmodes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="modeset" type="environment"> + <cd:command category="structure" file="core-env.mkiv" level="style" name="modeset" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -23618,28 +24025,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="pushmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="pushmode"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="popmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="popmode"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="pushsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="pushsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="popsystemmode"> + <cd:command category="structure" file="core-env.mkiv" level="system" name="popsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23667,7 +24074,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="usetexmodule"> + <cd:command file="file-mod.mkvi" level="style" name="usetexmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -23758,7 +24165,7 @@ </cd:command> </cd:interface> <cd:interface file="i-narrow.xml"> - <cd:command file="spac-hor.mkiv" level="style" name="definenarrower"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="definenarrower"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23771,7 +24178,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="style" name="setupnarrower"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="style" name="setupnarrower"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23804,7 +24211,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="document" name="narrower" type="environment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrower" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="left"/> @@ -23817,7 +24224,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -23833,7 +24240,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23843,7 +24250,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23859,7 +24266,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment"> + <cd:command category="whitespace layout" file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -24112,14 +24519,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" name="TDs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TDs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" name="TRs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TRs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24163,7 +24570,7 @@ </cd:command> </cd:interface> <cd:interface file="i-note.xml"> - <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotation"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24343,7 +24750,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotations"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotations"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24353,7 +24760,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24378,7 +24785,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24392,7 +24799,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24409,7 +24816,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24434,7 +24841,7 @@ <cd:constant value="endnote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="style" name="definenote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="definenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24447,7 +24854,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24590,7 +24997,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="setupnotes"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24600,7 +25007,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="setnote"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24613,7 +25020,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="setnote" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnote" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24634,7 +25041,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="setnotetext"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24647,7 +25054,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="setnotetext" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="setnotetext" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24668,7 +25075,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="document" name="placenotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placenotes"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -24678,14 +25085,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="document" name="localnotes" type="environment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localnotes" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="document" name="placelocalnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalnotes"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24695,9 +25102,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="postponenotes"/> - <cd:command category="notes" file="strc-not.mkvi" name="flushnotes"/> - <cd:command category="notes" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="postponenotes"/> + <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="flushnotes"/> + <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24710,7 +25117,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse"> + <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24723,7 +25130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="system" name="doifnotescollected"> + <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifnotescollected"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24733,7 +25140,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="notesymbol"> + <cd:command category="structure notes" file="strc-not.mkvi" level="system" name="notesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24743,7 +25150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" level="document" name="note"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="note"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24753,7 +25160,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="footnotetext"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -24763,7 +25170,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="footnotetext" variant="assignment"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="footnotetext" variant="assignment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -24781,22 +25188,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="placefootnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placefootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-not.mkvi" name="localfootnotes" type="environment"/> - <cd:command category="notes" file="strc-not.mkvi" name="placelocalfootnotes"> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="localfootnotes" type="environment"/> + <cd:command category="structure notes" file="strc-not.mkvi" level="document" name="placelocalfootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" level="style" name="definelinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="definelinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24809,7 +25216,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" level="style" name="setuplinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="style" name="setuplinenote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24834,7 +25241,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -24847,7 +25254,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -24864,7 +25271,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance"> + <cd:command category="structure notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -24878,7 +25285,7 @@ <cd:constant value="linenote"/> </cd:instances> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" level="document" name="fromlinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="fromlinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -24888,7 +25295,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="notes" file="strc-lnt.mkvi" level="document" name="tolinenote"> + <cd:command category="structure notes" file="strc-lnt.mkvi" level="document" name="tolinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -24897,7 +25304,7 @@ </cd:command> </cd:interface> <cd:interface file="i-object.xml"> - <cd:command file="pack-obj.mkiv" level="system" name="ifinobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="ifinobject"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -24909,11 +25316,11 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="objectmargin"/> - <cd:command file="pack-obj.mkiv" level="system" name="objectwidth"/> - <cd:command file="pack-obj.mkiv" level="system" name="objectheight"/> - <cd:command file="pack-obj.mkiv" level="system" name="objectdepth"/> - <cd:command file="pack-obj.mkiv" level="system" name="setreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectmargin"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectwidth"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectheight"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="objectdepth"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24925,7 +25332,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="settightreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24937,7 +25344,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="setunreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24949,7 +25356,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="settightunreferencedobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24961,7 +25368,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="setobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="setobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24973,7 +25380,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="settightobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="settightobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24985,7 +25392,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="getobject"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="getobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24995,7 +25402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="getobjectdimensions"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="getobjectdimensions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25005,9 +25412,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="defaultobjectreference"/> - <cd:command file="pack-obj.mkiv" level="system" name="defaultobjectpage"/> - <cd:command file="pack-obj.mkiv" level="system" name="doifelseobjectfound"> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectreference"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="defaultobjectpage"/> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectfound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25023,7 +25430,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="doifobjectfoundelse"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectfoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25039,7 +25446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25055,7 +25462,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse"> + <cd:command category="pdf conditional" file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25073,7 +25480,7 @@ </cd:command> </cd:interface> <cd:interface file="i-offset.xml"> - <cd:command file="pack-box.mkiv" level="style" name="setupoffsetbox"> + <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffsetbox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -25124,14 +25531,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="style" name="setupoffset"> + <cd:command category="layout" file="pack-box.mkiv" level="style" name="setupoffset"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="offsetbox"> + <cd:command category="layout" file="pack-box.mkiv" level="system" name="offsetbox"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffsetbox"/> @@ -25140,7 +25547,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="document" name="offset"> + <cd:command category="layout" file="pack-box.mkiv" level="document" name="offset"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -25150,7 +25557,7 @@ </cd:command> </cd:interface> <cd:interface file="i-opposite.xml"> - <cd:command file="page-fac.mkiv" level="style" name="setupoppositeplacing"> + <cd:command category="layout" file="page-fac.mkiv" level="style" name="setupoppositeplacing"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -25169,10 +25576,10 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-fac.mkiv" level="document" name="opposite" type="environment"/> + <cd:command category="layout" file="page-fac.mkiv" level="document" name="opposite" type="environment"/> </cd:interface> <cd:interface file="i-ornament.xml"> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="collector"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="collector"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -25197,7 +25604,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="layer"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="layer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -25215,7 +25622,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="ornamenttext" variant="direct"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="document" name="ornamenttext" variant="direct"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25226,7 +25633,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="style" name="defineornament" variant="collector"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="collector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25250,7 +25657,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" level="style" name="defineornament" variant="layer"> + <cd:command category="background fonts colors" file="pack-box.mkiv" level="style" name="defineornament" variant="layer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25267,7 +25674,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" generated="yes" name="ornament" variant="example"> + <cd:command category="background fonts colors" file="pack-box.mkiv" generated="yes" level="document" name="ornament" variant="example"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -25280,7 +25687,7 @@ </cd:command> </cd:interface> <cd:interface file="i-output.xml"> - <cd:command file="page-otr.mkvi" level="system" name="defineoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="defineoutputroutine"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25293,7 +25700,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" level="system" name="setupoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="setupoutputroutine"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25305,22 +25712,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" level="system" name="setupoutputroutine" variant="name"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="setupoutputroutine" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" level="system" name="defineoutputroutinecommand"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="defineoutputroutinecommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" level="system" name="traceoutputroutines"/> - <cd:command file="page-otr.mkvi" level="system" name="installoutputroutine"> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="traceoutputroutines"/> + <cd:command category="layout" file="page-otr.mkvi" level="system" name="installoutputroutine"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -25330,7 +25737,7 @@ </cd:command> </cd:interface> <cd:interface file="i-overlay.xml"> - <cd:command file="pack-lyr.mkiv" level="style" name="defineoverlay"> + <cd:command category="background" file="pack-lyr.mkiv" level="style" name="defineoverlay"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -25343,14 +25750,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="overlaycolor"/> - <cd:command file="pack-rul.mkiv" name="overlaylinecolor"/> - <cd:command file="pack-rul.mkiv" name="overlaywidth"/> - <cd:command file="pack-rul.mkiv" name="overlayheight"/> - <cd:command file="pack-rul.mkiv" name="overlaydepth"/> - <cd:command file="pack-rul.mkiv" name="overlayoffset"/> - <cd:command file="pack-rul.mkiv" name="overlaylinewidth"/> - <cd:command file="pack-rul.mkiv" level="system" name="doifelseoverlay"> + <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaycolor"/> + <cd:command category="background colors" file="pack-rul.mkiv" level="system" name="overlaylinecolor"/> + <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaywidth"/> + <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayheight"/> + <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaydepth"/> + <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlayoffset"/> + <cd:command category="background" file="pack-rul.mkiv" level="system" name="overlaylinewidth"/> + <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifelseoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25363,7 +25770,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" level="system" name="doifoverlayelse"> + <cd:command category="background conditional" file="pack-rul.mkiv" level="system" name="doifoverlayelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25553,7 +25960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpageonly"> + <cd:command file="page-brk.mkiv" level="system" name="testpageonly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25563,7 +25970,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpagesync"> + <cd:command file="page-brk.mkiv" level="system" name="testpagesync"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25585,7 +25992,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagecomment.xml"> - <cd:command file="page-com.mkiv" level="style" name="setuppagecomment"> + <cd:command category="pdf" file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -25615,7 +26022,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-com.mkiv" name="pagecomment" type="environment"/> + <cd:command category="pdf" file="page-com.mkiv" level="document" name="pagecomment" type="environment"/> </cd:interface> <cd:interface file="i-pagefigure.xml"> <cd:command category="graphics" file="page-app.mkiv" level="document" name="pagefigure"> @@ -25624,7 +26031,12 @@ <cd:constant type="cd:file"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -25634,13 +26046,18 @@ <cd:constant type="cd:file"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command file="page-cst.mkiv" level="style" name="definepagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegrid"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25653,7 +26070,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25695,7 +26112,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> + <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -25705,7 +26122,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25715,7 +26132,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setpagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="setpagegrid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="c"> @@ -25731,7 +26148,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="definepagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25744,7 +26161,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25770,7 +26187,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25780,14 +26197,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegridspanwidth"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="pagegridspanwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="definepagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25800,7 +26217,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25840,7 +26257,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegridareatext"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25850,7 +26267,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegridlines"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25866,7 +26283,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" level="style" name="setuppagegridstart"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25884,7 +26301,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageinjection.xml"> - <cd:command file="page-inj.mkvi" level="style" name="definepageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="definepageinjection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25897,7 +26314,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" level="style" name="setuppageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="setuppageinjection"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25933,7 +26350,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" level="document" name="pageinjection"> + <cd:command category="structure" file="page-inj.mkvi" level="document" name="pageinjection"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25945,7 +26362,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" level="document" name="pageinjection" variant="assignment"> + <cd:command category="structure" file="page-inj.mkvi" level="document" name="pageinjection" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppageinjection"/> @@ -25957,7 +26374,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" level="style" name="definepageinjectionalternative"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="definepageinjectionalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25970,7 +26387,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" level="style" name="setuppageinjectionalternative"> + <cd:command category="structure" file="page-inj.mkvi" level="style" name="setuppageinjectionalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25984,7 +26401,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagelayout.xml"> - <cd:command category="layout" file="page-plg.mkiv" name="pagearea"> + <cd:command category="layout" file="page-plg.mkiv" level="style" name="pagearea"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -26007,7 +26424,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-plg.mkiv" name="pagelayout" type="environment"> + <cd:command category="layout" file="page-plg.mkiv" level="style" name="pagelayout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> @@ -26018,7 +26435,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagenumber.xml"> - <cd:command category="counter" file="strc-pag.mkiv" name="setuprealpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="setuprealpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -26056,9 +26473,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" name="resetuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="resetsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="resetpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="resetsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="resetpagenumber"/> <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumbering"> <cd:arguments> <cd:assignments list="yes"> @@ -26112,39 +26529,39 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="counter" file="strc-pag.mkiv" name="firstrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="firstuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="firstsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextrealpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextuserpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="firstrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="firstuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="firstsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prevsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="nextsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastrealpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastuserpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="lastsubpage"/> - <cd:command category="counter" file="strc-pag.mkiv" name="realpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="userpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="subpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="pagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="prefixedpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="incrementpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="incrementsubpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="decrementpagenumber"/> - <cd:command category="counter" file="strc-pag.mkiv" name="decrementsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="firstsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="lastsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prevsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextrealpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextuserpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="nextsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="firstsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="prevsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="nextsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastrealpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastuserpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="system" name="lastsubpage"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="realpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="userpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="subpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="pagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="prefixedpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="incrementsubpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementpagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="decrementsubpagenumber"/> <cd:command category="counter" file="strc-pag.mkiv" level="style" name="completepagenumber"/> <cd:command category="counter" file="strc-pag.mkiv" level="style" name="placepagenumber"/> </cd:interface> @@ -26422,7 +26839,31 @@ </cd:arguments> </cd:command> </cd:interface> - <cd:interface file="i-pagemarks.xml"/> + <cd:interface file="i-pagemarks.xml"> + <cd:command file="page-lay.mkiv" level="style" name="markpage"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant method="none" prefix="cd:sign" type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="page-lay.mkiv" level="style" name="doifelsemarkedpage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-pairedbox.xml"> <cd:command file="pack-com.mkiv" level="style" name="definepairedbox"> <cd:arguments> @@ -26565,13 +27006,13 @@ <cd:constant value="legend"/> </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" name="placeontopofeachother"> + <cd:command file="pack-com.mkiv" level="document" name="placeontopofeachother"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placesidebyside"> + <cd:command file="pack-com.mkiv" level="document" name="placesidebyside"> <cd:arguments> <cd:content/> <cd:content/> @@ -26579,7 +27020,7 @@ </cd:command> </cd:interface> <cd:interface file="i-papersize.xml"> - <cd:command file="page-lay.mkiv" level="style" name="definepapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definepapersize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26615,7 +27056,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" level="style" name="definepapersize" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definepapersize" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26628,7 +27069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" level="style" name="setuppapersize" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppapersize" variant="name"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -26654,7 +27095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" level="style" name="setuppapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppapersize"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26739,14 +27180,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" level="style" name="setuppaper"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuppaper"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppapersize"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" level="style" name="adaptpapersize"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="adaptpapersize"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> @@ -26758,7 +27199,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraph.xml"> - <cd:command file="strc-tag.mkiv" level="style" name="defineparagraph"> + <cd:command category="structure" file="strc-tag.mkiv" level="style" name="defineparagraph"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26771,7 +27212,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="style" name="setupparagraph"> + <cd:command category="structure" file="strc-tag.mkiv" level="style" name="setupparagraph"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26793,7 +27234,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="document" name="paragraph" type="environment"> + <cd:command category="structure" file="strc-tag.mkiv" level="document" name="paragraph" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26803,7 +27244,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="document" name="par" type="environment"> + <cd:command category="structure" file="strc-tag.mkiv" level="document" name="par" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26813,8 +27254,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="strc-tag.mkiv" level="document" name="par" type="environment"/> - <cd:command file="spac-par.mkiv" level="style" name="setupparagraphintro"> + <cd:command begin="b" category="structure" end="e" file="strc-tag.mkiv" level="document" name="par" type="environment"/> + <cd:command category="structure" file="spac-par.mkiv" level="style" name="setupparagraphintro"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> @@ -26829,7 +27270,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphnumber.xml"> - <cd:command file="page-par.mkiv" level="style" name="setupparagraphnumbering"> + <cd:command category="structure counter" file="page-par.mkiv" level="style" name="setupparagraphnumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -26853,7 +27294,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphs.xml"> - <cd:command file="tabl-mis.mkiv" level="style" name="defineparagraphs"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="defineparagraphs"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26866,7 +27307,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" level="style" name="setupparagraphs"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26930,7 +27371,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" level="style" name="setupparagraphs" variant="assignment"> + <cd:command category="tables" file="tabl-mis.mkiv" level="style" name="setupparagraphs" variant="assignment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant method="range" prefix="cd:name" type="cd:number"/> @@ -26990,31 +27431,31 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" level="document" name="paragraphs" type="environment"> + <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="paragraphs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" level="document" name="nextparagraphs"/> - <cd:command file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" type="environment" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="nextparagraphs"/> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" type="environment" variant="example"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="paragraphs" variant="example"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" generated="yes" level="document" name="nextparagraphs" variant="example"> + <cd:command category="tables" file="tabl-mis.mkiv" generated="yes" level="document" name="nextparagraphs" variant="example"> <cd:sequence> <cd:string value="next"/> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" level="document" name="paragraphscell" type="environment"/> + <cd:command category="tables" file="tabl-mis.mkiv" level="document" name="paragraphscell" type="environment"/> </cd:interface> <cd:interface file="i-parallel.xml"> <cd:command file="buff-par.mkvi" level="style" name="defineparallel"> @@ -27051,7 +27492,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="placeparallel"> + <cd:command file="buff-par.mkvi" level="document" name="placeparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27064,7 +27505,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="doifelseparallel"> + <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifelseparallel"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27081,7 +27522,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="doifparallelelse"> + <cd:command category="conditional" file="buff-par.mkvi" level="style" name="doifparallelelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27098,7 +27539,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="resetparallel"> + <cd:command file="buff-par.mkvi" level="style" name="resetparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27109,21 +27550,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" generated="yes" name="parallel" type="environment" variant="example"> + <cd:command file="buff-par.mkvi" generated="yes" level="document" name="parallel" type="environment" variant="example"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> </cd:command> </cd:interface> <cd:interface file="i-parbuilder.xml"> - <cd:command file="typo-bld.mkiv" level="system" name="defineparbuilder"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="defineparbuilder"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-bld.mkiv" level="system" name="parbuilder" type="environment"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="parbuilder" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27133,7 +27574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-bld.mkiv" level="system" name="setmainparbuilder"> + <cd:command category="layout" file="typo-bld.mkiv" level="system" name="setmainparbuilder"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27145,7 +27586,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pdf.xml"> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27155,7 +27596,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetinfo"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27165,7 +27606,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetname"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27175,7 +27616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpageattribute"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpageattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27185,7 +27626,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpagesattribute"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpagesattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27195,7 +27636,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpageresource"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpageresource"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27205,7 +27646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetextgstate"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetextgstate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27215,7 +27656,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetcolorspace"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcolorspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27225,7 +27666,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpattern"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetpattern"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27235,7 +27676,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetshade"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetshade"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27245,31 +27686,31 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendcurrentresources"/> - <cd:command file="back-pdf.mkiv" level="system" name="pdfcolor"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendcurrentresources"/> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="PDFcolor"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="PDFcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" level="system" name="TransparencyHack"/> - <cd:command file="pack-obj.mkiv" level="system" name="lastpredefinedsymbol"/> - <cd:command file="pack-obj.mkiv" level="system" name="predefinesymbol"> + <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="TransparencyHack"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="lastpredefinedsymbol"/> + <cd:command category="pdf" file="pack-obj.mkiv" level="system" name="predefinesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendactualtext"> + <cd:command category="pdf" file="back-pdf.mkiv" level="style" name="pdfbackendactualtext"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -27277,7 +27718,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfactualtext"> + <cd:command category="pdf" file="back-pdf.mkiv" level="document" name="pdfactualtext"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -27285,9 +27726,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-neg.mkiv" name="negative" type="environment"/> - <cd:command file="attr-neg.mkiv" name="positive" type="environment"/> - <cd:command file="scrn-pag.mkvi" level="style" name="setuppagetransitions"> + <cd:command category="pdf" file="attr-neg.mkiv" level="document" name="negative" type="environment"/> + <cd:command category="pdf" file="attr-neg.mkiv" level="document" name="positive" type="environment"/> + <cd:command category="pdf" file="scrn-pag.mkvi" level="style" name="setuppagetransitions"> <cd:arguments> <cd:keywords> <cd:constant default="yes" type="reset"/> @@ -27300,12 +27741,12 @@ </cd:command> </cd:interface> <cd:interface file="i-penalty.xml"> - <cd:command file="spac-ver.mkiv" name="resetpenalties"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="resetpenalties"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setpenalties"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="setpenalties"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -27316,17 +27757,17 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="keeplinestogether"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="keeplinestogether"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setdefaultpenalties"/> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="setdefaultpenalties"/> </cd:interface> <cd:interface file="i-periods.xml"> - <cd:command file="enco-ini.mkiv" level="style" name="setupperiods"> + <cd:command category="symbols" file="enco-ini.mkiv" level="style" name="setupperiods"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -27345,39 +27786,39 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="document" name="periods"> + <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="periods"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="document" name="periods" variant="assignment"> + <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="periods" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupperiods"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" level="document" name="unknown"/> + <cd:command category="symbols" file="enco-ini.mkiv" level="document" name="unknown"/> </cd:interface> <cd:interface file="i-phantom.xml"> - <cd:command file="supp-box.mkiv" name="phantom"> + <cd:command file="supp-box.mkiv" level="style" name="phantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hphantom"> + <cd:command file="supp-box.mkiv" level="style" name="hphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vphantom"> + <cd:command file="supp-box.mkiv" level="style" name="vphantom"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="phantombox"> + <cd:command file="pack-box.mkiv" level="style" name="phantombox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -27394,7 +27835,7 @@ </cd:command> </cd:interface> <cd:interface file="i-placement.xml"> - <cd:command file="pack-mis.mkiv" name="defineplacement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="defineplacement"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27407,7 +27848,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" name="setupplacement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="setupplacement"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27444,7 +27885,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" name="placement"> + <cd:command category="layout" file="pack-mis.mkiv" level="style" name="placement"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27455,7 +27896,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-mis.mkiv" generated="yes" name="placement" variant="example"> + <cd:command category="layout" file="pack-mis.mkiv" generated="yes" level="style" name="placement" variant="example"> <cd:sequence> <cd:variable value="placement"/> </cd:sequence> @@ -27468,7 +27909,7 @@ </cd:command> </cd:interface> <cd:interface file="i-position.xml"> - <cd:command file="anch-pgr.mkiv" level="system" name="doifpositionaction"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27481,7 +27922,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" level="system" name="doifelsepositionaction"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifelsepositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27494,7 +27935,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" level="system" name="doifpositionactionelse"> + <cd:command category="conditional" file="anch-pgr.mkiv" level="system" name="doifpositionactionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27514,21 +27955,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionoverlay"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPoverlayanchor"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPoverlayanchor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionregionoverlay"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionregionoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27538,14 +27979,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="positionoverlay" type="environment"> + <cd:command category="background" file="anch-pgr.mkiv" level="system" name="positionoverlay" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositiongraphic" type="environment"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27555,7 +27996,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositiongraphic"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27567,14 +28008,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPpositionmethod" type="environment"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPpositionmethod" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="setMPpositiongraphic"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27589,7 +28030,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="setMPpositiongraphicrange"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="setMPpositiongraphicrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27607,7 +28048,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetposboxes"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetposboxes"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -27617,7 +28058,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetmultipars"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultipars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27627,7 +28068,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="MPgetmultishape"> + <cd:command category="background metapost" file="anch-pgr.mkiv" level="system" name="MPgetmultishape"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27637,196 +28078,196 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPp"> + <cd:command file="anch-pos.mkiv" level="system" name="MPp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPr"> + <cd:command file="anch-pos.mkiv" level="system" name="MPr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPc"> + <cd:command file="anch-pos.mkiv" level="system" name="MPc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPn"> + <cd:command file="anch-pos.mkiv" level="system" name="MPn"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPx"> + <cd:command file="anch-pos.mkiv" level="system" name="MPx"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPy"> + <cd:command file="anch-pos.mkiv" level="system" name="MPy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPw"> + <cd:command file="anch-pos.mkiv" level="system" name="MPw"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPh"> + <cd:command file="anch-pos.mkiv" level="system" name="MPh"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPwhd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPwhd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPxy"> + <cd:command file="anch-pos.mkiv" level="system" name="MPxy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPll"> + <cd:command file="anch-pos.mkiv" level="system" name="MPll"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPlr"> + <cd:command file="anch-pos.mkiv" level="system" name="MPlr"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPur"> + <cd:command file="anch-pos.mkiv" level="system" name="MPur"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPul"> + <cd:command file="anch-pos.mkiv" level="system" name="MPul"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpos"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPls"> + <cd:command file="anch-pos.mkiv" level="system" name="MPls"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrs"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpardata"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpardata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPxywhd"> + <cd:command file="anch-pos.mkiv" level="system" name="MPxywhd"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPposset"> + <cd:command file="anch-pos.mkiv" level="system" name="MPposset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPpage"> + <cd:command file="anch-pos.mkiv" level="system" name="MPpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPregion"> + <cd:command file="anch-pos.mkiv" level="system" name="MPregion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPcolumn"> + <cd:command file="anch-pos.mkiv" level="system" name="MPcolumn"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPanchor"> + <cd:command file="anch-pos.mkiv" level="system" name="MPanchor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPleftskip"> + <cd:command file="anch-pos.mkiv" level="system" name="MPleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrightskip"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPplus"> + <cd:command file="anch-pos.mkiv" level="system" name="MPplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27837,7 +28278,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPv"> + <cd:command file="anch-pos.mkiv" level="system" name="MPv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27848,7 +28289,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPrest"> + <cd:command file="anch-pos.mkiv" level="system" name="MPrest"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27856,7 +28297,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="MPvv"> + <cd:command file="anch-pos.mkiv" level="system" name="MPvv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27951,7 +28392,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifposition"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27964,7 +28405,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifelseposition"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27977,7 +28418,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifpositionelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27990,7 +28431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositiononpage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositiononpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28006,7 +28447,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifpositiononpageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositiononpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28059,10 +28500,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="tracepositions"/> + <cd:command file="anch-pos.mkiv" level="system" name="tracepositions"/> <cd:command file="anch-pos.mkiv" level="system" name="enableparpositions"/> <cd:command file="anch-pos.mkiv" level="system" name="disableparpositions"/> - <cd:command file="anch-pos.mkiv" level="system" name="doifelseoverlapping"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelseoverlapping"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28078,7 +28519,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifoverlappingelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifoverlappingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28094,7 +28535,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28107,7 +28548,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28120,7 +28561,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28133,7 +28574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28146,7 +28587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsused"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifelsepositionsused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28156,7 +28597,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsusedelse"> + <cd:command category="conditional" file="anch-pos.mkiv" level="system" name="doifpositionsusedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28168,7 +28609,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positionbar.xml"> - <cd:command file="pack-bar.mkiv" level="style" name="setuppositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="setuppositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -28202,28 +28643,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="horizontalpositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="horizontalpositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="verticalpositionbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="verticalpositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="horizontalgrowingbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="horizontalgrowingbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bar.mkiv" name="verticalgrowingbar"> + <cd:command category="graphics" file="pack-bar.mkiv" level="style" name="verticalgrowingbar"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -28232,7 +28673,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positioning.xml"> - <cd:command file="pack-pos.mkiv" level="style" name="definepositioning"> + <cd:command category="graphics" file="pack-pos.mkiv" level="style" name="definepositioning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28245,7 +28686,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" level="style" name="setuppositioning"> + <cd:command category="graphics" file="pack-pos.mkiv" level="style" name="setuppositioning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28308,7 +28749,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" level="document" name="positioning" type="environment"> + <cd:command category="graphics" file="pack-pos.mkiv" level="document" name="positioning" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28318,7 +28759,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" level="document" name="position"> + <cd:command category="graphics" file="pack-pos.mkiv" level="document" name="position"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> @@ -28329,7 +28770,7 @@ </cd:command> </cd:interface> <cd:interface file="i-postponing.xml"> - <cd:command file="page-pst.mkiv" level="document" name="postponing" type="environment"> + <cd:command category="structure" file="page-pst.mkiv" level="document" name="postponing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:number"/> @@ -28338,7 +28779,7 @@ </cd:command> </cd:interface> <cd:interface file="i-processor.xml"> - <cd:command file="typo-prc.mkvi" level="style" name="defineprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="defineprocessor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28351,7 +28792,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" level="style" name="setupprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="style" name="setupprocessor"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28380,7 +28821,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" level="system" name="applyprocessor"> + <cd:command category="fonts colors" file="typo-prc.mkvi" level="system" name="applyprocessor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28390,7 +28831,7 @@ </cd:command> </cd:interface> <cd:interface file="i-profile.xml"> - <cd:command file="spac-prf.mkvi" level="style" name="defineprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="style" name="defineprofile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28403,7 +28844,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" level="style" name="setupprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="style" name="setupprofile"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28432,7 +28873,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="setprofile"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="setprofile"> <cd:arguments> <cd:keywords> <cd:constant type="none"/> @@ -28445,13 +28886,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="resetprofile"/> - <cd:command file="spac-prf.mkvi" level="system" name="useprofileparameter"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="resetprofile"/> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="useprofileparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" level="system" name="profiledbox"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="profiledbox"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="none"/> @@ -28468,7 +28909,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" level="system" name="profilegivenbox"> + <cd:command category="pdf" file="spac-prf.mkvi" level="system" name="profilegivenbox"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> @@ -28487,28 +28928,28 @@ </cd:command> </cd:interface> <cd:interface file="i-publication.xml"> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxrenderingdefinitions" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxrenderingdefinitions" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="loadbtxdefinitionfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="loadbtxdefinitionfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="loadbtxreplacementfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="loadbtxreplacementfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="definebtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="definebtx"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28521,7 +28962,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtx"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28612,14 +29053,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtx" variant="name"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtx" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="usingbtxspecification" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="usingbtxspecification" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28651,7 +29092,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="definebtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="definebtxregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28664,7 +29105,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="setupbtxregister"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28809,7 +29250,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="publication" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="publication" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28880,7 +29321,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -28922,7 +29363,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -28966,7 +29407,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -28990,14 +29431,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhybridcite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29039,7 +29480,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29083,7 +29524,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxlistcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29107,7 +29548,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29149,7 +29590,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29193,7 +29634,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxtextcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29217,7 +29658,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29259,7 +29700,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29303,7 +29744,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxalwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29327,14 +29768,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="bthiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxhiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29376,7 +29817,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29420,7 +29861,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29444,7 +29885,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29486,7 +29927,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29530,7 +29971,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="listcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29554,7 +29995,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29596,7 +30037,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29640,7 +30081,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29664,7 +30105,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29706,7 +30147,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29750,7 +30191,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="textcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29774,7 +30215,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29816,7 +30257,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29860,7 +30301,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29884,7 +30325,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29926,7 +30367,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29970,7 +30411,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="alwayscite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29994,14 +30435,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="hiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="hiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="hiddencite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="hiddencite"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -30284,7 +30725,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="savebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="savebtxdataset"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -30322,21 +30763,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="placecitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placecitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="usebtxdefinitions"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="usebtxdefinitions"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30373,7 +30814,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdetail"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxdetail"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30410,7 +30851,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflush"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30447,7 +30888,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdirect"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30484,7 +30925,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfieldname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfieldname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30521,7 +30962,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfieldtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfieldtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30558,7 +30999,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfoundname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfoundname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30595,7 +31036,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfoundtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfoundtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30632,7 +31073,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxauthorfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxauthorfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -30643,7 +31084,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30686,7 +31127,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoif"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30726,7 +31167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifnot"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30766,14 +31207,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsetup"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsesameaspreviouschecked"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameaspreviouschecked"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -30820,7 +31261,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsesameasprevious"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsesameasprevious"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30863,7 +31304,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsecombiinlist"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelsecombiinlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30879,7 +31320,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifsameaspreviouscheckedelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouscheckedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -30926,7 +31367,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifsameaspreviouselse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifsameaspreviouselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30969,7 +31410,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifcombiinlistelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifcombiinlistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -30985,14 +31426,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="currentbtxuservariable"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="currentbtxuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelseuservariable"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifelseuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31005,7 +31446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifuservariableelse"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxdoifuservariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31018,7 +31459,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxremapauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxremapauthor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -31028,7 +31469,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthor"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -31043,8 +31484,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushsuffix"/> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorname"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushsuffix"/> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31052,7 +31493,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthornormal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthornormal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31060,7 +31501,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthornormalshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthornormalshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31068,7 +31509,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorinverted"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorinverted"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31076,7 +31517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorinvertedshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxflushauthorinvertedshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31084,7 +31525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsingularplural"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31099,7 +31540,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsingularorplural"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxsingularorplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31114,7 +31555,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxoneorrange"> + <cd:command category="bibliography conditional" file="publ-ini.mkiv" level="system" name="btxoneorrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31128,7 +31569,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfirstofrange"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxfirstofrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31136,21 +31577,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxloadjournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxloadjournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsavejournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxsavejournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxaddjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxaddjournal"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -31160,21 +31601,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxexpandedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxexpandedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-ini.mkiv" name="btxabbreviatedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="system" name="btxabbreviatedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31219,14 +31660,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetcompleteness"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetcompleteness"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31271,14 +31712,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetcompleteness" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetcompleteness" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetauthors"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31323,21 +31764,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetauthors" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxdatasetauthors" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxhashedauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxhashedauthors"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -31349,14 +31790,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxtables"> + <cd:command category="bibliography" file="publ-tra.mkiv" level="document" name="showbtxtables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -31409,7 +31850,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="setrandomseed"> + <cd:command file="supp-ran.mkiv" level="system" name="setrandomseed"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -31423,7 +31864,7 @@ </cd:command> <cd:command begin="push" end="pop" file="supp-ran.mkiv" level="system" name="randomseed" type="environment"/> <cd:command file="supp-ran.mkiv" level="system" name="reuserandomseed"/> - <cd:command file="supp-ran.mkiv" name="randomnumber"> + <cd:command file="supp-ran.mkiv" level="system" name="randomnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -31433,7 +31874,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="mprandomnumber"/> + <cd:command file="supp-ran.mkiv" level="system" name="mprandomnumber"/> </cd:interface> <cd:interface file="i-references.xml"> <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencing"> @@ -31513,7 +31954,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="setreference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="setreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31555,7 +31996,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="contentreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="contentreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31576,14 +32017,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="resetreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="resetreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="setpagereference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="setpagereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31593,7 +32034,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelsereferencefound"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsereferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31606,7 +32047,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31628,7 +32069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="setupglobalreferenceprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="setupglobalreferenceprefix"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -31655,7 +32096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="referenceprefix"/> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="referenceprefix"/> <cd:command category="references" file="strc-ref.mkvi" level="document" name="in"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> @@ -31742,7 +32183,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="ref"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="ref"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -31795,7 +32236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="someplace"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="someplace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -31824,7 +32265,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="symbolreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="symbolreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -31912,14 +32353,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="document" name="goto" type="environment"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="goto" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="gotobox"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="gotobox"> <cd:arguments> <cd:content/> <cd:keywords> @@ -31985,7 +32426,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelseurldefined"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelseurldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31998,7 +32439,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifurldefinedelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifurldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32011,7 +32452,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelsefiledefined"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doifelsefiledefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32024,7 +32465,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse"> + <cd:command category="references conditional" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32057,7 +32498,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="defineprogram"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="defineprogram"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32070,7 +32511,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="setupprograms"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupprograms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -32083,14 +32524,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="program"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="program"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="definepage"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="definepage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32100,7 +32541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="references" file="strc-ref.mkvi" name="gotopage"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="gotopage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -32186,9 +32627,9 @@ </cd:command> </cd:interface> <cd:interface file="i-regime.xml"> - <cd:command file="regi-ini.mkiv" name="currentregime"/> - <cd:command file="regi-ini.mkiv" name="disableregime"/> - <cd:command file="regi-ini.mkiv" level="style" name="enableregime"> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="currentregime"/> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="disableregime"/> + <cd:command category="language" file="regi-ini.mkiv" level="style" name="enableregime"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> @@ -32256,7 +32697,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="regi-ini.mkiv" name="regime" type="environment"> + <cd:command category="language" file="regi-ini.mkiv" level="system" name="regime" type="environment"> <cd:arguments> <cd:keywords> <cd:inherit name="enableregime"/> @@ -32265,7 +32706,7 @@ </cd:command> </cd:interface> <cd:interface file="i-register.xml"> - <cd:command file="strc-reg.mkiv" level="style" name="defineregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="defineregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32278,7 +32719,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" level="style" name="setupregister" variant="argument"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregister" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32484,7 +32925,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" level="style" name="setupregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregister"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32687,7 +33128,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" level="style" name="setupregisters" variant="argument"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregisters" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32700,7 +33141,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" level="style" name="setupregisters"> + <cd:command category="structure" file="strc-reg.mkiv" level="style" name="setupregisters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32711,7 +33152,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32726,7 +33167,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance:ownnumber"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32744,7 +33185,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="seeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="seeregister" variant="instance"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -32764,7 +33205,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="placeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="placeregister" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -32778,7 +33219,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="completeregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="document" name="completeregister" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -32792,7 +33233,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" level="style" name="setupregister" variant="instance"> + <cd:command category="structure" file="strc-reg.mkiv" generated="yes" level="style" name="setupregister" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -32809,7 +33250,7 @@ <cd:constant value="index"/> </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" name="startregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="startregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32827,7 +33268,7 @@ <cd:index list="yes"/> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="stopregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32837,7 +33278,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setregisterentry"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="setregisterentry"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32883,7 +33324,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="finishregisterentry"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="finishregisterentry"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32911,7 +33352,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="setstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32957,7 +33398,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="startstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="startstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33006,7 +33447,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="stopstructurepageregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="stopstructurepageregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33016,7 +33457,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="determineregistercharacteristics"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="determineregistercharacteristics"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33068,8 +33509,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="utilityregisterlength"/> - <cd:command file="strc-reg.mkiv" name="placeregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="utilityregisterlength"/> + <cd:command file="strc-reg.mkiv" level="document" name="placeregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33079,7 +33520,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="completeregister"> + <cd:command category="structure" file="strc-reg.mkiv" level="document" name="completeregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33089,7 +33530,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" level="system" name="currentregisterpageuserdata"> + <cd:command category="structure" file="strc-reg.mkiv" level="system" name="currentregisterpageuserdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -33098,7 +33539,7 @@ </cd:command> </cd:interface> <cd:interface file="i-renderingwindow.xml"> - <cd:command file="scrn-wid.mkvi" name="useexternalrendering"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="system" name="useexternalrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33115,7 +33556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setinternalrendering"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="system" name="setinternalrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33127,7 +33568,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="definerenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="definerenderingwindow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33140,7 +33581,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="setuprenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setuprenderingwindow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33156,7 +33597,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placerenderingwindow"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="placerenderingwindow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33168,7 +33609,7 @@ </cd:command> </cd:interface> <cd:interface file="i-replacement.xml"> - <cd:command file="lang-rep.mkiv" level="style" name="replaceword"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="replaceword"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33181,7 +33622,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-rep.mkiv" level="style" name="setreplacement"> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="setreplacement"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -33189,15 +33630,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-rep.mkiv" name="resetreplacement"/> + <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacement"/> </cd:interface> <cd:interface file="i-rotatation.xml"> - <cd:command file="grph-trf.mkiv" level="document" name="mirror"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="mirror"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="style" name="setuprotate"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setuprotate"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -33220,7 +33661,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="document" name="rotate"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="rotate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuprotate"/> @@ -33228,7 +33669,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="system" name="dorotatebox"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="dorotatebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33239,7 +33680,7 @@ </cd:command> </cd:interface> <cd:interface file="i-scale.xml"> - <cd:command file="grph-trf.mkiv" level="style" name="definescale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="definescale"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33252,7 +33693,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="style" name="setupscale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="style" name="setupscale"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33332,7 +33773,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" level="document" name="scale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="document" name="scale"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -33343,7 +33784,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="fastscale"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="fastscale"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33351,7 +33792,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="fastsxsy"> + <cd:command category="graphics" file="grph-trf.mkiv" level="system" name="fastsxsy"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33423,7 +33864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="scrp-ini.mkvi" name="resetscript"/> + <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/> <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> <cd:keywords> @@ -33437,7 +33878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="scrp-ini.mkvi" generated="yes" name="script" variant="instance"> + <cd:command category="language" file="scrp-ini.mkvi" generated="yes" level="document" name="script" variant="instance"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> @@ -33453,7 +33894,7 @@ </cd:command> </cd:interface> <cd:interface file="i-section.xml"> - <cd:command file="strc-sec.mkiv" level="style" name="definehead"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="definehead"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33466,7 +33907,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" level="style" name="setuphead"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setuphead"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33671,6 +34112,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant method="range" prefix="math" type="line"/> + <cd:constant method="range" prefix="math" type="halfline"/> + <cd:constant method="range" prefix="math" type="-line"/> + <cd:constant method="range" prefix="math" type="-halfline"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="align"> @@ -33750,10 +34196,15 @@ <cd:parameter name="location"> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="strict"/> + <cd:constant type="positive"/> + <cd:constant type="all"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" level="style" name="setupheads"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setupheads"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33763,7 +34214,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33791,7 +34242,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:ownnumber"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33822,7 +34273,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:assignment"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:assignment"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33864,7 +34315,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" type="environment" variant="instance"> + <cd:command category="structure" file="strc-sec.mkiv" generated="yes" level="document" name="section" type="environment" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33911,7 +34362,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" level="document" name="namedsection" type="environment"> + <cd:command category="structure" file="strc-sec.mkiv" level="document" name="namedsection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -33943,28 +34394,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="definesection"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="definesection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="placeheadtext"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placeheadtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="placeheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="placeheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setupheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="style" name="setupheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -33974,22 +34425,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="determineheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="determineheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="currentheadnumber"/> - <cd:command file="strc-sec.mkiv" name="namedheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="currentheadnumber"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedheadnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="somenamedheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="somenamedheadnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34003,7 +34454,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="headnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="headnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34017,7 +34468,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="someheadnumber"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="someheadnumber"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34031,30 +34482,30 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" level="system" name="namedstructureheadlocation"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructureheadlocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="structurenumber"/> - <cd:command file="strc-sec.mkiv" name="structuretitle"/> - <cd:command file="strc-sec.mkiv" name="structurevariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structurenumber"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structuretitle"/> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structurevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="structureuservariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="structureuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" level="system" name="namedstructurevariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructurevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34064,7 +34515,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" level="system" name="namedstructureuservariable"> + <cd:command category="structure" file="strc-sec.mkiv" level="system" name="namedstructureuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34074,7 +34525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="definesectionlevels"> + <cd:command category="structure" file="strc-lev.mkvi" level="style" name="definesectionlevels"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34084,7 +34535,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" level="document" name="sectionlevel" type="environment"> + <cd:command category="structure" file="strc-lev.mkvi" level="document" name="sectionlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34116,7 +34567,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" level="document" name="subjectlevel" type="environment"> + <cd:command category="structure" file="strc-lev.mkvi" level="document" name="subjectlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34148,7 +34599,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" level="style" name="defineheadalternative"> + <cd:command category="structure" file="strc-ren.mkiv" level="style" name="defineheadalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34161,7 +34612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" level="style" name="setupheadalternative"> + <cd:command category="structure" file="strc-ren.mkiv" level="style" name="setupheadalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34178,8 +34629,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="localheadsetup" type="environment"/> - <cd:command file="strc-ren.mkiv" level="system" name="headhbox"> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="localheadsetup" type="environment"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34187,7 +34638,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" level="system" name="headvbox"> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34195,18 +34646,18 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" level="system" name="headreferenceattributes"/> - <cd:command file="strc-ren.mkiv" name="headnumbercontent"/> - <cd:command file="strc-ren.mkiv" name="headtextcontent"/> - <cd:command file="strc-ren.mkiv" name="headwidth"/> - <cd:command file="strc-ren.mkiv" name="headtextwidth"/> - <cd:command file="strc-ren.mkiv" name="headnumberwidth"/> - <cd:command file="strc-ren.mkiv" name="headnumberdistance"/> - <cd:command file="strc-ren.mkiv" name="headtextdistance"/> - <cd:command file="strc-ren.mkiv" name="headsetupspacing"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headreferenceattributes"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumbercontent"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextcontent"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumberwidth"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headnumberdistance"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headtextdistance"/> + <cd:command category="structure" file="strc-ren.mkiv" level="system" name="headsetupspacing"/> </cd:interface> <cd:interface file="i-sectionblock.xml"> - <cd:command file="strc-sbe.mkiv" level="style" name="definesectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="definesectionblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34219,7 +34670,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" level="style" name="setupsectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="setupsectionblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34241,7 +34692,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="setsectionblock"> + <cd:command category="structure" file="strc-sbe.mkiv" level="system" name="setsectionblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34253,7 +34704,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" level="document" name="sectionblock" type="environment"> + <cd:command category="structure" file="strc-sbe.mkiv" level="document" name="sectionblock" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34266,7 +34717,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" generated="yes" level="document" name="sectionblock" type="environment" variant="instance"> + <cd:command category="structure" file="strc-sbe.mkiv" generated="yes" level="document" name="sectionblock" type="environment" variant="instance"> <cd:sequence> <cd:instance value="sectionblock"/> </cd:sequence> @@ -34285,7 +34736,7 @@ <cd:constant value="backmatter"/> </cd:instances> </cd:command> - <cd:command file="strc-sbe.mkiv" level="style" name="sectionblockenvironment" type="environment"> + <cd:command category="structure" file="strc-sbe.mkiv" level="style" name="sectionblockenvironment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34331,7 +34782,7 @@ <cd:content optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="directselect"> + <cd:command file="core-env.mkiv" level="system" name="directselect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34345,77 +34796,77 @@ </cd:command> </cd:interface> <cd:interface file="i-setups.xml"> - <cd:command file="core-env.mkiv" name="setups"> + <cd:command file="core-env.mkiv" level="style" name="setups"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setups" variant="direct"> + <cd:command file="core-env.mkiv" level="style" name="setups" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setup"> + <cd:command file="core-env.mkiv" level="style" name="setup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setup" variant="direct"> + <cd:command file="core-env.mkiv" level="style" name="setup" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="directsetup"> + <cd:command file="core-env.mkiv" level="style" name="directsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="fastsetup"> + <cd:command file="core-env.mkiv" level="style" name="fastsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="texsetup"> + <cd:command file="core-env.mkiv" level="style" name="texsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="luasetup"> + <cd:command category="lua" file="core-env.mkiv" level="style" name="luasetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="systemsetups"> + <cd:command file="core-env.mkiv" level="system" name="systemsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="resetsetups"> + <cd:command file="core-env.mkiv" level="system" name="resetsetups"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="showsetupsdefinition"> + <cd:command file="core-env.mkiv" level="system" name="showsetupsdefinition"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34459,7 +34910,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="autosetups"> + <cd:command file="core-env.mkiv" level="style" name="autosetups"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -34473,7 +34924,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifelsesetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsesetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34486,7 +34937,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifsetupselse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetupselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34499,7 +34950,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifsetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34509,7 +34960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifnotsetups"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34519,7 +34970,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="luasetups" type="environment"> + <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34529,14 +34980,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="luasetups" type="environment" variant="string"> + <cd:command category="lua" file="core-env.mkiv" level="system" name="luasetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="xmlsetups" type="environment"> + <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34546,7 +34997,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="xmlsetups" type="environment" variant="string"> + <cd:command category="xml" file="core-env.mkiv" level="style" name="xmlsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -34570,7 +35021,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="localsetups" type="environment"> + <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34580,14 +35031,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="localsetups" type="environment" variant="string"> + <cd:command file="core-env.mkiv" level="style" name="localsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setups" type="environment"> + <cd:command file="core-env.mkiv" level="style" name="setups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34597,7 +35048,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setups" type="environment" variant="string"> + <cd:command file="core-env.mkiv" level="style" name="setups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -34606,7 +35057,7 @@ </cd:command> </cd:interface> <cd:interface file="i-shift.xml"> - <cd:command file="node.rul.mkiv" level="style" name="defineshift"> + <cd:command category="layout" file="node.rul.mkiv" level="style" name="defineshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34619,7 +35070,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" level="style" name="setupshift"> + <cd:command category="layout" file="node-rul.mkiv" level="style" name="setupshift"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34662,7 +35113,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" level="document" name="shift" variant="instance"> + <cd:command category="layout" file="node-rul.mkiv" generated="yes" level="document" name="shift" variant="instance"> <cd:sequence> <cd:instance value="shift"/> </cd:sequence> @@ -34674,7 +35125,7 @@ <cd:constant value="shiftdown"/> </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" level="document" name="shift" type="environment"> + <cd:command category="layout" file="node-rul.mkiv" level="document" name="shift" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34683,7 +35134,7 @@ </cd:command> </cd:interface> <cd:interface file="i-sidebar.xml"> - <cd:command file="anch-bar.mkiv" level="style" name="definesidebar"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="definesidebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34696,7 +35147,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="style" name="setupsidebar"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupsidebar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34729,7 +35180,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="document" name="sidebar" type="environment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="sidebar" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34739,7 +35190,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="style" name="setupmarginrule"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupmarginrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34749,7 +35200,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="style" name="setupmarginrules"> + <cd:command category="rules" file="anch-bar.mkiv" level="style" name="setupmarginrules"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34759,14 +35210,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="document" name="marginrule" type="environment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="marginrule" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" level="document" name="marginrule" type="environment" variant="assignment"> + <cd:command category="rules" file="anch-bar.mkiv" level="document" name="marginrule" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> @@ -34973,7 +35424,7 @@ <cd:constant value="logo"/> </cd:instances> </cd:command> - <cd:command category="language" file="strc-syn.mkiv" name="definesort"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="definesort"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35016,7 +35467,7 @@ <cd:constant value="logos"/> </cd:instances> </cd:command> - <cd:command category="language" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused"> + <cd:command category="language conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35026,14 +35477,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="strc-syn.mkiv" name="resetusedsortings"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="resetusedsortings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="language" file="strc-syn.mkiv" name="registersort"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="registersort"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35065,7 +35516,7 @@ </cd:command> </cd:interface> <cd:interface file="i-soundtrack.xml"> - <cd:command file="scrn-wid.mkvi" level="style" name="setupexternalsoundtracks"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="setupexternalsoundtracks"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -35074,7 +35525,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" level="style" name="useexternalsoundtrack"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="useexternalsoundtrack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35084,7 +35535,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="checksoundtrack"> + <cd:command category="pdf" file="scrn-wid.mkvi" level="style" name="checksoundtrack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35123,7 +35574,7 @@ </cd:command> </cd:interface> <cd:interface file="i-startstop.xml"> - <cd:command file="core-sys.mkiv" level="style" name="definestartstop"> + <cd:command category="structure" file="core-sys.mkiv" level="style" name="definestartstop"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35136,7 +35587,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" level="style" name="setupstartstop"> + <cd:command category="structure" file="core-sys.mkiv" level="style" name="setupstartstop"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -35170,12 +35621,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="startstop" type="environment" variant="example"> + <cd:command category="structure" file="core-sys.mkiv" generated="yes" level="document" name="startstop" type="environment" variant="example"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command file="core-sys.mkiv" name="startstop" type="environment"> + <cd:command category="structure" file="core-sys.mkiv" level="document" name="startstop" type="environment"> <cd:sequence> <cd:string value=""/> </cd:sequence> @@ -35185,7 +35636,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="startstop" variant="example"> + <cd:command category="structure" file="core-sys.mkiv" generated="yes" level="document" name="startstop" variant="example"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> @@ -35346,11 +35797,11 @@ </cd:command> </cd:interface> <cd:interface file="i-strut.xml"> - <cd:command file="supp-box.mkiv" name="strutdp"/> - <cd:command file="supp-box.mkiv" name="strutht"/> - <cd:command file="supp-box.mkiv" name="strutwd"/> - <cd:command file="supp-box.mkiv" name="struthtdp"/> - <cd:command file="spac-ver.mkiv" name="setupstruts"> + <cd:command file="supp-box.mkiv" level="system" name="strutdp"/> + <cd:command file="supp-box.mkiv" level="system" name="strutht"/> + <cd:command file="supp-box.mkiv" level="system" name="strutwd"/> + <cd:command file="supp-box.mkiv" level="system" name="struthtdp"/> + <cd:command file="spac-ver.mkiv" level="style" name="setupstruts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="yes"/> @@ -35378,12 +35829,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="strut"/> - <cd:command file="spac-ver.mkiv" name="halfstrut"/> - <cd:command file="spac-ver.mkiv" name="quarterstrut"/> - <cd:command file="spac-ver.mkiv" name="halflinestrut"/> - <cd:command file="spac-ver.mkiv" name="noheightstrut"/> - <cd:command file="spac-ver.mkiv" name="depthstrut"/> + <cd:command file="spac-ver.mkiv" level="style" name="strut"/> + <cd:command file="spac-ver.mkiv" level="system" name="halfstrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="quarterstrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="halflinestrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="noheightstrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="depthstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setcharstrut"> <cd:arguments> @@ -35395,8 +35846,8 @@ <cd:command file="spac-ver.mkiv" level="system" name="setfontstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setcapstrut"/> <cd:command file="spac-ver.mkiv" level="system" name="setnostrut"/> - <cd:command file="spac-ver.mkiv" name="showstruts"/> - <cd:command file="spac-ver.mkiv" name="showcolorstruts"/> + <cd:command file="spac-ver.mkiv" level="document" name="showstruts"/> + <cd:command file="spac-ver.mkiv" level="document" name="showcolorstruts"/> <cd:command begin="beg" end="end" file="spac-ver.mkiv" level="system" name="strut" type="environment"/> </cd:interface> <cd:interface file="i-symbol.xml"> @@ -35413,7 +35864,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35429,7 +35880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35445,7 +35896,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifinsymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35461,7 +35912,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelsesymbolset"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35474,7 +35925,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35504,7 +35955,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" name="directsymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="directsymbol"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35514,7 +35965,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definefiguresymbol"> + <cd:command category="symbols graphics" file="symb-ini.mkiv" level="style" name="definefiguresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35528,7 +35979,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="figuresymbol"> + <cd:command category="symbols graphics" file="symb-ini.mkiv" level="document" name="figuresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -35539,7 +35990,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35552,7 +36003,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse"> + <cd:command category="symbols conditional" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35579,7 +36030,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="symbols" file="symb-ini.mkiv" name="resetsymbolset"/> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="resetsymbolset"/> <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="usesymbols"> <cd:arguments> <cd:keywords> @@ -35595,8 +36046,46 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-synctex.xml"> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexsetfilename"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexresetfilename"/> + <cd:command category="pdf" file="cont-run.mkiv" level="system" name="synctexblockfilename"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="style" name="setupsynctex"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant default="yes" type="stop"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="min"/> + <cd:constant default="yes" type="max"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="pdf" file="cont-run.mkiv" level="style" name="blocksynctexfile"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> <cd:interface file="i-synonym.xml"> - <cd:command file="strc-syn.mkiv" level="style" name="definesynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="definesynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35612,7 +36101,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="style" name="setupsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="setupsynonyms"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -35700,7 +36189,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="synonym" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="synonym" variant="instance"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -35717,7 +36206,7 @@ <cd:constant value="abbreviation"/> </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" level="style" name="definesynonym"> + <cd:command category="symbols" file="strc-syn.mkiv" level="style" name="definesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35735,7 +36224,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsynonyms" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="synonyms"/> @@ -35749,7 +36238,7 @@ <cd:constant value="abbreviations"/> </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsynonyms" variant="instance"> + <cd:command category="symbols" file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -35763,7 +36252,7 @@ <cd:constant value="abbreviations"/> </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="registersynonym"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="registersynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35773,7 +36262,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused"> + <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35783,7 +36272,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown"> + <cd:command category="symbols conditional" file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35793,21 +36282,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetusedsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="resetusedsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetshownsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="system" name="resetshownsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="document" name="placelistofsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="placelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35817,7 +36306,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="document" name="completelistofsynonyms"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="completelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35827,7 +36316,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" level="document" name="infull"> + <cd:command category="symbols" file="strc-syn.mkiv" level="document" name="infull"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40730,7 +41219,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-tab.mkiv" name="setuptables"> + <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="setuptables"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> @@ -40977,11 +41466,11 @@ </cd:command> <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulaterule"/> <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateline"/> - <cd:command category="tables" file="tabl-tbl.mkiv" name="tabulateautorule"/> - <cd:command category="tables" file="tabl-tbl.mkiv" name="tabulateautoline"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateautorule"/> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulateautoline"/> </cd:interface> <cd:interface file="i-tagging.xml"> - <cd:command file="strc-tag.mkiv" level="style" name="setuptagging"> + <cd:command category="xml" file="strc-tag.mkiv" level="style" name="setuptagging"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -40994,7 +41483,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="dostart" end="dostop" file="strc-tag.mkiv" level="system" name="tagged" type="environment"> + <cd:command begin="dostart" category="xml" end="dostop" file="strc-tag.mkiv" level="system" name="tagged" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41004,7 +41493,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="element" type="environment"> + <cd:command category="xml" file="strc-tag.mkiv" name="element" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41016,7 +41505,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="system" name="doifelseinelement"> + <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifelseinelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41029,7 +41518,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="system" name="doifinelementelse"> + <cd:command category="xml conditional" file="strc-tag.mkiv" level="system" name="doifinelementelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41042,7 +41531,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="system" name="taggedlabeltexts"> + <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="taggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41053,7 +41542,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts"> + <cd:command category="xml language" file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41070,7 +41559,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="settaggedmetadata"> + <cd:command category="xml" file="strc-tag.mkiv" level="document" name="settaggedmetadata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -41081,7 +41570,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textbackground.xml"> - <cd:command file="anch-bck.mkiv" level="style" name="definetextbackground"> + <cd:command category="background" file="anch-bck.mkiv" level="style" name="definetextbackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41094,7 +41583,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" level="style" name="setuptextbackground"> + <cd:command category="background" file="anch-bck.mkiv" level="style" name="setuptextbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41205,7 +41694,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" level="document" name="textbackground" type="environment"> + <cd:command category="background" file="anch-bck.mkiv" level="document" name="textbackground" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41215,7 +41704,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" type="environment" variant="example"> + <cd:command category="background" file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" type="environment" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41225,7 +41714,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" variant="example"> + <cd:command category="background" file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41233,10 +41722,10 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" level="system" name="textbackgroundmanual" type="environment"/> + <cd:command category="background" file="anch-bck.mkiv" level="system" name="textbackgroundmanual" type="environment"/> </cd:interface> <cd:interface file="i-textflow.xml"> - <cd:command file="page-flw.mkiv" level="style" name="definetextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="style" name="definetextflow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41249,7 +41738,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" level="style" name="setuptextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="style" name="setuptextflow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41268,14 +41757,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="textflowcollector"> + <cd:command category="structure" file="page-flw.mkiv" level="system" name="textflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" level="system" name="doifelsetextflowcollector"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41288,7 +41777,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41301,7 +41790,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" level="system" name="doifelsetextflow"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doifelsetextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41314,7 +41803,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" level="system" name="doiftextflowelse"> + <cd:command category="structure conditional" file="page-flw.mkiv" level="system" name="doiftextflowelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41327,14 +41816,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="textflow" type="environment"> + <cd:command category="structure" file="page-flw.mkiv" level="document" name="textflow" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="flushtextflow"> + <cd:command category="structure" file="page-flw.mkiv" level="document" name="flushtextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41343,7 +41832,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textrule.xml"> - <cd:command file="pack-mrl.mkiv" level="style" name="setuptextrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setuptextrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -41391,7 +41880,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="textrule"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="textrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -41403,7 +41892,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="textrule" type="environment"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="textrule" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41543,7 +42032,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-txt.mkvi" level="system" name="doifelselayouttextline"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayouttextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41556,7 +42045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41569,7 +42058,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41582,7 +42071,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse"> + <cd:command category="layout conditional" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41595,8 +42084,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-txt.mkvi" name="noheaderandfooterlines"/> - <cd:command category="layout" file="page-txt.mkvi" name="notopandbottomlines"/> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="noheaderandfooterlines"/> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="notopandbottomlines"/> <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptoptexts"> <cd:arguments> <cd:keywords optional="yes"> @@ -41866,7 +42355,7 @@ </cd:command> </cd:interface> <cd:interface file="i-thinrule.xml"> - <cd:command file="pack-mrl.mkiv" level="style" name="setupthinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupthinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="height"> @@ -41920,9 +42409,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" level="document" name="thinrule"/> - <cd:command file="pack-mrl.mkiv" level="document" name="hairline"/> - <cd:command file="pack-mrl.mkiv" level="document" name="thinrules"> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="thinrule"/> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="hairline"/> + <cd:command category="rules" file="pack-mrl.mkiv" level="document" name="thinrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> @@ -41961,7 +42450,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tolerance.xml"> - <cd:command file="spac-hor.mkiv" level="style" name="setuptolerance"> + <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="setuptolerance"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> @@ -41977,7 +42466,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tooltip.xml"> - <cd:command file="scrn-fld.mkvi" level="style" name="definetooltip"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="definetooltip"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41990,7 +42479,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" level="style" name="setuptooltip"> + <cd:command category="pdf" file="scrn-fld.mkvi" level="style" name="setuptooltip"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42005,7 +42494,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" generated="yes" name="tooltip" variant="instance"> + <cd:command category="pdf" file="scrn-fld.mkvi" generated="yes" level="document" name="tooltip" variant="instance"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -42024,7 +42513,7 @@ <cd:constant value="tooltip"/> </cd:instances> </cd:command> - <cd:command file="scrn-fld.mkvi" generated="yes" name="tooltip" variant="instance:argument"> + <cd:command category="pdf" file="scrn-fld.mkvi" generated="yes" level="document" name="tooltip" variant="instance:argument"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -42087,8 +42576,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="resettrackers"/> - <cd:command file="trac-deb.mkiv" name="showtrackers"/> + <cd:command file="trac-deb.mkiv" level="system" name="resettrackers"/> + <cd:command file="trac-deb.mkiv" level="document" name="showtrackers"/> <cd:command file="trac-deb.mkiv" level="style" name="enabledirectives"> <cd:arguments> <cd:keywords list="yes"> @@ -42103,7 +42592,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="showdirectives"/> + <cd:command file="trac-deb.mkiv" level="document" name="showdirectives"/> <cd:command file="trac-deb.mkiv" level="style" name="enableexperiments"> <cd:arguments> <cd:keywords list="yes"> @@ -42118,14 +42607,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="showexperiments"/> - <cd:command file="trac-deb.mkiv" name="showedebuginfo"/> - <cd:command file="trac-deb.mkiv" name="overloaderror"/> - <cd:command file="trac-deb.mkiv" name="showlogcategories"/> - <cd:command file="trac-jus.mkiv" name="showjustification"/> + <cd:command file="trac-deb.mkiv" level="document" name="showexperiments"/> + <cd:command file="trac-deb.mkiv" level="system" name="showedebuginfo"/> + <cd:command file="trac-deb.mkiv" level="system" name="overloaderror"/> + <cd:command file="trac-deb.mkiv" level="system" name="showlogcategories"/> + <cd:command file="trac-jus.mkiv" level="system" name="showjustification"/> </cd:interface> <cd:interface file="i-translation.xml"> - <cd:command category="language" file="lang-lab.mkiv" name="translate"> + <cd:command category="language" file="lang-lab.mkiv" level="document" name="translate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:language"> @@ -42134,7 +42623,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="language" file="lang-lab.mkiv" name="assigntranslation"> + <cd:command category="language" file="lang-lab.mkiv" level="style" name="assigntranslation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> @@ -42312,7 +42801,7 @@ </cd:command> </cd:interface> <cd:interface file="i-typography.xml"> - <cd:command file="typo-txt.mkvi" name="normalizetextwidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42325,7 +42814,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextheight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42338,7 +42827,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextdepth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextdepth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42351,7 +42840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizetextline"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizetextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42364,7 +42853,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontwidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontwidth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42378,7 +42867,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontheight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontheight"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42392,7 +42881,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontdepth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontdepth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42406,7 +42895,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizefontline"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizefontline"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42420,7 +42909,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="widthspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="widthspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42433,7 +42922,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="heightspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="heightspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42446,7 +42935,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="depthspanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="depthspanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42459,7 +42948,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="linespanningtext"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="linespanningtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42472,8 +42961,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="normalizedfontsize"/> - <cd:command file="typo-txt.mkvi" name="NormalizeTextWidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="normalizedfontsize"/> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeTextWidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42486,7 +42975,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeTextHeight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeTextHeight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -42499,7 +42988,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeFontWidth"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeFontWidth"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42513,7 +43002,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="NormalizeFontHeight"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="NormalizeFontHeight"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42527,7 +43016,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="WidthSpanningText"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="WidthSpanningText"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -42540,8 +43029,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-txt.mkvi" name="TheNormalizedFontSize"/> - <cd:command file="typo-txt.mkvi" name="nicelyfilledbox" type="environment"> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="TheNormalizedFontSize"/> + <cd:command category="fonts" file="typo-txt.mkvi" level="system" name="nicelyfilledbox" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="width"> @@ -42562,21 +43051,21 @@ </cd:command> </cd:interface> <cd:interface file="i-unit.xml"> - <cd:command file="phys-dim.mkiv" level="document" name="digits"> + <cd:command category="symbols" file="phys-dim.mkiv" level="document" name="digits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" level="document" name="digits" variant="string"> + <cd:command category="symbols" file="phys-dim.mkiv" level="document" name="digits" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" level="style" name="defineunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="defineunit"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42589,7 +43078,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" level="style" name="setupunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="setupunit"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42640,7 +43129,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" generated="yes" level="document" name="unit" variant="instance"> + <cd:command category="symbols" file="phys-dim.mkiv" generated="yes" level="document" name="unit" variant="instance"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> @@ -42651,7 +43140,7 @@ <cd:constant value="unit"/> </cd:instances> </cd:command> - <cd:command file="phys-dim.mkiv" level="system" name="installunitsseparator"> + <cd:command category="symbols" file="phys-dim.mkiv" level="system" name="installunitsseparator"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42661,7 +43150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" level="system" name="installunitsspace"> + <cd:command category="symbols" file="phys-dim.mkiv" level="system" name="installunitsspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42671,7 +43160,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" level="style" name="registerunit"> + <cd:command category="symbols" file="phys-dim.mkiv" level="style" name="registerunit"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> @@ -42690,7 +43179,7 @@ </cd:command> </cd:interface> <cd:interface file="i-variables.xml"> - <cd:command file="core-env.mkiv" name="setvariables"> + <cd:command file="core-env.mkiv" level="style" name="setvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42708,7 +43197,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setevariables"> + <cd:command file="core-env.mkiv" level="system" name="setevariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42726,7 +43215,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setgvariables"> + <cd:command file="core-env.mkiv" level="system" name="setgvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42744,7 +43233,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setxvariables"> + <cd:command file="core-env.mkiv" level="system" name="setxvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42762,7 +43251,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="checkvariables"> + <cd:command file="core-env.mkiv" level="system" name="checkvariables"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42780,7 +43269,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setvariable"> + <cd:command file="core-env.mkiv" level="style" name="setvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42793,7 +43282,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setevariable"> + <cd:command file="core-env.mkiv" level="system" name="setevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42806,7 +43295,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setgvariable"> + <cd:command file="core-env.mkiv" level="system" name="setgvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42819,7 +43308,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setxvariable"> + <cd:command file="core-env.mkiv" level="system" name="setxvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42832,7 +43321,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="getvariable"> + <cd:command file="core-env.mkiv" level="style" name="getvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42842,7 +43331,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="showvariable"> + <cd:command file="core-env.mkiv" level="system" name="showvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42852,7 +43341,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifelsevariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelsevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42868,7 +43357,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifvariableelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42884,7 +43373,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42897,7 +43386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifnotvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42910,7 +43399,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifelseemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42926,7 +43415,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifemptyvariableelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42942,7 +43431,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42955,7 +43444,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifnotemptyvariable"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42981,7 +43470,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupenv"> + <cd:command file="core-env.mkiv" level="system" name="setupenv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="set"> @@ -42996,7 +43485,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifelseenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifelseenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43009,7 +43498,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifenvelse"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenvelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43022,7 +43511,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43032,7 +43521,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" level="system" name="doifnotenv"> + <cd:command category="conditional" file="core-env.mkiv" level="system" name="doifnotenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43042,14 +43531,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="env"> + <cd:command file="core-env.mkiv" level="system" name="env"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="envvar"> + <cd:command file="core-env.mkiv" level="system" name="envvar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43089,21 +43578,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="getdocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="getdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="getdocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="getdocumentargumentdefault"> + <cd:command file="luat-ini.mkiv" level="system" name="getdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43113,7 +43602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifelsedocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43126,7 +43615,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43139,7 +43628,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43149,7 +43638,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifnotdocumentargument"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43159,7 +43648,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43172,7 +43661,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43185,7 +43674,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43195,7 +43684,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename"> + <cd:command category="conditional" file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43378,7 +43867,7 @@ <cd:constant type="nested"/> <cd:constant type="tex"/> <cd:constant type="context"/> - <cd:constant default="yes" type="none"/> + <cd:constant type="none"/> <cd:constant type="cd:name"/> </cd:parameter> <cd:parameter name="style"> @@ -43519,17 +44008,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" name="astype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="astype"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" name="asciistr"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="asciistr"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" name="verbatim"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="verbatim"> <cd:arguments> <cd:content/> </cd:arguments> @@ -43554,7 +44043,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="doifelsetypingfile"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doifelsetypingfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43567,7 +44056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="doiftypingfileelse"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system conditional" name="doiftypingfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43604,7 +44093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="installversioninfo"> + <cd:command file="page-inf.mkiv" level="system" name="installversioninfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43614,14 +44103,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="includeversioninfo"> + <cd:command file="page-inf.mkiv" level="system" name="includeversioninfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="doifelseolderversion"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseolderversion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43637,7 +44126,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="doifolderversionelse"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifolderversionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43653,7 +44142,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="doifelseoldercontext"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifelseoldercontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43666,7 +44155,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" level="system" name="doifoldercontextelse"> + <cd:command category="conditional" file="file-mod.mkvi" level="system" name="doifoldercontextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43681,7 +44170,7 @@ </cd:command> </cd:interface> <cd:interface file="i-viewerlayer.xml"> - <cd:command file="attr-lay.mkiv" level="style" name="defineviewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="style" name="defineviewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43694,7 +44183,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" level="style" name="setupviewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="style" name="setupviewerlayer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -43723,19 +44212,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" level="document" name="viewerlayer" type="environment"> + <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="viewerlayer" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" generated="yes" level="document" name="viewerlayer" type="environment" variant="example"> + <cd:command category="pdf" file="attr-lay.mkiv" generated="yes" level="document" name="viewerlayer" type="environment" variant="example"> <cd:sequence> <cd:variable value="viewerlayer"/> </cd:sequence> </cd:command> - <cd:command file="attr-lay.mkiv" level="document" name="viewerlayer"> + <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="viewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43743,7 +44232,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="showlayoutcomponents"/> + <cd:command category="pdf" file="attr-lay.mkiv" level="document" name="showlayoutcomponents"/> </cd:interface> <cd:interface file="i-visualizer.xml"> <cd:command file="trac-vis.mkiv" level="system" name="ruledhbox"> @@ -43863,12 +44352,13 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" name="showmakeup"> + <cd:command file="trc-vis.mkiv" level="document" name="showmakeup"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="makeup"/> <cd:constant type="all"/> <cd:constant type="boxes"/> + <cd:constant type="line"/> <cd:constant type="glyph"/> <cd:constant type="fontkern"/> <cd:constant type="hbox"/> @@ -43891,22 +44381,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" name="showallmakeup"/> - <cd:command file="trc-vis.mkiv" name="showboxes"/> - <cd:command file="trc-vis.mkiv" name="showglyphs"/> - <cd:command file="trc-vis.mkiv" name="showfontkerns"/> - <cd:command file="trc-vis.mkiv" name="showfontitalics"/> - <cd:command file="trc-vis.mkiv" name="setvisualizerfont"> + <cd:command file="trc-vis.mkiv" level="document" name="showallmakeup"/> + <cd:command file="trc-vis.mkiv" level="document" name="showboxes"/> + <cd:command file="trc-vis.mkiv" level="document" name="showglyphs"/> + <cd:command file="trc-vis.mkiv" level="document" name="showfontkerns"/> + <cd:command file="trc-vis.mkiv" level="document" name="showfontitalics"/> + <cd:command file="trc-vis.mkiv" level="system" name="setvisualizerfont"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trc-vis.mkiv" name="resetvisualizers"/> + <cd:command file="trc-vis.mkiv" level="system" name="resetvisualizers"/> </cd:interface> <cd:interface file="i-vspace.xml"> - <cd:command file="spac-ver.mkiv" name="definevspacingamount"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacingamount"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43919,7 +44409,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="definevspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="definevspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43929,7 +44419,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="vspacing"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="preference"/> @@ -43980,42 +44470,86 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="directvspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="directvspacing"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupvspacing"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="setupvspacing"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="style" name="setupblank"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupblank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:inherit name="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="blank"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="blank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:constant type="preference"/> + <cd:constant type="samepage"/> + <cd:constant type="max"/> + <cd:constant type="force"/> + <cd:constant type="enable"/> + <cd:constant type="disable"/> + <cd:constant type="nowhite"/> + <cd:constant type="back"/> + <cd:constant type="overlay"/> + <cd:constant type="always"/> + <cd:constant type="weak"/> + <cd:constant type="strong"/> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="inbetween"/> + <cd:constant type="after"/> + <cd:constant type="fixed"/> + <cd:constant type="flexible"/> + <cd:constant type="none"/> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="quarterline"/> + <cd:constant type="formula"/> + <cd:constant type="white"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant type="standard"/> + <cd:constant method="factor" prefix="cd:number" type="small"/> + <cd:constant method="factor" prefix="cd:number" type="medium"/> + <cd:constant method="factor" prefix="cd:number" type="big"/> + <cd:constant method="factor" prefix="cd:number" type="line"/> + <cd:constant method="factor" prefix="cd:number" type="halfline"/> + <cd:constant method="factor" prefix="cd:number" type="quarterline"/> + <cd:constant method="factor" prefix="cd:number" type="formula"/> + <cd:constant method="factor" prefix="cd:number" type="white"/> + <cd:constant method="factor" prefix="cd:number" type="height"/> + <cd:constant method="factor" prefix="cd:number" type="depth"/> + <cd:constant method="range" prefix="category" type="cd:number"/> + <cd:constant method="range" prefix="order" type="cd:number"/> + <cd:constant method="range" prefix="penalty" type="cd:number"/> + <cd:constant type="cd:dimension"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="useblankparameter"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useblankparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="inhibitblank"/> - <cd:command file="spac-ver.mkiv" level="system" name="synchronizeblank"/> - <cd:command file="spac-ver.mkiv" level="style" name="definevspace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="inhibitblank"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="synchronizeblank"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="definevspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44028,7 +44562,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="vspace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="vspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44038,26 +44572,26 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="godown"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="godown"> <cd:arguments> <cd:keywords> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vglue"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="vglue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="smallskip"/> - <cd:command file="spac-ver.mkiv" name="medskip"/> - <cd:command file="spac-ver.mkiv" name="bigskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="smallskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="medskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="bigskip"/> </cd:interface> <cd:interface file="i-whitespace.xml"> - <cd:command file="spac-ver.mkiv" level="style" name="setupwhitespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="fix"/> @@ -44075,21 +44609,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="system" name="synchronizewhitespace"/> - <cd:command file="spac-ver.mkiv" level="system" name="correctwhitespace"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="synchronizewhitespace"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="correctwhitespace"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" level="document" name="packed" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="packed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="unpacked" type="environment"/> - <cd:command file="spac-ver.mkiv" level="document" name="linecorrection" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" name="unpacked" type="environment"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="linecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -44097,7 +44631,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="locallinecorrection" type="environment"> + <cd:command category="whitespace" file="spac-ver.mkiv" name="locallinecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -44107,21 +44641,21 @@ </cd:command> </cd:interface> <cd:interface file="i-xml.xml"> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlmain"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflush"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44131,7 +44665,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpure"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44141,21 +44675,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushtext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushpure"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlnonspace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlnonspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44165,21 +44699,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushspacewise"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushspacewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushlinewise"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushlinewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlall"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlall"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44189,8 +44723,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmllastmatch"/> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlfirst"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllastmatch"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44200,7 +44734,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmllast"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44210,7 +44744,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44220,28 +44754,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlshow"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlshow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinfo"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlfilter"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlfilter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44251,7 +44785,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstrip"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstrip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44261,7 +44795,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstripped"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstripped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44271,7 +44805,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstripnolines"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstripnolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44281,7 +44815,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstrippednolines"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlstrippednolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44291,7 +44825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlposition"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44304,7 +44838,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlelement"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44314,14 +44848,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpos"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsnippet"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsnippet"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44331,7 +44865,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlconcat"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlconcat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44344,7 +44878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlconcatrange"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlconcatrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44363,7 +44897,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcommand"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44376,52 +44910,114 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinlineverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinlineverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldisplayverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldisplayverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldisplayverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldisplayverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprettyprint"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprettyprint"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprettyprinttext"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineprettyprint"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinlineprettyprinttext"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:node"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadfile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44434,7 +45030,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44447,7 +45043,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloaddata"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloaddata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44460,7 +45056,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadonly"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloadonly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44473,7 +45069,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessfile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44486,7 +45082,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44499,7 +45095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessdata"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprocessdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44512,7 +45108,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclude"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclude"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44525,42 +45121,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlname"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpath"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlpath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltag"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcount"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlcount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44570,7 +45166,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattdef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44583,7 +45179,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlrefatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlrefatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44593,8 +45189,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmllastatt"/> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattribute"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmllastatt"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44607,7 +45203,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattributedef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlattributedef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44623,7 +45219,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchainatt"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchainatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44633,7 +45229,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchainattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchainattdef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44646,28 +45242,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectivesbefore"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectivesbefore"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectivesafter"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldirectivesafter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinstalldirective"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinstalldirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44677,7 +45273,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44687,7 +45283,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44700,14 +45296,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremovesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremovesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremovedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremovedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44717,7 +45313,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlflushdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44727,35 +45323,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlresetsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlresetdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprependsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprependsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlappendsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlappendsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbeforesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbeforesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44765,7 +45361,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlaftersetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlaftersetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44775,7 +45371,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprependdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlprependdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44785,7 +45381,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlappenddocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlappenddocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44795,7 +45391,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbeforedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbeforedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44808,7 +45404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlafterdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlafterdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44821,8 +45417,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisteredsetups"/> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregistereddocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisteredsetups"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregistereddocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44832,7 +45428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetfunction"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetfunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44845,7 +45441,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoif"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44858,7 +45454,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnot"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44871,7 +45467,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelse"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44887,7 +45483,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoiftext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44900,7 +45496,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnottext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnottext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44913,7 +45509,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelsetext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44929,7 +45525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44939,7 +45535,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnotselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifnotselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44949,7 +45545,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelseselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelseselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44962,7 +45558,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelseempty"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelseempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44978,7 +45574,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44988,7 +45584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44998,7 +45594,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremapname"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45014,7 +45610,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremapnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45027,7 +45623,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchecknamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlchecknamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45037,7 +45633,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlmapvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmapvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45050,7 +45646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45063,7 +45659,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelsevalue"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldoifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45079,14 +45675,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloaddirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlloaddirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsave"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45096,7 +45692,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltofile"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltofile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45109,7 +45705,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltobuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltobuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45122,7 +45718,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltobufferverbose"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltobufferverbose"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45135,65 +45731,65 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmladdindex"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmladdindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclusion"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclusion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbadinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlbadinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlraw"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlraw"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlraw" type="environment"/> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlresetinjectors"/> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetinjectors"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlraw" type="environment"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlresetinjectors"/> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetinjectors"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinjector"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlinjector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlapplyselectors"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlapplyselectors"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetentity"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlsetentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45203,7 +45799,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmltexentity"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmltexentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45228,7 +45824,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="xml" file="lxml-ini.mkiv" name="xmldefaulttotext"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmldefaulttotext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45333,14 +45929,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" name="embeddedxtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" name="embeddedxtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="embeddedxtable" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45482,7 +46078,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="tables" file="tabl-xtb.mkvi" name="currentxtablerow"/> - <cd:command category="tables" file="tabl-xtb.mkvi" name="currentxtablecolumn"/> + <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablerow"/> + <cd:command category="tables" file="tabl-xtb.mkvi" level="system" name="currentxtablecolumn"/> </cd:interface> </cd:interface> diff --git a/tex/context/interface/mkiv/i-accent.xml b/tex/context/interface/mkiv/i-accent.xml index b947dfc12..190e1faa9 100644 --- a/tex/context/interface/mkiv/i-accent.xml +++ b/tex/context/interface/mkiv/i-accent.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineaccent" file="enco-ini.mkiv"> + <cd:command name="defineaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-character"/> @@ -12,138 +12,150 @@ </cd:arguments> </cd:command> - <cd:command name="definecharacter" file="enco-ini.mkiv"> + <cd:command name="definecharacter" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="definecommand" file="enco-ini.mkiv"> + <cd:command name="definecommand" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="string-command"/> </cd:arguments> </cd:command> - <cd:command name="definemathaccent" file="enco-ini.mkiv"> + <cd:command name="definemathaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="buildmathaccent" file="enco-ini.mkiv"> + <cd:command name="buildmathaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextaccent" file="enco-ini.mkiv"> + <cd:command name="buildtextaccent" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextmacron" file="enco-ini.mkiv"> + <cd:command name="buildtextmacron" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomdot" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomdot" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextcedilla" file="enco-ini.mkiv"> + <cd:command name="buildtextcedilla" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextognek" file="enco-ini.mkiv"> + <cd:command name="buildtextognek" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextbottomcomma" file="enco-ini.mkiv"> + <cd:command name="buildtextbottomcomma" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="d" file="enco-ini.mkiv"> + <cd:command name="d" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="buildtextgrave" file="enco-ini.mkiv"> + <cd:command name="buildtextgrave" level="style" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="acute" file="enco-ini.mkiv"> + <cd:command name="acute" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="grave" file="enco-ini.mkiv"> + <cd:command name="grave" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="ddot" file="enco-ini.mkiv"> + <cd:command name="ddot" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="tilde" file="enco-ini.mkiv"> + <cd:command name="tilde" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="bar" file="enco-ini.mkiv"> + <cd:command name="bar" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="breve" file="enco-ini.mkiv"> + <cd:command name="breve" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="check" file="enco-ini.mkiv"> + <cd:command name="check" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="hat" file="enco-ini.mkiv"> + <cd:command name="hat" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="vec" file="enco-ini.mkiv"> + <cd:command name="vec" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="dot" file="enco-ini.mkiv"> + <cd:command name="dot" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-character"/> + </cd:arguments> + </cd:command> + + <cd:command name="ring" category="mathematics" level="document" file="math-acc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-character"/> + </cd:arguments> + </cd:command> + + <cd:command name="dddot" category="mathematics" level="document" file="math-acc.mkvi"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> @@ -249,4 +261,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml index 326024c39..55659a12a 100644 --- a/tex/context/interface/mkiv/i-align.xml +++ b/tex/context/interface/mkiv/i-align.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupalign" level="style" file="spac-ali.mkiv"> + <cd:command name="setupalign" category="alignment" level="style" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="broad"/> @@ -63,13 +63,13 @@ </cd:arguments> </cd:command> - <cd:command name="usealignparameter" level="system" file="spac-ali.mkiv"> + <cd:command name="usealignparameter" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="alignment" type="environment" level="document" file="spac-ali.mkiv"> + <cd:command name="alignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupalign"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="linealignment" type="environment" level="document" file="spac-ali.mkiv"> + <cd:command name="linealignment" type="environment" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="left"/> @@ -88,55 +88,55 @@ </cd:arguments> </cd:command> - <cd:command name="leftaligned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="leftaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="middlealigned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="middlealigned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="rightaligned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="rightaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="maxaligned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="maxaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="midaligned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="midaligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="centeraligned" type="environment" level="document" file="spac-ali.mkiv"/> + <cd:command name="centeraligned" type="environment" category="alignment" level="document" file="spac-ali.mkiv"/> - <cd:command name="leftaligned" level="document" file="spac-ali.mkiv"> + <cd:command name="leftaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightaligned" level="document" file="spac-ali.mkiv"> + <cd:command name="rightaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlealigned" level="document" file="spac-ali.mkiv"> + <cd:command name="middlealigned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="maxaligned" level="document" file="spac-ali.mkiv"> + <cd:command name="maxaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midaligned" level="document" file="spac-ali.mkiv"> + <cd:command name="midaligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeraligned" level="document" file="spac-ali.mkiv"> + <cd:command name="centeraligned" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="alignedline" level="system" file="spac-ali.mkiv"> + <cd:command name="alignedline" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-alignline"/> <cd:resolve name="argument-alignline"/> @@ -144,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="wordright" level="document" file="spac-ali.mkiv"> + <cd:command name="wordright" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="right"/> @@ -154,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedbox" level="system" file="spac-ali.mkiv"> + <cd:command name="simplealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedspreadbox" level="system" file="spac-ali.mkiv"> + <cd:command name="simplealignedspreadbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplealignedboxplus" level="system" file="spac-ali.mkiv"> + <cd:command name="simplealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedbox" level="system" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplereversealignedboxplus" level="system" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedboxplus" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-alignsimple"/> @@ -196,7 +196,7 @@ </cd:arguments> </cd:command> - <cd:command name="alignedbox" level="system" file="pack-box.mkiv"> + <cd:command name="alignedbox" level="system" category="alignment" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -206,7 +206,7 @@ </cd:arguments> </cd:command> - <cd:command name="aligned" level="system" file="pack-box.mkiv"> + <cd:command name="aligned" level="system" category="alignment" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -215,65 +215,65 @@ </cd:arguments> </cd:command> - <cd:command name="lefttoright" file="spac-ali.mkiv"/> + <cd:command name="lefttoright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="righttoleft" file="spac-ali.mkiv"/> + <cd:command name="righttoleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedbottom" file="spac-ali.mkiv"/> + <cd:command name="raggedbottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="alignbottom" file="spac-ali.mkiv"/> + <cd:command name="alignbottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="baselinebottom" file="spac-ali.mkiv"/> + <cd:command name="baselinebottom" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="notragged" file="spac-ali.mkiv"/> + <cd:command name="notragged" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedleft" file="spac-ali.mkiv"/> + <cd:command name="raggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedcenter" file="spac-ali.mkiv"/> + <cd:command name="raggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedright" file="spac-ali.mkiv"/> + <cd:command name="raggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedleft" file="spac-ali.mkiv"/> + <cd:command name="veryraggedleft" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedcenter" file="spac-ali.mkiv"/> + <cd:command name="veryraggedcenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="veryraggedright" file="spac-ali.mkiv"/> + <cd:command name="veryraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="raggedwidecenter" file="spac-ali.mkiv"/> + <cd:command name="raggedwidecenter" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="centeredlastline" file="spac-ali.mkiv"/> + <cd:command name="centeredlastline" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="flushedrightlastline" file="spac-ali.mkiv"/> + <cd:command name="flushedrightlastline" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="ttraggedright" file="spac-ali.mkiv"/> + <cd:command name="ttraggedright" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="forgetragged" file="spac-ali.mkiv"/> + <cd:command name="forgetragged" category="alignment" level="style" file="spac-ali.mkiv"/> - <cd:command name="line" file="spac-ali.mkiv"> + <cd:command name="line" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftline" file="spac-ali.mkiv"> + <cd:command name="leftline" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightline" file="spac-ali.mkiv"> + <cd:command name="rightline" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centerline" file="spac-ali.mkiv"> + <cd:command name="centerline" category="alignment" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hanging" type="environment" level="document" file="spac-ver.mkiv"> + <cd:command name="hanging" type="environment" category="alignment" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="distance"> @@ -291,7 +291,7 @@ </cd:arguments> </cd:command> - <cd:command name="hanging" type="environment" variant="argument" level="document" file="spac-ver.mkiv"> + <cd:command name="hanging" type="environment" variant="argument" category="alignment" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left" default="yes"/> @@ -301,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="fixed" type="environment" file="spac-ver.mkiv"> + <cd:command name="fixed" type="environment" category="alignment" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="low"/> diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml index 9320275a1..85cf8843b 100644 --- a/tex/context/interface/mkiv/i-attachment.xml +++ b/tex/context/interface/mkiv/i-attachment.xml @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="registerattachment" file="scrn-wid.mkvi"> + <cd:command name="registerattachment" level="document" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -157,4 +157,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml index 0db3eaa88..96a680e19 100644 --- a/tex/context/interface/mkiv/i-attribute.xml +++ b/tex/context/interface/mkiv/i-attribute.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pushattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="pushattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="popattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installattributestack" level="system" file="attr-ini.mkiv"> + <cd:command name="installattributestack" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="defineattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="defineattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesystemattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="definesystemattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -46,51 +46,51 @@ </cd:arguments> </cd:command> - <cd:command name="newattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="newattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dosetattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="dosetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doresetattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="doresetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattribute" level="system" file="attr-ini.mkiv"> + <cd:command name="dogetattribute" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattributeid" level="system" file="attr-ini.mkiv"> + <cd:command name="dogetattributeid" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetallattributes" level="system" file="attr-ini.mkiv"/> + <cd:command name="resetallattributes" category="attribute" level="system" file="attr-ini.mkiv"/> - <cd:command name="savecurrentattributes" level="system" file="attr-ini.mkiv"> + <cd:command name="savecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecurrentattributes" level="system" file="attr-ini.mkiv"> + <cd:command name="restorecurrentattributes" category="attribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showattributes" file="attr-ini.mkiv"/> + <cd:command name="showattributes" category="attribute" level="document" file="attr-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index ef9c2890e..ff52eed7d 100644 --- a/tex/context/interface/mkiv/i-backend.xml +++ b/tex/context/interface/mkiv/i-backend.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbackend" level="style" file="back-ini.mkiv"> + <cd:command name="setupbackend" level="style" catehory="pdf" file="back-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -18,7 +18,31 @@ <cd:constant type="cd:file"/> </cd:parameter> <cd:parameter name="intent"> - <cd:constant type="cd:name"/> + <cd:constant type="Coated FOGRA39 (ISO 12647-2:2004)"/> + <cd:constant type="GRACoL2006_Coated1v2.icc"/> + <cd:constant type="ISO Coated v2 300% (ECI)"/> + <cd:constant type="ISO Coated v2 (ECI)"/> + <cd:constant type="ISOnewspaper26v4"/> + <cd:constant type="ISOnewspaper26v4_gr"/> + <cd:constant type="ISO Uncoated"/> + <cd:constant type="ISO Uncoated Yellowish"/> + <cd:constant type="ISO Web Coated"/> + <cd:constant type="Japan Color 2001 Coated"/> + <cd:constant type="Japan Color 2002 Newspaper"/> + <cd:constant type="Japan Web Coated (Ad)"/> + <cd:constant type="SNAP 2007"/> + <cd:constant type="SWOP2006_Coated3v2.icc"/> + <cd:constant type="SWOP2006_Coated5v2.icc"/> + <cd:constant type="Uncoated FOGRA29 (ISO 12647-2:2004)"/> + <cd:constant type="Web Coated FOGRA28 (ISO 12647-2:2004)"/> + <cd:constant type="PSR_LWC_PLUS_V2_PT"/> + <cd:constant type="PSR_LWC_STD_V2_PT"/> + <cd:constant type="PSR_SC_PLUS_V2_PT"/> + <cd:constant type="PSR_SC_STD_V2_PT"/> + <cd:constant type="PSRgravureMF"/> + <!-- + <cd:constant type="cd:name"/> + --> </cd:parameter> <cd:parameter name="space"> <cd:constant type="yes"/> @@ -30,7 +54,23 @@ <cd:parameter name="format"> <cd:constant type="version"/> <cd:constant type="default"/> - <cd:constant type="cd:name"/> + <cd:constant type="PDF/X-1a:2001"/> + <cd:constant type="PDF/X-1a:2003"/> + <cd:constant type="PDF/X-3:2002"/> + <cd:constant type="PDF/X-3:2003"/> + <cd:constant type="PDF/X-4"/> + <cd:constant type="PDF/X-4p"/> + <cd:constant type="PDF/X-5g"/> + <cd:constant type="PDF/X-5pg"/> + <cd:constant type="PDF/X-5n"/> + <cd:constant type="PDF/A-1a:2005"/> + <cd:constant type="PDF/A-1b:2005"/> + <cd:constant type="PDF/A-2a"/> + <cd:constant type="PDF/A-3a"/> + <cd:constant type="PDF/UA-1"/> + <!-- + <cd:constant type="cd:name"/> + --> </cd:parameter> <cd:parameter name="level"> <cd:constant type="cd:number"/> @@ -46,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml index 7ae1e254a..6bdddbb1b 100644 --- a/tex/context/interface/mkiv/i-background.xml +++ b/tex/context/interface/mkiv/i-background.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebackground" level="style" file="pack-bck.mkvi"> + <cd:command name="definebackground" level="style" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbackground" level="style" file="pack-bck.mkvi"> + <cd:command name="setupbackground" level="style" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="background" type="environment" generated="yes" variant="example" level="document" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" generated="yes" variant="example" level="document" category="background" file="pack-bck.mkvi"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -59,7 +59,7 @@ </cd:instances> </cd:command> - <cd:command name="background" type="environment" level="document" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" level="document" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbackground"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="background" generated="yes" variant="example" level="document" file="pack-bck.mkvi"> + <cd:command name="background" generated="yes" variant="example" level="document" category="background" file="pack-bck.mkvi"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -79,20 +79,20 @@ </cd:instances> </cd:command> - <cd:command name="background" level="document" file="pack-bck.mkvi"> + <cd:command name="background" level="document" category="background" file="pack-bck.mkvi"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="backgroundline" level="document" file="pack-bck.mkvi"> + <cd:command name="backgroundline" level="document" category="background colors" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupbackgrounds" level="style" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" level="style" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="top"/> @@ -114,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbackgrounds" variant="page" level="style" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" variant="page" level="style" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -134,13 +134,13 @@ </cd:arguments> </cd:command> - <cd:command name="background" type="environment" begin="push" end="pop" file="page-bck.mkiv"> + <cd:command name="background" type="environment" begin="push" end="pop" level="system" category="background" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesomebackground" level="system" file="page-bck.mkiv"> + <cd:command name="doifelsesomebackground" level="system" category="background conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomebackgroundelse" level="system" file="page-bck.mkiv"> + <cd:command name="doifsomebackgroundelse" level="system" category="background conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomebackground" level="system" file="page-bck.mkiv"> + <cd:command name="doifsomebackground" level="system" category="background conditional" file="page-bck.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml index 2b9fdcecb..fb120d05b 100644 --- a/tex/context/interface/mkiv/i-bar.xml +++ b/tex/context/interface/mkiv/i-bar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebar" level="style" file="node-rul.mkiv"> + <cd:command name="definebar" level="style" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbar" level="style" file="node-rul.mkiv"> + <cd:command name="setupbar" level="style" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbars" level="style" file="node-rul.mkiv"> + <cd:command name="setupbars" level="style" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -91,7 +91,7 @@ </cd:arguments> </cd:command> - <cd:command name="bar" generated="yes" variant="instance" level="document" file="node-rul.mkiv"> + <cd:command name="bar" generated="yes" variant="instance" level="document" category="rules" file="node-rul.mkiv"> <cd:sequence> <cd:instance value="bar"/> </cd:sequence> @@ -103,25 +103,25 @@ </cd:instances> </cd:command> - <cd:command name="bar" type="environment" level="document" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setbar" level="document" file="node-rul.mkiv"> + <cd:command name="setbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetbar" level="document" file="node-rul.mkiv"> + <cd:command name="directsetbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="bar" type="environment" begin="push" end="pop" level="system" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" begin="push" end="pop" level="system" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -129,97 +129,97 @@ <!-- - <cd:command name="overbar" file="node-rul.mkiv"> + <cd:command name="overbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underbar" file="node-rul.mkiv"> + <cd:command name="underbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hiddenbar" file="node-rul.mkiv"> + <cd:command name="hiddenbar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="overstrike" file="node-rul.mkiv"> + <cd:command name="overstrike" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="understrike" file="node-rul.mkiv"> + <cd:command name="understrike" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="overbars" file="node-rul.mkiv"> + <cd:command name="overbars" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underbars" file="node-rul.mkiv"> + <cd:command name="underbars" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="overstrikes" file="node-rul.mkiv"> + <cd:command name="overstrikes" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="understrikes" file="node-rul.mkiv"> + <cd:command name="understrikes" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underrandom" file="node-rul.mkiv"> + <cd:command name="underrandom" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underrandoms" file="node-rul.mkiv"> + <cd:command name="underrandoms" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underdash" file="node-rul.mkiv"> + <cd:command name="underdash" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underdashes" file="node-rul.mkiv"> + <cd:command name="underdashes" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underdot" file="node-rul.mkiv"> + <cd:command name="underdot" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="underdots" file="node-rul.mkiv"> + <cd:command name="underdots" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="nobar" file="node-rul.mkiv"> + <cd:command name="nobar" level="document" category="rules" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -227,6 +227,6 @@ --> - <cd:command name="resetbar" file="node-rul.mkiv"/> + <cd:command name="resetbar" level="style" category="rules" file="node-rul.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml index 32ff5d854..0463f21ed 100644 --- a/tex/context/interface/mkiv/i-blackrule.xml +++ b/tex/context/interface/mkiv/i-blackrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupblackrules" level="style" file="pack-mrl.mkiv"> + <cd:command name="setupblackrules" level="style" category="rules colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="blackrule" level="document" file="pack-mrl.mkiv"> + <cd:command name="blackrule" level="document" category="rules colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="blackrules" level="document" file="pack-mrl.mkiv"> + <cd:command name="blackrules" level="document" category="rules colors" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="vl" level="document" file="pack-mrl.mkiv"> + <cd:command name="vl" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="somekindoftab" file="tabl-mis.mkiv"> + <cd:command name="somekindoftab" level="style" category="rules" file="tabl-mis.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="alternative"> @@ -98,4 +98,21 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="frule" level="style" category="rules" file="grph-rul.mkiv"> + <cd:arguments> + <cd:keywords delimiters="none" list="yes"> + <cd:constant type="cd:dimension" prefix="width␣" method="none"/> + <cd:constant type="cd:dimension" prefix="height␣" method="none"/> + <cd:constant type="cd:dimension" prefix="depth␣" method="none"/> + <cd:constant type="cd:dimension" prefix="radius␣" method="none"/> + <cd:constant type="cd:dimension" prefix="line␣" method="none"/> + <!-- the type option accepts 'mp' or 'fill' as arguments --> + <cd:constant type="cd:text" prefix="type␣" method="none"/> + <cd:constant type="cd:text" prefix="data␣" method="none"/> + <cd:constant type="cd:text" prefix="name␣" method="none"/> + </cd:keywords> + <cd:delimiter name="relax"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bleed.xml b/tex/context/interface/mkiv/i-bleed.xml index a0622f919..ee860b85f 100644 --- a/tex/context/interface/mkiv/i-bleed.xml +++ b/tex/context/interface/mkiv/i-bleed.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbleeding" level="style" file="pack-box.mkiv"> + <cd:command name="setupbleeding" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="bleed" level="document" file="pack-box.mkiv"> + <cd:command name="bleed" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> @@ -57,8 +57,8 @@ </cd:arguments> </cd:command> - <cd:command name="bleedwidth" file="pack-box.mkiv"/> + <cd:command name="bleedwidth" level="style" category="graphics" file="pack-box.mkiv"/> - <cd:command name="bleedheight" file="pack-box.mkiv"/> + <cd:command name="bleedheight" level="style" category="graphics" file="pack-box.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index f6be451ec..fa5262506 100644 --- a/tex/context/interface/mkiv/i-block.xml +++ b/tex/context/interface/mkiv/i-block.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineblock" level="style" file="strc-blk.mkiv"> + <cd:command name="defineblock" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupblock" level="style" file="strc-blk.mkiv"> + <cd:command name="setupblock" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="block" type="environment" generated="yes" variant="example" begin="begin" end="end" level="document" file="strc-blk.mkiv"> + <cd:command name="block" type="environment" generated="yes" variant="example" begin="begin" end="end" level="document" category="structure" file="strc-blk.mkiv"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -50,21 +50,21 @@ </cd:arguments> </cd:command> - <cd:command name="hideblocks" file="strc-blk.mkiv"> + <cd:command name="hideblocks" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="keepblocks" file="strc-blk.mkiv"> + <cd:command name="keepblocks" level="style" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="useblocks" level="document" file="strc-blk.mkiv"> + <cd:command name="useblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-list-optional"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="processblocks" level="document" file="strc-blk.mkiv"> + <cd:command name="processblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-list-optional"/> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="selectblocks" level="document" file="strc-blk.mkiv"> + <cd:command name="selectblocks" level="document" category="structure" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-list-optional"/> @@ -103,4 +103,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-bookmark.xml b/tex/context/interface/mkiv/i-bookmark.xml index 0a8359fa8..3dbfa3406 100644 --- a/tex/context/interface/mkiv/i-bookmark.xml +++ b/tex/context/interface/mkiv/i-bookmark.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupbookmark" level="style" file="strc-bkm.mkiv"> + <cd:command name="setupbookmark" level="style" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -40,7 +40,7 @@ <!-- - <cd:command name="setupbookmarks" file="strc-bkm.mkiv"> + <cd:command name="setupbookmarks" level="style" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbookmark"/> @@ -50,7 +50,7 @@ --> - <cd:command name="bookmark" level="document" file="strc-bkm.mkiv"> + <cd:command name="bookmark" level="document" category="pdf" file="strc-bkm.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="placebookmarks" file="src-bkm.mkiv"> + <cd:command name="placebookmarks" level="style" category="pdf" file="src-bkm.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -76,4 +76,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index f78cba953..366004840 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doiftext" file="supp-box.mkiv"> + <cd:command name="doiftext" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetext" file="supp-box.mkiv"> + <cd:command name="doifelsetext" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextelse" file="supp-box.mkiv"> + <cd:command name="doiftextelse" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -601,6 +601,13 @@ </cd:arguments> </cd:command> + <cd:command name="flushbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + <cd:command name="restorebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> @@ -615,7 +622,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsebox" level="system" file="supp-box.mkiv"> + <cd:command name="doifelsebox" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -624,7 +631,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifboxelse" level="system" file="supp-box.mkiv"> + <cd:command name="doifboxelse" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -850,7 +857,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelserighttoleftinbox" level="system" file="supp-box.mkiv"> + <cd:command name="doifelserighttoleftinbox" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -858,7 +865,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifrighttoleftinboxelse" level="system" file="supp-box.mkiv"> + <cd:command name="doifrighttoleftinboxelse" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -923,84 +930,84 @@ </cd:arguments> </cd:command> - <cd:command name="righttolefthbox" level="system" file="spac-ali.mkiv"> + <cd:command name="righttolefthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorighthbox" level="system" file="spac-ali.mkiv"> + <cd:command name="lefttorighthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvbox" level="system" file="spac-ali.mkiv"> + <cd:command name="righttoleftvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvbox" level="system" file="spac-ali.mkiv"> + <cd:command name="lefttorightvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvtop" level="system" file="spac-ali.mkiv"> + <cd:command name="righttoleftvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvtop" level="system" file="spac-ali.mkiv"> + <cd:command name="lefttorightvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirhbox" level="system" file="spac-ali.mkiv"> + <cd:command name="autodirhbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvbox" level="system" file="spac-ali.mkiv"> + <cd:command name="autodirvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvtop" level="system" file="spac-ali.mkiv"> + <cd:command name="autodirvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrighthbox" level="system" file="spac-ali.mkiv"> + <cd:command name="leftorrighthbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvbox" level="system" file="spac-ali.mkiv"> + <cd:command name="leftorrightvbox" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvtop" level="system" file="spac-ali.mkiv"> + <cd:command name="leftorrightvtop" level="system" category="alignment" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> @@ -1060,7 +1067,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseboxincache" level="system" file="supp-box.mkiv"> + <cd:command name="doifelseboxincache" level="system" category="conditional" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -1121,4 +1128,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index cc8686494..2ec89f571 100644 --- a/tex/context/interface/mkiv/i-buffer.xml +++ b/tex/context/interface/mkiv/i-buffer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doifelsebuffer" level="system" file="buff-ini.mkiv"> + <cd:command name="doifelsebuffer" level="system" category="buffer conditional" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifbufferelse" level="system" file="buff-ini.mkiv"> + <cd:command name="doifbufferelse" level="system" category="buffer conditional" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-true"/> @@ -20,19 +20,19 @@ </cd:arguments> </cd:command> - <cd:command name="resetbuffer" level="system" file="buff-ini.mkiv"> + <cd:command name="resetbuffer" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" level="document" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="grabbufferdata" level="system" file="buff-ini.mkiv"> + <cd:command name="grabbufferdata" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-category-optional"/> <cd:resolve name="keyword-name"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="grabbufferdatadirect" level="system" file="buff-ini.mkiv"> + <cd:command name="grabbufferdatadirect" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -49,13 +49,13 @@ </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" begin="set" end="end" level="system" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" begin="set" end="end" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupbuffer" level="style" file="buff-ini.mkiv"> + <cd:command name="setupbuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes"> @@ -69,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebuffer" level="style" file="buff-ini.mkiv"> + <cd:command name="definebuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-buffer-optional"/> @@ -79,25 +79,25 @@ </cd:arguments> </cd:command> - <cd:command name="getbuffer" level="document" file="buff-ini.mkiv"> + <cd:command name="getbuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="getdefinedbuffer" file="buff-ini.mkiv"> + <cd:command name="getdefinedbuffer" level="system" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="inlinebuffer" level="document" file="buff-ini.mkiv"> + <cd:command name="inlinebuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" generated="yes" variant="instance" level="document" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" generated="yes" variant="instance" lcategory="buffer" evel="document" file="buff-ini.mkiv"> <cd:sequence> <cd:instance value="buffer"/> </cd:sequence> @@ -106,7 +106,7 @@ </cd:instances> </cd:command> - <cd:command name="getbuffer" generated="yes" variant="instance" level="document" file="buff-ini.mkiv"> + <cd:command name="getbuffer" generated="yes" variant="instance" level="document" category="buffer" file="buff-ini.mkiv"> <cd:sequence> <cd:string value="get"/> <cd:instance value="buffer"/> @@ -115,11 +115,11 @@ <!-- - <cd:command name="hiding" type="environment" file="buff-ini.mkiv"/> + <cd:command name="hiding" type="environment" level="document" category="buffer" file="buff-ini.mkiv"/> --> - <cd:command name="processtexbuffer" file="buff-ini.mkiv"> + <cd:command name="processtexbuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:sequence> <cd:string value="processTEXbuffer"/> </cd:sequence> @@ -128,14 +128,14 @@ </cd:arguments> </cd:command> - <cd:command name="savebuffer" variant="list" file="buff-ini.mkiv"> + <cd:command name="savebuffer" variant="list" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="savebuffer" file="buff-ini.mkiv"> + <cd:command name="savebuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="list"> @@ -152,25 +152,25 @@ </cd:arguments> </cd:command> - <cd:command name="ctxluabuffer" file="buff-ini.mkiv"> + <cd:command name="ctxluabuffer" level="style" category="buffer lua" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="mkvibuffer" file="buff-ini.mkiv"> + <cd:command name="mkvibuffer" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="getbufferdata" file="buff-ini.mkiv"> + <cd:command name="getbufferdata" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="typebuffer" level="document" file="buff-ver.mkiv"> + <cd:command name="typebuffer" level="document" category="buffer verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes" optional="yes"> @@ -179,16 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="typeinlinebuffer" level="document" file="buff-ver.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-buffer-list-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuptype"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - <cd:command name="typebuffer" generated="yes" variant="instance" level="document" file="buff-ver.mkiv"> + <cd:command name="typebuffer" generated="yes" variant="instance" level="document" category="buffer verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:string value="type"/> <cd:instance value="buffer"/> @@ -200,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="typedefinedbuffer" file="buff-ver.mkiv"> + <cd:command name="typedefinedbuffer" level="system" category="buffer verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> <cd:assignments list="yes" optional="yes"> @@ -209,4 +200,31 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="prettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-buffer"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="inlineprettyprintbuffer" level="style" category="buffer verbatim" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-buffer"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="typeinlinebuffer" level="style" category="buffer verbatim" file="buff-ver.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-buffer-list-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuptype"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml index 4166f21aa..d7228c949 100644 --- a/tex/context/interface/mkiv/i-button.xml +++ b/tex/context/interface/mkiv/i-button.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definebutton" level="style" file="scrn-but.mkvi"> + <cd:command name="definebutton" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbutton" level="style" file="scrn-but.mkvi"> + <cd:command name="setupbutton" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -49,7 +49,7 @@ <!-- - <cd:command name="setupbuttons" file="scrn-but.mkvi"> + <cd:command name="setupbuttons" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -60,7 +60,7 @@ --> - <cd:command name="button" generated="yes" variant="example" file="scrn-but.mkvi"> + <cd:command name="button" generated="yes" variant="example" level="document" catehory="pdf" file="scrn-but.mkvi"> <cd:sequence> <cd:variable value="button"/> </cd:sequence> @@ -76,7 +76,7 @@ </cd:instances> </cd:command> - <cd:command name="button" file="scrn-but.mkvi"> + <cd:command name="button" level="document" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbutton"/> @@ -86,32 +86,32 @@ </cd:arguments> </cd:command> - <cd:command name="overlaybutton" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="overlaybutton" variant="direct" file="scrn-but.mkvi"> + <cd:command name="overlaybutton" variant="direct" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="MPmenubuttons" file="scrn-but.mkvi"> + <cd:command name="MPmenubuttons" level="style" catehory="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="overlayrollbutton" file="scrn-fld.mkvi"> + <cd:command name="overlayrollbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definepushbutton" file="scrn-fld.mkvi"> + <cd:command name="definepushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -120,14 +120,14 @@ </cd:arguments> </cd:command> - <cd:command name="pushbutton" file="scrn-fld.mkvi"> + <cd:command name="pushbutton" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definepushsymbol" file="scrn-fld.mkvi"> + <cd:command name="definepushsymbol" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -140,7 +140,7 @@ <!-- - <cd:command name="psh" scope="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="psh" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="psh" type="environment" scope="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="psh" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -156,7 +156,7 @@ --> - <cd:command name="rollbutton" variant="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="rollbutton" variant="button" file="scrn-fld.mkvi"> + <cd:command name="rollbutton" variant="button" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -179,7 +179,7 @@ <!-- - <cd:command name="rob" scope="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="rob" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="rob" type="environment" scope="interactionmenu" file="scrn-fld.mkvi"> + <cd:command name="rob" type="environment" scope="interactionmenu" level="style" catehory="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-capitals.xml b/tex/context/interface/mkiv/i-capitals.xml index 55c6779f4..d02874de0 100644 --- a/tex/context/interface/mkiv/i-capitals.xml +++ b/tex/context/interface/mkiv/i-capitals.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecapitals" level="style" file="typo-cap.mkiv"> + <cd:command name="definecapitals" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcapitals" level="style" file="typo-cap.mkiv"> + <cd:command name="setupcapitals" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -33,7 +33,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharactercasing" file="typo-cap.mkiv"> + <cd:command name="setcharactercasing" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -53,156 +53,156 @@ </cd:arguments> </cd:command> - <cd:command name="WORD" level="document" file="typo-cap.mkiv"> + <cd:command name="WORD" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="word" level="document" file="typo-cap.mkiv"> + <cd:command name="word" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Word" level="document" file="typo-cap.mkiv"> + <cd:command name="Word" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Words" level="document" file="typo-cap.mkiv"> + <cd:command name="Words" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="camel" level="document" file="typo-cap.mkiv"> + <cd:command name="camel" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="WORDS" level="document" file="typo-cap.mkiv"> + <cd:command name="WORDS" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="words" level="document" file="typo-cap.mkiv"> + <cd:command name="words" level="document" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudosmallcapped" file="typo-cap.mkiv"> + <cd:command name="pseudosmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoSmallcapped" file="typo-cap.mkiv"> + <cd:command name="pseudoSmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoSmallCapped" file="typo-cap.mkiv"> + <cd:command name="pseudoSmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pseudoMixedCapped" file="typo-cap.mkiv"> + <cd:command name="pseudoMixedCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realsmallcapped" file="typo-cap.mkiv"> + <cd:command name="realsmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realSmallcapped" file="typo-cap.mkiv"> + <cd:command name="realSmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="realSmallCapped" file="typo-cap.mkiv"> + <cd:command name="realSmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="notsmallcapped" file="typo-cap.mkiv"> + <cd:command name="notsmallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="smallcapped" file="typo-cap.mkiv"> + <cd:command name="smallcapped" levle="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Smallcapped" file="typo-cap.mkiv"> + <cd:command name="Smallcapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="SmallCapped" file="typo-cap.mkiv"> + <cd:command name="SmallCapped" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="autocap" file="typo-cap.mkiv"> + <cd:command name="autocap" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mixedcaps" file="typo-cap.mkiv"> + <cd:command name="mixedcaps" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="kap" file="typo-cap.mkiv"> + <cd:command name="kap" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Caps" file="typo-cap.mkiv"> + <cd:command name="Caps" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="uppercased" file="typo-cap.mkiv"> + <cd:command name="uppercased" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="lowercased" file="typo-cap.mkiv"> + <cd:command name="lowercased" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="randomizetext" file="typo-cap.mkiv"> + <cd:command name="randomizetext" level="style" category="fonts" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="randomized" type="environment" file="typo-cap.mkiv"/> + <cd:command name="randomized" type="environment" level="document" category="fonts" file="typo-cap.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml index 2eb39f380..351e8f6e4 100644 --- a/tex/context/interface/mkiv/i-catcodes.xml +++ b/tex/context/interface/mkiv/i-catcodes.xml @@ -4,63 +4,63 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="texcode" type="environment" level="system" file="catc-ctx.mkiv"/> + <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="contextcode" type="environment" level="system" file="catc-ctx.mkiv"/> + <cd:command name="contextcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="contextdefinitioncode" type="environment" level="system" file="catc-ctx.mkiv"/> + <cd:command name="contextdefinitioncode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/> - <cd:command name="protect" type="environment" begin="un" end="" level="system" file="catc-def.mkiv"/><!-- end="zero width space" --> + <cd:command name="protect" type="environment" begin="un" end="" level="system" category="catcode" file="catc-def.mkiv"/><!-- end="zero width space" --> - <cd:command name="newcatcodetable" level="system" file="catc-ini.mkiv"> + <cd:command name="newcatcodetable" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" level="system" file="catc-ini.mkiv"> + <cd:command name="catcodetable" type="environment" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="extendedcatcodetable" type="environment" level="system" file="catc-ini.mkiv"> + <cd:command name="extendedcatcodetable" type="environment" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installactivecharacter" level="system" file="catc-act.mkiv"> + <cd:command name="installactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="defineactivecharacter" level="system" file="catc-act.mkiv"> + <cd:command name="defineactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installanddefineactivecharacter" level="system" file="catc-act.mkiv"> + <cd:command name="installanddefineactivecharacter" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="makecharacteractive" level="system" file="catc-act.mkiv"> + <cd:command name="makecharacteractive" level="system" category="catcode" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="permitcircumflexescape" level="system" file="catc-ini.mkiv"/> + <cd:command name="permitcircumflexescape" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="permitcaretescape" level="system" file="catc-ini.mkiv"/> + <cd:command name="permitcaretescape" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="letcatcodecommand" level="system" file="catc-ini.mkiv"> + <cd:command name="letcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -71,7 +71,7 @@ </cd:arguments> </cd:command> - <cd:command name="defcatcodecommand" level="system" file="catc-ini.mkiv"> + <cd:command name="defcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="uedcatcodecommand" level="system" file="catc-ini.mkiv"> + <cd:command name="uedcatcodecommand" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -93,31 +93,31 @@ </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" begin="push" end="pop" level="system" file="catc-ini.mkiv"/> + <cd:command name="catcodetable" type="environment" begin="push" end="pop" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="restorecatcodes" level="system" file="catc-ini.mkiv"/> + <cd:command name="restorecatcodes" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="setcatcodetable" level="system" file="catc-ini.mkiv"> + <cd:command name="setcatcodetable" level="system" category="catcode" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="tracecatcodetables" level="system" file="catc-ini.mkiv"/> + <cd:command name="tracecatcodetables" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="catcodetablename" level="system" file="catc-ini.mkiv"/> + <cd:command name="catcodetablename" level="system" category="catcode" file="catc-ini.mkiv"/> - <cd:command name="rescan" level="system" file="catc-sym.mkiv"> + <cd:command name="rescan" level="system" category="catcode" file="catc-sym.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rescanwithsetup" level="system" file="catc-sym.mkiv"> + <cd:command name="rescanwithsetup" level="system" category="catcode" file="catc-sym.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-character.xml b/tex/context/interface/mkiv/i-character.xml index f7f0e08db..c391836d5 100644 --- a/tex/context/interface/mkiv/i-character.xml +++ b/tex/context/interface/mkiv/i-character.xml @@ -4,133 +4,141 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="letteropenbrace" file="catc-sym.mkiv"/> + <cd:command name="letteropenbrace" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterclosebrace" file="catc-sym.mkiv"/> + <cd:command name="letterclosebrace" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterampersand" file="catc-sym.mkiv"/> + <cd:command name="letterampersand" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterless" file="catc-sym.mkiv"/> + <cd:command name="letterless" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettermore" file="catc-sym.mkiv"/> + <cd:command name="lettermore" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterhash" file="catc-sym.mkiv"/> + <cd:command name="letterhash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterdoublequote" file="catc-sym.mkiv"/> + <cd:command name="letterdoublequote" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettersinglequote" file="catc-sym.mkiv"/> + <cd:command name="lettersinglequote" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterdollar" file="catc-sym.mkiv"/> + <cd:command name="letterdollar" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterpercent" file="catc-sym.mkiv"/> + <cd:command name="letterpercent" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterhat" file="catc-sym.mkiv"/> + <cd:command name="letterhat" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterunderscore" file="catc-sym.mkiv"/> + <cd:command name="letterunderscore" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbar" file="catc-sym.mkiv"/> + <cd:command name="letterbar" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettertilde" file="catc-sym.mkiv"/> + <cd:command name="lettertilde" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbackslash" file="catc-sym.mkiv"/> + <cd:command name="letterbackslash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterslash" file="catc-sym.mkiv"/> + <cd:command name="letterslash" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterquestionmark" file="catc-sym.mkiv"/> + <cd:command name="letterquestionmark" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterat" file="catc-sym.mkiv"/> + <cd:command name="letterat" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="lettercolon" file="catc-sym.mkiv"/> + <cd:command name="lettercolon" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterescape" file="catc-sym.mkiv"/> + <cd:command name="letterleftparenthesis" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterbgroup" file="catc-sym.mkiv"/> + <cd:command name="letterrightparenthesis" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letteregroup" file="catc-sym.mkiv"/> + <cd:command name="letterleftbracket" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterleftbrace" file="catc-sym.mkiv"/> + <cd:command name="letterrightbracket" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterrightbrace" file="catc-sym.mkiv"/> + <cd:command name="letterescape" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="letterexclamationmark" file="catc-sym.mkiv"/> + <cd:command name="letterbgroup" level="document" category="characters" file="catc-sym.mkiv"/> - <cd:command name="utfchar" file="char-ini.mkiv"> + <cd:command name="letteregroup" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="letterleftbrace" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="letterrightbrace" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="letterexclamationmark" level="document" category="characters" file="catc-sym.mkiv"/> + + <cd:command name="utfchar" level="document" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="safechar" file="char-ini.mkiv"> + <cd:command name="safechar" level="style" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="checkedchar" file="char-ini.mkiv"> + <cd:command name="checkedchar" level="style" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="textormathchar" file="char-ini.mkiv"> + <cd:command name="textormathchar" level="style" category="characters fonts" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chardescription" file="char-ini.mkiv"> + <cd:command name="chardescription" level="style" category="characters" file="char-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="percent" file="enco-ini.mkiv"/> + <cd:command name="percent" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="procent" file="enco-ini.mkiv"/> + <cd:command name="procent" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="ampersand" file="enco-ini.mkiv"/> + <cd:command name="ampersand" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="dollar" file="enco-ini.mkiv"/> + <cd:command name="dollar" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="hash" file="enco-ini.mkiv"/> + <cd:command name="hash" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="hyphen" file="enco-ini.mkiv"/> + <cd:command name="hyphen" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerleftsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerleftsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerleftdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerleftdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerrightsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerrightsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="lowerrightdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="lowerrightdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperleftsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperleftdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightsingleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperrightsingleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightdoubleninequote" file="enco-ini.mkiv"/> + <cd:command name="upperrightdoubleninequote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftsinglesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperleftsinglesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperleftdoublesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperleftdoublesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightsinglesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperrightsinglesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="upperrightdoublesixquote" file="enco-ini.mkiv"/> + <cd:command name="upperrightdoublesixquote" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="leftsubguillemot" file="enco-ini.mkiv"/> + <cd:command name="leftsubguillemot" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="rightsubguillemot" file="enco-ini.mkiv"/> + <cd:command name="rightsubguillemot" level="style" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textcontrolspace" file="enco-ini.mkiv"/> + <cd:command name="textcontrolspace" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textvisiblespace" file="enco-ini.mkiv"/> + <cd:command name="textvisiblespace" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textminus" file="enco-ini.mkiv"/> + <cd:command name="textminus" level="document" category="characters" file="enco-ini.mkiv"/> - <cd:command name="textplus" file="enco-ini.mkiv"/> + <cd:command name="textplus" level="document" category="characters" file="enco-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml index 16b73287a..3e9f81722 100644 --- a/tex/context/interface/mkiv/i-characteralign.xml +++ b/tex/context/interface/mkiv/i-characteralign.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="singalcharacteralign" level="system" file="typo-tal.mkiv"> + <cd:command name="singalcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="setcharacteralign" level="system" file="typo-tal.mkiv"> + <cd:command name="setcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords delimiters="braces"> @@ -22,11 +22,11 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacteralign" level="system" file="typo-tal.mkiv"/> + <cd:command name="resetcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> - <cd:command name="alignmentcharacter" level="system" file="typo-tal.mkiv"/> + <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/> - <cd:command name="characteralign" type="environment" level="system" file="typo-tal.mkiv"> + <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -36,10 +36,10 @@ </cd:arguments> </cd:command> - <cd:command name="checkcharacteralign" level="system" file="typo-tal.mkiv"> + <cd:command name="checkcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterspacing.xml b/tex/context/interface/mkiv/i-characterspacing.xml index 950866c40..0247115a3 100644 --- a/tex/context/interface/mkiv/i-characterspacing.xml +++ b/tex/context/interface/mkiv/i-characterspacing.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecharacterspacing" level="style" file="typo-spa.mkiv"> + <cd:command name="definecharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupcharacterspacing" level="style" file="typo-spa.mkiv"> + <cd:command name="setupcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharacterspacing" file="typo-spa.mkiv"> + <cd:command name="setcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -38,6 +38,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterspacing" file="typo-spa.mkiv"/> + <cd:command name="resetcharacterspacing" level="style" category="fonts" file="typo-spa.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characterstripping.xml b/tex/context/interface/mkiv/i-characterstripping.xml index cd89ac065..5c776e3ab 100644 --- a/tex/context/interface/mkiv/i-characterstripping.xml +++ b/tex/context/interface/mkiv/i-characterstripping.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setcharacterstripping" file="typo-rep.mkiv"> + <cd:command name="setcharacterstripping" level="style" category="language" file="typo-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13,8 +13,8 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterstripping" file="typo-rep.mkiv"/> + <cd:command name="resetcharacterstripping" level="style" category="language" file="typo-rep.mkiv"/> - <cd:command name="forcecharacterstripping" file="typo-rep.mkiv"/> + <cd:command name="forcecharacterstripping" level="style" category="language" file="typo-rep.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml index 84899c44e..2b73f1322 100644 --- a/tex/context/interface/mkiv/i-chart.xml +++ b/tex/context/interface/mkiv/i-chart.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="setupFLOWchart" file="m-chart.mkvi"> + <cd:command name="setupFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWcharts" file="m-chart.mkvi"> + <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +107,7 @@ --> - <cd:command name="setupFLOWcharts" level="style" file="m-chart.mkvi"> + <cd:command name="setupFLOWcharts" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -199,7 +199,7 @@ </cd:command> <!-- - <cd:command name="setupFLOWline" file="m-chart.mkvi"> + <cd:command name="setupFLOWline" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -231,7 +231,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWlines" file="m-chart.mkvi"> + <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -242,7 +242,7 @@ --> - <cd:command name="setupFLOWlines" level="style" file="m-chart.mkvi"> + <cd:command name="setupFLOWlines" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="corner"> @@ -275,7 +275,7 @@ <!-- - <cd:command name="setupFLOWshape" file="m-chart.mkvi"> + <cd:command name="setupFLOWshape" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWshapes" file="m-chart.mkvi"> + <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -306,7 +306,7 @@ --> - <cd:command name="setupFLOWshapes" level="style" file="m-chart.mkvi"> + <cd:command name="setupFLOWshapes" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -325,7 +325,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWfocus" level="style" file="m-chart.mkvi"> + <cd:command name="setupFLOWfocus" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -342,7 +342,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupFLOWsplit" level="style" file="m-chart.mkvi"> + <cd:command name="setupFLOWsplit" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -371,20 +371,20 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWchart" type="environment" file="m-chart.mkvi"> + <cd:command name="FLOWchart" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineFLOWchart" file="m-chart.mkvi"> + <cd:command name="defineFLOWchart" level="style" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="FLOWcell" type="environment" file="m-chart.mkvi"> + <cd:command name="FLOWcell" type="environment" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupFLOWshape"/> @@ -395,7 +395,7 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWchart" file="m-chart.mkvi"> + <cd:command name="FLOWchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -404,7 +404,7 @@ </cd:arguments> </cd:command> - <cd:command name="FLOWcharts" file="m-chart.mkvi"> + <cd:command name="FLOWcharts" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -413,13 +413,13 @@ </cd:arguments> </cd:command> - <cd:command name="name" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="name" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="shape" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="shape" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-flowshape"/> @@ -427,25 +427,25 @@ </cd:arguments> </cd:command> - <cd:command name="destination" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="destination" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="focus" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="focus" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="overlay" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="overlay" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="location" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="location" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="-"/> @@ -455,7 +455,7 @@ </cd:arguments> </cd:command> - <cd:command name="figure" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="figure" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -464,7 +464,7 @@ </cd:arguments> </cd:command> - <cd:command name="text" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="text" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -473,7 +473,7 @@ </cd:arguments> </cd:command> - <cd:command name="label" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="label" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -482,7 +482,7 @@ </cd:arguments> </cd:command> - <cd:command name="comment" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="comment" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -491,7 +491,7 @@ </cd:arguments> </cd:command> - <cd:command name="exit" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="exit" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-chartlabel"/> @@ -500,7 +500,7 @@ </cd:arguments> </cd:command> - <cd:command name="connection" scope="flowchart" file="m-chart.mkvi"> + <cd:command name="connection" scope="flowchart" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -524,7 +524,7 @@ </cd:arguments> </cd:command> - <cd:command name="include" file="m-chart.mkvi"> + <cd:command name="include" level="document" category="graphics metapost" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-charwidth.xml b/tex/context/interface/mkiv/i-charwidth.xml index 63240327a..dc19713f3 100644 --- a/tex/context/interface/mkiv/i-charwidth.xml +++ b/tex/context/interface/mkiv/i-charwidth.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="charwidthlanguage" file="typo-lan.mkiv"/> + <cd:command name="charwidthlanguage" level="style" category="language" file="typo-lan.mkiv"/> - <cd:command name="averagecharwidth" file="typo-lan.mkiv"/> + <cd:command name="averagecharwidth" level="style" category="language" file="typo-lan.mkiv"/> - <cd:command name="languagecharwidth" file="typo-lan.mkiv"> + <cd:command name="languagecharwidth" level="style" category="language" file="typo-lan.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml index ef6848d80..a2df03ede 100644 --- a/tex/context/interface/mkiv/i-chemical.xml +++ b/tex/context/interface/mkiv/i-chemical.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="molecule" file="chem-ini.mkiv"> + <cd:command name="molecule" level="document" file="chem-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="chem" file="chem-ini.mkiv"> + <cd:command name="chem" level="document" file="chem-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -18,7 +18,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupchemical" level="style" file="chem-str.mkiv"> + <cd:command name="setupchemical" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -114,7 +114,7 @@ <!-- - <cd:command name="setupchemicals" file="chem-str.mkiv"> + <cd:command name="setupchemicals" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,7 +125,7 @@ --> - <cd:command name="setupchemicalframed" level="style" file="chem-str.mkiv"> + <cd:command name="setupchemicalframed" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -134,33 +134,33 @@ </cd:arguments> </cd:command> - <cd:command name="definechemical" file="chem-str.mkiv"> + <cd:command name="definechemical" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definechemicalsymbol" file="chem-str.mkiv"> + <cd:command name="definechemicalsymbol" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalsymbol" file="chem-str.mkiv"> + <cd:command name="chemicalsymbol" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="chemicaltext" file="chem-str.mkiv"> + <cd:command name="chemicaltext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemical" type="environment" file="chem-str.mkiv"> + <cd:command name="chemical" type="environment" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -171,7 +171,7 @@ <!-- - <cd:command name="structurechemical" type="environment" file="chem-str.mkiv"> + <cd:command name="structurechemical" type="environment" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -182,7 +182,7 @@ --> - <cd:command name="chemical" file="chem-str.mkiv"> + <cd:command name="chemical" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-text-list"/> @@ -192,7 +192,7 @@ <!-- - <cd:command name="structurechemical" file="chem-str.mkiv"> + <cd:command name="structurechemical" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-text-list"/> @@ -202,19 +202,19 @@ --> - <cd:command name="chemicaltoptext" file="chem-str.mkiv"> + <cd:command name="chemicaltoptext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalbottext" file="chem-str.mkiv"> + <cd:command name="chemicalbottext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chemicalmidtext" file="chem-str.mkiv"> + <cd:command name="chemicalmidtext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -222,19 +222,19 @@ <!-- - <cd:command name="toptext" file="chem-str.mkiv"> + <cd:command name="toptext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="bottext" file="chem-str.mkiv"> + <cd:command name="bottext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="midtext" file="chem-str.mkiv"> + <cd:command name="midtext" level="document" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -242,7 +242,7 @@ --> - <cd:command name="definechemicals" level="style" file="chem-str.mkiv"> + <cd:command name="definechemicals" level="style" category="graphics" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -252,4 +252,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-clipping.xml b/tex/context/interface/mkiv/i-clipping.xml index c7f7a1777..c823b102d 100644 --- a/tex/context/interface/mkiv/i-clipping.xml +++ b/tex/context/interface/mkiv/i-clipping.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupclipping" level="style" file="grph-trf.mkiv"> + <cd:command name="setupclipping" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="clip" level="document" file="grph-trf.mkiv"> + <cd:command name="clip" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-collector.xml b/tex/context/interface/mkiv/i-collector.xml index 7bdf6270f..6642e6980 100644 --- a/tex/context/interface/mkiv/i-collector.xml +++ b/tex/context/interface/mkiv/i-collector.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecollector" level="style" file="pack-box.mkiv"> + <cd:command name="definecollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcollector" level="style" file="pack-box.mkiv"> + <cd:command name="setupcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcollector" level="document" file="pack-box.mkiv"> + <cd:command name="setcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -65,25 +65,25 @@ </cd:arguments> </cd:command> - <cd:command name="resetcollector" file="pack-box.mkiv"> + <cd:command name="resetcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushcollector" level="document" file="pack-box.mkiv"> + <cd:command name="flushcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="composedcollector" level="document" file="pack-box.mkiv"> + <cd:command name="composedcollector" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="adaptcollector" file="pack-box.mkiv"> + <cd:command name="adaptcollector" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -92,7 +92,7 @@ </cd:arguments> </cd:command> - <cd:command name="collectedtext" level="document" file="pack-box.mkiv"> + <cd:command name="collectedtext" level="document" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> @@ -111,4 +111,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 9856c02b6..af3a575cd 100644 --- a/tex/context/interface/mkiv/i-color.xml +++ b/tex/context/interface/mkiv/i-color.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="negatecolorbox" category="colors" file="colo-ext.mkiv"> + <cd:command name="negatecolorbox" level="system" category="colors" file="colo-ext.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="colorintent" type="environment" category="colors" file="colo-ext.mkiv"> + <cd:command name="colorintent" type="environment" level="document" category="colors" file="colo-ext.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="knockout"/> @@ -20,13 +20,13 @@ </cd:arguments> </cd:command> - <cd:command name="overprint" type="environment" category="colors" file="colo-ext.mkiv"/> + <cd:command name="overprint" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="knockout" type="environment" category="colors" file="colo-ext.mkiv"/> + <cd:command name="knockout" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="textcolorintent" type="environment" category="colors" file="colo-ext.mkiv"/> + <cd:command name="textcolorintent" type="environment" level="document" category="colors" file="colo-ext.mkiv"/> - <cd:command name="definecolorgroup" category="colors" file="colo-grp.mkiv"> + <cd:command name="definecolorgroup" level="style" category="colors" file="colo-grp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="definecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -86,14 +86,14 @@ </cd:arguments> </cd:command> - <cd:command name="definecolor" variant="name" category="colors" file="colo-ini.mkiv"> + <cd:command name="definecolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -102,14 +102,14 @@ </cd:arguments> </cd:command> - <cd:command name="defineglobalcolor" variant="name" category="colors" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -118,14 +118,14 @@ </cd:arguments> </cd:command> - <cd:command name="definenamedcolor" variant="name" category="colors" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="defineprocesscolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="defineprocesscolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color-optional"/> @@ -135,7 +135,7 @@ </cd:arguments> </cd:command> - <cd:command name="definespotcolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="definespotcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-color"/> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemultitonecolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="definemultitonecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -173,14 +173,14 @@ </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="1" category="colors" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="1" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="2" category="colors" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="2" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -194,55 +194,55 @@ </cd:arguments> </cd:command> - <cd:command name="definetransparency" variant="3" category="colors" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="3" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="switchtocolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="switchtocolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="color" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="color" level="document"category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloronly" category="colors" file="colo-ini.mkiv"> + <cd:command name="coloronly" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="transparent" category="colors" file="colo-ini.mkiv"> + <cd:command name="transparent" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="graycolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="graycolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" variant="name" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="colored" variant="name" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="colored" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -251,13 +251,13 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="coloronly" type="environment" category="colors" file="colo-ini.mkiv"> + <cd:command name="coloronly" type="environment" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> @@ -269,19 +269,19 @@ </cd:arguments> </cd:command> - <cd:command name="directcolor" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="directcolor" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" variant="name" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="directcolored" variant="name" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" category="colors" level="document" file="colo-ini.mkiv"> + <cd:command name="directcolored" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -289,27 +289,27 @@ </cd:arguments> </cd:command> - <cd:command name="currentcolor" type="environment" category="colors" file="colo-ini.mkiv"/> + <cd:command name="currentcolor" type="environment" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="colorset" type="environment" category="colors" file="colo-ini.mkiv"> + <cd:command name="colorset" type="environment" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usecolors" category="colors" file="colo-ini.mkiv"> + <cd:command name="usecolors" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="setupcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolors" category="colors" file="colo-ini.mkiv"> + <cd:command name="setupcolors" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -358,13 +358,13 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" begin="push" end="pop" category="colors" level="system" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" begin="push" end="pop" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="color" type="environment" begin="save" end="restore" category="colors" level="system" file="colo-ini.mkiv"/> + <cd:command name="color" type="environment" begin="save" end="restore" level="system" category="colors" file="colo-ini.mkiv"/> <cd:command name="definepalet" category="colors" file="colo-ini.mkiv"> <cd:arguments> @@ -377,28 +377,28 @@ </cd:arguments> </cd:command> - <cd:command name="definepalet" variant="name" category="colors" file="colo-ini.mkiv"> + <cd:command name="definepalet" variant="name" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="getpaletsize" category="colors" file="colo-ini.mkiv"> + <cd:command name="getpaletsize" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="paletsize" category="colors" file="colo-ini.mkiv"/> + <cd:command name="paletsize" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="setuppalet" category="colors" file="colo-ini.mkiv"> + <cd:command name="setuppalet" clevel="style" ategory="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcolormodell" category="colors" file="colo-ini.mkiv"> + <cd:command name="setcolormodell" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="black"/> @@ -412,9 +412,9 @@ </cd:arguments> </cd:command> - <cd:command name="protectedcolors" type="environment" category="colors" file="colo-ini.mkiv"/> + <cd:command name="protectedcolors" type="environment" level="system" category="colors" file="colo-ini.mkiv"/> - <cd:command name="defineintermediatecolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="defineintermediatecolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -432,7 +432,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecolor" category="colors" level="system" file="color-ini.mkiv"> + <cd:command name="doifelsecolor" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -440,7 +440,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolorelse" category="colors" level="system" file="color-ini.mkiv"> + <cd:command name="doifcolorelse" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -448,74 +448,74 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolor" category="colors" level="system" file="color-ini.mkiv"> + <cd:command name="doifcolor" level="system" category="colors conditional" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="textcolor" type="environment" category="colors" file="colo-ini.mkiv"> + <cd:command name="textcolor" type="environment" level="document" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcolor" category="colors" file="colo-ini.mkiv"> + <cd:command name="MPcolor" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcoloronly" category="colors" file="colo-ini.mkiv"> + <cd:command name="MPcoloronly" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPtransparency" category="colors" file="colo-ini.mkiv"> + <cd:command name="MPtransparency" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPoptions" file="colo-ini.mkiv"> + <cd:command name="MPoptions" level="style" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="colorvalue" category="colors" file="colo-ini.mkiv"> + <cd:command name="colorvalue" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="grayvalue" category="colors" file="colo-ini.mkiv"> + <cd:command name="grayvalue" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="colorcomponents" category="colors" file="colo-ini.mkiv"> + <cd:command name="colorcomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="transparencycomponents" category="colors" file="colo-ini.mkiv"> + <cd:command name="transparencycomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="processcolorcomponents" category="colors" file="colo-ini.mkiv"> + <cd:command name="processcolorcomponents" level="system" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="doifelseblack" category="colors" level="system" file="colo-ini.mkiv"> + <cd:command name="doifelseblack" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -523,7 +523,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifblackelse" category="colors" level="system" file="colo-ini.mkiv"> + <cd:command name="doifblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -531,45 +531,45 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedrawingblack" category="colors" level="system" file="colo-ini.mkiv"> + <cd:command name="doifelsedrawingblack" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifdrawingblackelse" category="colors" level="system" file="colo-ini.mkiv"> + <cd:command name="doifdrawingblackelse" level="system" category="colors conditional" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="showcolorbar" category="colors" file="colo-run.mkiv"> + <cd:command name="showcolorbar" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolor" category="colors" file="colo-run.mkiv"> + <cd:command name="showcolor" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorset" category="colors" file="colo-run.mkiv"> + <cd:command name="showcolorset" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorcomponents" category="colors" file="colo-run.mkiv"> + <cd:command name="showcolorcomponents" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showpalet" category="colors" file="colo-run.mkiv"> + <cd:command name="showpalet" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -582,13 +582,13 @@ </cd:arguments> </cd:command> - <cd:command name="comparepalet" category="colors" file="colo-run.mkiv"> + <cd:command name="comparepalet" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcolorgroup" category="colors" file="colo-run.mkiv"> + <cd:command name="showcolorgroup" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -601,10 +601,10 @@ </cd:arguments> </cd:command> - <cd:command name="comparecolorgroup" category="colors" file="colo-run.mkiv"> + <cd:command name="comparecolorgroup" level="document" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index ce98104d2..5c8be8685 100644 --- a/tex/context/interface/mkiv/i-columns.xml +++ b/tex/context/interface/mkiv/i-columns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupcolumns" level="style" file="page-mul.mkiv"> + <cd:command name="setupcolumns" level="style" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="columns" type="environment" level="document" file="page-mul.mkiv"> + <cd:command name="columns" type="environment" level="document" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumns"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcolumnspan" level="style" file="page-mul.mkiv"> + <cd:command name="setupcolumnspan" level="style" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnspan" type="environment" file="page-mul.mkiv"> + <cd:command name="columnspan" type="environment" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcolumnspan"/> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="setsimplecolumnhsize" file="page-mul.mkiv"> + <cd:command name="setsimplecolumnhsize" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="simplecolumns" type="environment" file="page-mul.mkiv"> + <cd:command name="simplecolumns" type="environment" category="columns" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setsimplecolumnhsize"/> @@ -108,4 +108,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml index 489d2494c..bd732c264 100644 --- a/tex/context/interface/mkiv/i-combination.xml +++ b/tex/context/interface/mkiv/i-combination.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecombination" level="style" file="pack-com.mkiv"> + <cd:command name="definecombination" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcombination" level="style" file="pack-com.mkiv"> + <cd:command name="setupcombination" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ <!-- - <cd:command name="setupcombinations" file="pack-com.mkiv"> + <cd:command name="setupcombinations" level="style" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -85,7 +85,7 @@ --> - <cd:command name="combination" type="environment" variant="matrix" level="document" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" variant="matrix" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="combination" type="environment" level="document" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" level="document" category="tables" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -105,13 +105,13 @@ <!-- - <cd:command name="content" type="environment" scope="combination" file="pack-com.mkiv"/> + <cd:command name="content" type="environment" scope="combination" level="document" category="tables" file="pack-com.mkiv"/> - <cd:command name="caption" type="environment" scope="combination" file="pack-com.mkiv"/> + <cd:command name="caption" type="environment" scope="combination" level="document" category="tables" file="pack-com.mkiv"/> --> - <cd:command name="floatcombination" type="environment" variant="matrix" level="document" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" variant="matrix" level="document" category="float tables" file="pack-com.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="floatcombination" type="environment" level="document" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" level="document" category="float tables" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -128,4 +128,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-comment.xml b/tex/context/interface/mkiv/i-comment.xml index 918d8a5f4..a1eb14d23 100644 --- a/tex/context/interface/mkiv/i-comment.xml +++ b/tex/context/interface/mkiv/i-comment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecomment" level="style" file="scrn-wid.mkvi"> + <cd:command name="definecomment" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcomment" level="style" file="scrn-wid.mkvi"> + <cd:command name="setupcomment" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="comment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> + <cd:command name="comment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> <cd:instance value="comment"/> </cd:sequence> @@ -113,7 +113,7 @@ </cd:instances> </cd:command> - <cd:command name="comment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> + <cd:command name="comment" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:sequence> <cd:instance value="comment"/> </cd:sequence> @@ -128,11 +128,11 @@ </cd:instances> </cd:command> - <cd:command name="placecomments" level="document" file="scrn-wid.mkvi"/> + <cd:command name="placecomments" level="document" category="pdf" file="scrn-wid.mkvi"/> <!-- - <cd:command name="comment" file="scrn-wid.mkvi"> + <cd:command name="comment" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-optional"/> <cd:assignments list="yes" optional="yes"> @@ -142,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="comment" type="environment" file="scrn-wid.mkvi"> + <cd:command name="comment" type="environment" level="document" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-optional"/> <cd:assignments list="yes" optional="yes"> @@ -153,4 +153,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index 787475e8b..de000148b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -532,4 +532,4 @@ </cd:keywords> </cd:define> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-definitions.xml b/tex/context/interface/mkiv/i-common-definitions.xml index 9f6d461f9..54e729aa4 100644 --- a/tex/context/interface/mkiv/i-common-definitions.xml +++ b/tex/context/interface/mkiv/i-common-definitions.xml @@ -9,4 +9,4 @@ <cd:interfacefile filename="i-common-value.xml"/> <cd:interfacefile filename="i-common-instance.xml"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml index b00ee9a92..dc8cead79 100644 --- a/tex/context/interface/mkiv/i-common-instance.xml +++ b/tex/context/interface/mkiv/i-common-instance.xml @@ -282,4 +282,152 @@ <cd:constant value="XML"/> </cd:define> -</cd:interface> + <cd:define name="instance-mathextensible"> + <!-- reverse --> + <cd:constant value="xrel"/> + <cd:constant value="xequal"/> + <cd:constant value="xleftarrow"/> + <cd:constant value="xrightarrow"/> + <cd:constant value="xleftrightarrow"/> + <cd:constant value="xLeftarrow"/> + <cd:constant value="xRightarrow"/> + <cd:constant value="xLeftrightarrow"/> + <cd:constant value="xtwoheadleftarrow"/> + <cd:constant value="xtwoheadrightarrow"/> + <cd:constant value="xmapsto"/> + <cd:constant value="xhookleftarrow"/> + <cd:constant value="xhookrightarrow"/> + <cd:constant value="xleftharpoondown"/> + <cd:constant value="xleftharpoonup"/> + <cd:constant value="xrightharpoondown"/> + <cd:constant value="xrightharpoonup"/> + <cd:constant value="xrightoverleftarrow"/> + <cd:constant value="xleftrightharpoons"/> + <cd:constant value="xrightleftharpoons"/> + <cd:constant value="xtriplerel"/> + <!-- mathematics --> + <cd:constant value="mrel"/> + <cd:constant value="mequal"/> + <cd:constant value="mleftarrow"/> + <cd:constant value="mrightarrow"/> + <cd:constant value="mleftrightarrow"/> + <cd:constant value="mLeftarrow"/> + <cd:constant value="mRightarrow"/> + <cd:constant value="mLeftrightarrow"/> + <cd:constant value="mtwoheadleftarrow"/> + <cd:constant value="mtwoheadrightarrow"/> + <cd:constant value="mmapsto"/> + <cd:constant value="mhookleftarrow"/> + <cd:constant value="mhookrightarrow"/> + <cd:constant value="mleftharpoondown"/> + <cd:constant value="mleftharpoonup"/> + <cd:constant value="mrightharpoondown"/> + <cd:constant value="mrightharpoonup"/> + <cd:constant value="mrightoverleftarrow"/> + <cd:constant value="mleftrightharpoons"/> + <cd:constant value="mrightleftharpoons"/> + <cd:constant value="mtriplerel"/> + <cd:constant value="eleftarrowfill"/> + <cd:constant value="erightarrowfill"/> + <cd:constant value="eleftrightarrowfill"/> + <cd:constant value="etwoheadrightarrowfill"/> + <cd:constant value="eleftharpoondownfill"/> + <cd:constant value="eleftharpoonupfill"/> + <cd:constant value="erightharpoondownfill"/> + <cd:constant value="erightharpoonupfill"/> + <cd:constant value="eoverbarfill"/> + <cd:constant value="eunderbarfill"/> + <cd:constant value="eoverbracefill"/> + <cd:constant value="eunderbracefill"/> + <cd:constant value="eoverparentfill"/> + <cd:constant value="eunderparentfill"/> + <cd:constant value="eoverbracketfill"/> + <cd:constant value="eunderbracketfill"/> + <!-- text --> + <cd:constant value="trel"/> + <cd:constant value="tequal"/> + <cd:constant value="tmapsto"/> + <cd:constant value="tleftarrow"/> + <cd:constant value="trightarrow"/> + <cd:constant value="tleftrightarrow"/> + <cd:constant value="tLeftarrow"/> + <cd:constant value="tRightarrow"/> + <cd:constant value="tLeftrightarrow"/> + <cd:constant value="ttwoheadleftarrow"/> + <cd:constant value="ttwoheadrightarrow"/> + <cd:constant value="thookleftarrow"/> + <cd:constant value="thookrightarrow"/> + <cd:constant value="tleftharpoondown"/> + <cd:constant value="tleftharpoonup"/> + <cd:constant value="trightharpoondown"/> + <cd:constant value="trightharpoonup"/> + <cd:constant value="trightoverleftarrow"/> + <cd:constant value="tleftrightharpoons"/> + <cd:constant value="trightleftharpoons"/> + <cd:constant value="ttriplerel"/> + <!-- chemistry --> + <cd:constant value="cleftarrow"/> + <cd:constant value="crightarrow"/> + <cd:constant value="crightoverleftarrow"/> + </cd:define> + + <cd:define name="instance-mathdoubleextensible"> + <!-- vfenced --> + <cd:constant value="doublebar"/> + <cd:constant value="doublebrace"/> + <cd:constant value="doubleparent"/> + <cd:constant value="doublebracket"/> + <!-- both --> + <cd:constant value="overbarunderbar"/> + <cd:constant value="overbraceunderbrace"/> + <cd:constant value="overparentunderparent"/> + <cd:constant value="overbracketunderbracket"/> + </cd:define> + + <cd:define name="instance-mathoverextensible"> + <!-- top --> + <cd:constant value="overleftarrow"/> + <cd:constant value="overrightarrow"/> + <cd:constant value="overleftrightarrow"/> + <cd:constant value="overtwoheadleftarrow"/> + <cd:constant value="overtwoheadrightarrow"/> + <cd:constant value="overleftharpoondown"/> + <cd:constant value="overleftharpoonup"/> + <cd:constant value="overrightharpoondown"/> + <cd:constant value="overrightharpoonup"/> + <!-- vfenced --> + <cd:constant value="overbar"/> + <cd:constant value="overbrace"/> + <cd:constant value="overparent"/> + <cd:constant value="overbracket"/> + <!-- bothtext --> + <cd:constant value="overbartext"/> + <cd:constant value="overbracetext"/> + <cd:constant value="overparenttext"/> + <cd:constant value="overbrackettext"/> + </cd:define> + + <cd:define name="instance-mathunderextensible"> + <!-- bottom --> + <cd:constant value="underleftarrow"/> + <cd:constant value="underrightarrow"/> + <cd:constant value="underleftrightarrow"/> + <cd:constant value="undertwoheadleftarrow"/> + <cd:constant value="undertwoheadrightarrow"/> + <cd:constant value="underleftharpoondown"/> + <cd:constant value="underleftharpoonup"/> + <cd:constant value="underrightharpoondown"/> + <cd:constant value="underrightharpoonup"/> + <!-- vfenced --> + <cd:constant value="underbar"/> + <cd:constant value="underbrace"/> + <cd:constant value="underparent"/> + <cd:constant value="underbracket"/> + <!-- bothtext --> + <cd:constant value="underbartext"/> + <cd:constant value="underbracetext"/> + <cd:constant value="underparenttext"/> + <cd:constant value="underbrackettext"/> + </cd:define> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml index 9671a4528..97ac50caa 100644 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ b/tex/context/interface/mkiv/i-common-keyword.xml @@ -757,6 +757,7 @@ <cd:define name="keyword-scite-optional"> <cd:keywords optional="yes"> + <cd:constant type="none"/> <cd:constant type="tex"/> <cd:constant type="mkiv"/> <cd:constant type="mkvi"/> diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index 265308162..81b672e7b 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -413,6 +413,11 @@ <cd:constant type="min"/> <cd:constant type="max"/> <cd:constant type="middle"/> + <cd:constant type="math"/> + <cd:constant type="line" prefix="math" method="range"/> + <cd:constant type="halfline" prefix="math" method="range"/> + <cd:constant type="-line" prefix="math" method="range"/> + <cd:constant type="-halfline" prefix="math" method="range"/> <cd:constant type="cd:name"/> </cd:define> @@ -582,6 +587,10 @@ <cd:constant type="tight"/> <cd:constant type="middle"/> <cd:constant type="frame"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="line" prefix="-" method="none"/> + <cd:constant type="halfline" prefix="-" method="none"/> <cd:inherit name="setupbodyfont"/> </cd:define> @@ -659,4 +668,18 @@ <cd:constant prefix="a" type="cd:name" method="range"/> </cd:define> -</cd:interface> + <!-- option = ... --> + + <cd:define name="value-verbatim"> + <cd:constant type="mp"/> + <cd:constant type="lua"/> + <cd:constant type="xml"/> + <cd:constant type="parsed-xml"/> + <cd:constant type="nested"/> + <cd:constant type="tex"/> + <cd:constant type="context"/> + <cd:constant type="none"/> + <cd:constant type="cd:name"/> + </cd:define> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context-modules.xml b/tex/context/interface/mkiv/i-context-modules.xml index 319ba53df..85194c6ec 100644 --- a/tex/context/interface/mkiv/i-context-modules.xml +++ b/tex/context/interface/mkiv/i-context-modules.xml @@ -37,4 +37,4 @@ <cd:interfacefile filename="i-translate.xml"/> <cd:interfacefile filename="i-visual.xml"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 10eb9ef10..7ff109649 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index 82d3cc541..ba09abcba 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -86,6 +86,7 @@ <cd:interfacefile filename="i-formula.xml"/> <cd:interfacefile filename="i-fraction.xml"/> <cd:interfacefile filename="i-framed.xml"/> + <cd:interfacefile filename="i-framedtable.xml"/> <cd:interfacefile filename="i-graphics.xml"/> <cd:interfacefile filename="i-grid.xml"/> <cd:interfacefile filename="i-help.xml"/> @@ -203,6 +204,7 @@ <cd:interfacefile filename="i-string.xml"/> <cd:interfacefile filename="i-strut.xml"/> <cd:interfacefile filename="i-symbol.xml"/> + <cd:interfacefile filename="i-synctex.xml"/> <cd:interfacefile filename="i-synonym.xml"/> <cd:interfacefile filename="i-system.xml"/> <cd:interfacefile filename="i-systemlog.xml"/> @@ -232,4 +234,4 @@ <cd:interfacefile filename="i-xml.xml"/> <cd:interfacefile filename="i-xtable.xml"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index af679b8e0..a2e975368 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -4,271 +4,271 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="numbers" category="counter" file="core-con.mkiv"> + <cd:command name="numbers" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Numbers" category="counter" file="core-con.mkiv"> + <cd:command name="Numbers" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="romannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="romannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Romannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="Romannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="abjadnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnodotnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="abjadnodotnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnaivenumerals" category="counter" file="core-con.mkiv"> + <cd:command name="abjadnaivenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languagecharacters" category="counter" file="core-con.mkiv"> + <cd:command name="languagecharacters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languageCharacters" category="counter" file="core-con.mkiv"> + <cd:command name="languageCharacters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="alphabeticnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Alphabeticnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="Alphabeticnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="thainumerals" category="counter" file="core-con.mkiv"> + <cd:command name="thainumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="devanagarinumerals" category="counter" file="core-con.mkiv"> + <cd:command name="devanagarinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gurmurkhinumerals" category="counter" file="core-con.mkiv"> + <cd:command name="gurmurkhinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gujaratinumerals" category="counter" file="core-con.mkiv"> + <cd:command name="gujaratinumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tibetannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="tibetannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="greeknumerals" category="counter" file="core-con.mkiv"> + <cd:command name="greeknumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Greeknumerals" category="counter" file="core-con.mkiv"> + <cd:command name="Greeknumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="arabicnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="persiannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicdecimals" category="counter" file="core-con.mkiv"> + <cd:command name="arabicdecimals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiandecimals" category="counter" file="core-con.mkiv"> + <cd:command name="persiandecimals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicexnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="arabicexnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="koreannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsp" category="counter" file="core-con.mkiv"> + <cd:command name="koreannumeralsp" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsc" category="counter" file="core-con.mkiv"> + <cd:command name="koreannumeralsc" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreanparentnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="koreanparentnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreancirclenumerals" category="counter" file="core-con.mkiv"> + <cd:command name="koreancirclenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesenumerals" category="counter" file="core-con.mkiv"> + <cd:command name="chinesenumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesecapnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="chinesecapnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chineseallnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="chineseallnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="character" category="counter" file="core-con.mkiv"> + <cd:command name="character" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Character" category="counter" file="core-con.mkiv"> + <cd:command name="Character" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="characters" category="counter" file="core-con.mkiv"> + <cd:command name="characters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Characters" category="counter" file="core-con.mkiv"> + <cd:command name="Characters" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="monthlong" file="core-con.mkiv"> + <cd:command name="monthlong" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="monthshort" file="core-con.mkiv"> + <cd:command name="monthshort" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="convertmonth" file="core-con.mkiv"> + <cd:command name="convertmonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="month" file="core-con.mkiv"> + <cd:command name="month" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="MONTH" file="core-con.mkiv"> + <cd:command name="MONTH" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="MONTHLONG" file="core-con.mkiv"> + <cd:command name="MONTHLONG" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="MONTHSHORT" file="core-con.mkiv"> + <cd:command name="MONTHSHORT" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="weekday" file="core-con.mkiv"> + <cd:command name="weekday" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="WEEKDAY" file="core-con.mkiv"> + <cd:command name="WEEKDAY" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="dayoftheweek" file="core-con.mkiv"> + <cd:command name="dayoftheweek" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -276,7 +276,7 @@ </cd:arguments> </cd:command> - <cd:command name="getdayoftheweek" file="core-con.mkiv"> + <cd:command name="getdayoftheweek" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -284,7 +284,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseleapyear" file="core-con.mkiv"> + <cd:command name="doifelseleapyear" level="style" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -292,7 +292,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifleapyearelse" file="core-con.mkiv"> + <cd:command name="doifleapyearelse" level="style" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -300,21 +300,21 @@ </cd:arguments> </cd:command> - <cd:command name="dayspermonth" file="core-con.mkiv"> + <cd:command name="dayspermonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getdayspermonth" file="core-con.mkiv"> + <cd:command name="getdayspermonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="currentdate" level="document" file="core-con.mkiv"> + <cd:command name="currentdate" level="document" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="year"/> @@ -358,7 +358,7 @@ </cd:arguments> </cd:command> - <cd:command name="date" level="document" file="core-con.mkiv"> + <cd:command name="date" level="document" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -377,7 +377,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawdate" file="core-con.mkiv"> + <cd:command name="rawdate" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="currentdate"/> @@ -385,7 +385,7 @@ </cd:arguments> </cd:command> - <cd:command name="currenttime" level="document" file="core-con.mkiv"> + <cd:command name="currenttime" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -395,7 +395,7 @@ </cd:arguments> </cd:command> - <cd:command name="processmonth" file="core-con.mkiv"> + <cd:command name="processmonth" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -403,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="processyear" file="core-con.mkiv"> + <cd:command name="processyear" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> @@ -412,7 +412,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" category="counter" file="core-con.mkiv"> + <cd:command name="defineconversion" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-name"/> @@ -420,7 +420,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" variant="list" category="counter" file="core-con.mkiv"> + <cd:command name="defineconversion" variant="list" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-name"/> @@ -428,7 +428,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertnumber" category="counter" level="document" file="core-con.mkiv"> + <cd:command name="convertnumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="empty"/> @@ -508,7 +508,7 @@ </cd:arguments> </cd:command> - <cd:command name="uconvertnumber" category="counter" file="core-con.mkiv"> + <cd:command name="uconvertnumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:inherit name="convertnumber"/> @@ -517,7 +517,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversiondefined" category="counter" level="system" file="core-con.mkiv"> + <cd:command name="doifelseconversiondefined" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -525,7 +525,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversiondefinedelse" category="counter" level="system" file="core-con.mkiv"> + <cd:command name="doifconversiondefinedelse" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -533,7 +533,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseconversionnumber" category="counter" level="system" file="core-con.mkiv"> + <cd:command name="doifelseconversionnumber" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -542,7 +542,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifconversionnumberelse" category="counter" level="system" file="core-con.mkiv"> + <cd:command name="doifconversionnumberelse" level="system" category="counter conditional" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -551,7 +551,7 @@ </cd:arguments> </cd:command> - <cd:command name="wordtonumber" category="counter" file="core-con.mkiv"> + <cd:command name="wordtonumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -564,82 +564,82 @@ </cd:arguments> </cd:command> - <cd:command name="highordinalstr" file="core-con.mkiv"> + <cd:command name="highordinalstr" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ordinalstr" file="core-con.mkiv"> + <cd:command name="ordinalstr" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ordinaldaynumber" file="core-con.mkiv"> + <cd:command name="ordinaldaynumber" level="document" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="verbosenumber" category="counter" file="core-con.mkiv"> + <cd:command name="verbosenumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="VerboseNumber" category="counter" file="core-con.mkiv"> + <cd:command name="VerboseNumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedromannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="smallcappedromannumerals" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedcharacters" category="counter" file="core-con.mkiv"> + <cd:command name="smallcappedcharacters" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="sloveniannumerals" category="counter" file="core-con.mkiv"> + <cd:command name="sloveniannumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="slovenianNumerals" category="counter" file="core-con.mkiv"> + <cd:command name="slovenianNumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishnumerals" category="counter" file="core-con.mkiv"> + <cd:command name="spanishnumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishNumerals" category="counter" file="core-con.mkiv"> + <cd:command name="spanishNumerals" level="style" category="counter language" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="unihex" category="counter" file="core-con.mkiv"> + <cd:command name="unihex" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="continuednumber" category="counter" file="core-con.mkiv"> + <cd:command name="continuednumber" level="style" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml index 124638026..70527123f 100644 --- a/tex/context/interface/mkiv/i-counter.xml +++ b/tex/context/interface/mkiv/i-counter.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="definecounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="setupcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifelsecounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -119,7 +119,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounterelse" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -127,21 +127,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifnotcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="setcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="setcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcounterown" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="setcounterown" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="restartcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="restartcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> @@ -165,165 +165,165 @@ </cd:arguments> </cd:command> - <cd:command name="resetcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="resetcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="incrementcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="incrementcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="decrementcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="decrementcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="rawcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="rawcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="lastcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="lastcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="firstcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="firstcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="nextcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="nextcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="prevcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="prevcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="countersubs" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="countersubs" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="savecounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="savecounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="restorecounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="showcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="incrementedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="incrementedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="decrementedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="rawcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="lastcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="lastcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="firstcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="firstcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="nextcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="prevcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="prevcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="rawsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="lastsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="lastsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="firstsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="firstsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="nextsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="nextsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="prevsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="prevsubcountervalue" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="convertedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="convertedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertedsubcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="convertedsubcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -344,7 +344,7 @@ </cd:arguments> </cd:command> - <cd:command name="directconvertedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="directconvertedcounter" level="system" category="counter" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedefinedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifelsedefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -368,7 +368,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounterelse" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounterelse" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -376,21 +376,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifundefinedcounter" category="counter" level="system" file="strc-num.mkiv"> + <cd:command name="doifundefinedcounter" level="system" category="counter conditional" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="defineresetset" category="counter" file="strc-ini.mkvi"> + <cd:command name="defineresetset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -403,7 +403,7 @@ <!-- - <cd:command name="definestructureresetset" file="strc-ini.mkvi"> + <cd:command name="definestructureresetset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -433,7 +433,7 @@ <!-- - <cd:command name="definestructureseparatorset" file="strc-ini.mkvi"> + <cd:command name="definestructureseparatorset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -450,7 +450,7 @@ --> - <cd:command name="defineconversionset" category="counter" file="strc-ini.mkvi"> + <cd:command name="defineconversionset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -469,7 +469,7 @@ <!-- - <cd:command name="definestructureconversionset" file="strc-ini.mkvi"> + <cd:command name="definestructureconversionset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -488,7 +488,7 @@ --> - <cd:command name="defineprefixset" category="counter" file="strc-ini.mkvi"> + <cd:command name="defineprefixset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -501,7 +501,7 @@ <!-- - <cd:command name="definestructureprefixset" file="strc-ini.mkvi"> + <cd:command name="definestructureprefixset" level="style" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -514,4 +514,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-database.xml b/tex/context/interface/mkiv/i-database.xml index 0eb961a87..a81cd75f8 100644 --- a/tex/context/interface/mkiv/i-database.xml +++ b/tex/context/interface/mkiv/i-database.xml @@ -64,14 +64,14 @@ </cd:arguments> </cd:command> - <cd:command name="processdatabasebuffer" file="m-database.mkiv"> + <cd:command name="processdatabasebuffer" level="document" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="processdatabasefile" file="m-database.mkiv"> + <cd:command name="processdatabasefile" level="document" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -87,20 +87,20 @@ </cd:arguments> </cd:command> - <cd:command name="processseparatedlist" file="m-database.mkiv"> + <cd:command name="processseparatedlist" level="document" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" file="m-database.mkiv"> + <cd:command name="separatedlist" type="environment" generated="yes" variant="instance" level="document" file="m-database.mkiv"> <cd:sequence> <cd:instance value="separatedlist"/> </cd:sequence> </cd:command> - <cd:command name="separatedlist" type="environment" file="m-database.mkiv"> + <cd:command name="separatedlist" type="environment" level="document" file="m-database.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-dataset.xml b/tex/context/interface/mkiv/i-dataset.xml index afb8f8fa3..c006454d3 100644 --- a/tex/context/interface/mkiv/i-dataset.xml +++ b/tex/context/interface/mkiv/i-dataset.xml @@ -48,4 +48,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-define.xml b/tex/context/interface/mkiv/i-define.xml index f37645cf1..91975e752 100644 --- a/tex/context/interface/mkiv/i-define.xml +++ b/tex/context/interface/mkiv/i-define.xml @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml index e64693210..5017aa02b 100644 --- a/tex/context/interface/mkiv/i-delimitedtext.xml +++ b/tex/context/interface/mkiv/i-delimitedtext.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedelimitedtext" category="language" level="style" file="typo-del.mkiv"> + <cd:command name="definedelimitedtext" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupdelimitedtext" category="language" level="style" file="typo-del.mkiv"> + <cd:command name="setupdelimitedtext" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimitedtext" generated="yes" variant="instance" level="document" category="language" file="typo-del.mkiv"> <cd:sequence> <cd:instance value="delimitedtext"/> </cd:sequence> @@ -103,7 +103,7 @@ </cd:instances> </cd:command> - <cd:command name="delimitedtext" type="environment" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" generated="yes" variant="instance" level="document" category="language" file="typo-del.mkiv"> <cd:sequence> <cd:instance value="delimitedtext"/> </cd:sequence> @@ -118,7 +118,7 @@ </cd:instances> </cd:command> - <cd:command name="delimitedtext" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimitedtext" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -126,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" type="environment" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -136,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimited" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -144,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" type="environment" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="delimited" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -156,14 +156,14 @@ <!-- - <cd:command name="quotation" file="typo-del.mkiv"> + <cd:command name="quotation" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="quotation" type="environment" file="typo-del.mkiv"> + <cd:command name="quotation" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:keywords list="yes" optional="yes"> @@ -172,27 +172,27 @@ </cd:arguments> </cd:command> - <cd:command name="quote" file="typo-del.mkiv"> + <cd:command name="quote" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="quote" type="environment" file="typo-del.mkiv"> + <cd:command name="quote" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> </cd:arguments> </cd:command> - <cd:command name="blockquote" file="typo-del.mkiv"> + <cd:command name="blockquote" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="blockquote" type="environment" file="typo-del.mkiv"> + <cd:command name="blockquote" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:keywords list="yes" optional="yes"> @@ -201,14 +201,14 @@ </cd:arguments> </cd:command> - <cd:command name="speech" file="typo-del.mkiv"> + <cd:command name="speech" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="aside" type="environment" file="typo-del.mkiv"> + <cd:command name="aside" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:keywords list="yes" optional="yes"> @@ -217,14 +217,14 @@ </cd:arguments> </cd:command> - <cd:command name="aside" file="typo-del.mkiv"> + <cd:command name="aside" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="speech" type="environment" file="typo-del.mkiv"> + <cd:command name="speech" type="environment" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="startnarrower"/> @@ -234,7 +234,7 @@ --> - <cd:command name="setupquotation" category="language" level="style" file="typo-del.mkiv"> + <cd:command name="setupquotation" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> @@ -242,7 +242,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupquote" category="language" level="style" file="typo-del.mkiv"> + <cd:command name="setupquote" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> @@ -250,12 +250,12 @@ </cd:arguments> </cd:command> - <cd:command name="subsentence" category="language" level="document" file="typo-del.mkiv"> + <cd:command name="subsentence" level="document" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="subsentence" type="environment" category="language" level="document" file="typo-del.mkiv"/> + <cd:command name="subsentence" type="environment" level="document" category="language" file="typo-del.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index 66da76acc..f2cf33e82 100644 --- a/tex/context/interface/mkiv/i-description.xml +++ b/tex/context/interface/mkiv/i-description.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedescription" level="style" file="strc-des.mkvi"> + <cd:command name="definedescription" level="style" category="structure" file="strc-des.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupdescription" level="style" file="strc-des.mkvi"> + <cd:command name="setupdescription" level="style" category="structure" file="strc-des.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -136,7 +136,7 @@ <!-- - <cd:command name="setupdescriptions" file="strc-des.mkvi"> + <cd:command name="setupdescriptions" level="style" category="structure" file="strc-des.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -147,7 +147,7 @@ --> - <cd:command name="description" type="environment" generated="yes" variant="example" level="document" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" type="environment" generated="yes" variant="example:title" level="document" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example:title" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -166,7 +166,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" generated="yes" variant="example" level="document" file="strc-des.mkvi"> + <cd:command name="description" generated="yes" variant="example" level="document" category="structure" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -178,4 +178,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-digits.xml b/tex/context/interface/mkiv/i-digits.xml index d9a4b9d2d..c917bf0d4 100644 --- a/tex/context/interface/mkiv/i-digits.xml +++ b/tex/context/interface/mkiv/i-digits.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setdigitsmanipulation" file="typo-dig.mkiv"> + <cd:command name="setdigitsmanipulation" level="system" file="typo-dig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13,14 +13,14 @@ </cd:arguments> </cd:command> - <cd:command name="resetdigitsmanipulation" file="typo-dig.mkiv"/> + <cd:command name="resetdigitsmanipulation" level="system" file="typo-dig.mkiv"/> - <cd:command name="equaldigits" file="typo-dig.mkiv"> + <cd:command name="equaldigits" level="document" file="typo-dig.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dummydigit" file="typo-dig.mkiv"/> + <cd:command name="dummydigit" level="document" file="typo-dig.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dimension.xml b/tex/context/interface/mkiv/i-dimension.xml index bb7c3bfa7..1980687ab 100644 --- a/tex/context/interface/mkiv/i-dimension.xml +++ b/tex/context/interface/mkiv/i-dimension.xml @@ -64,4 +64,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml index c8017d25f..3b2d937a4 100644 --- a/tex/context/interface/mkiv/i-direction.xml +++ b/tex/context/interface/mkiv/i-direction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupdirections" level="style" file="typo-dir.mkiv"> + <cd:command name="setupdirections" level="style" category="language alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -30,29 +30,29 @@ </cd:arguments> </cd:command> - <cd:command name="setdirection" file="typo-dir.mkiv"> + <cd:command name="setdirection" level="style" category="language alignment" file="typo-dir.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetdirection" file="typo-dir.mkiv"/> + <cd:command name="resetdirection" level="style" category="language alignment" file="typo-dir.mkiv"/> <!-- - <cd:command name="lefttorightmark" file="typo-dir.mkiv"/> + <cd:command name="lefttorightmark" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="righttoleftmark" file="typo-dir.mkiv"/> + <cd:command name="righttoleftmark" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="lrm" file="typo-dir.mkiv"/> + <cd:command name="lrm" level="system" category="language alignment" file="typo-dir.mkiv"/> - <cd:command name="rlm" file="typo-dir.mkiv"/> + <cd:command name="rlm" level="system" category="language alignment" file="typo-dir.mkiv"/> --> - <cd:command name="showdirsinmargin" file="supp-dir.mkiv"/> + <cd:command name="showdirsinmargin" level="document" category="alignment" file="supp-dir.mkiv"/> - <cd:command name="istltdir" level="system" file="supp-dir.mkiv"> + <cd:command name="istltdir" level="system" category="alignment" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -61,7 +61,7 @@ </cd:arguments> </cd:command> - <cd:command name="istrtdir" level="system" file="supp-dir.mkiv"> + <cd:command name="istrtdir" level="system" category="alignment" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -70,4 +70,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml index d80683244..fcd9e040b 100644 --- a/tex/context/interface/mkiv/i-document.xml +++ b/tex/context/interface/mkiv/i-document.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="text" type="environment" level="document" file="file-job.mkvi"/> + <cd:command name="text" type="environment" level="document" category="structure" file="file-job.mkvi"/> - <cd:command name="text" type="environment" begin="autostart" end="autostop" file="file-job.mkvi"/> + <cd:command name="text" type="environment" begin="autostart" end="autostop" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="notext" type="environment" level="system" file="file-job.mkvi"/> + <cd:command name="notext" type="environment" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="environment" type="environment" level="document" file="file-job.mkvi"> + <cd:command name="environment" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="environment" type="environment" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="environment" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -28,27 +28,27 @@ </cd:arguments> </cd:command> - <cd:command name="environment" level="document" file="file-job.mkvi"> + <cd:command name="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="environment" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useenvironment" file="file-job.mkvi"> + <cd:command name="useenvironment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentenvironment" level="system" file="file-job.mkvi"/> + <cd:command name="currentenvironment" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="project" type="environment" level="document" file="file-job.mkvi"> + <cd:command name="project" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -57,7 +57,7 @@ </cd:arguments> </cd:command> - <cd:command name="project" type="environment" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="project" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -66,27 +66,27 @@ </cd:arguments> </cd:command> - <cd:command name="project" level="document" file="file-job.mkvi"> + <cd:command name="project" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="project" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="project" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useproject" file="file-job.mkvi"> + <cd:command name="useproject" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentproject" level="system" file="file-job.mkvi"/> + <cd:command name="currentproject" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="product" type="environment" level="document" file="file-job.mkvi"> + <cd:command name="product" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="product" type="environment" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="product" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -104,27 +104,27 @@ </cd:arguments> </cd:command> - <cd:command name="product" level="document" file="file-job.mkvi"> + <cd:command name="product" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="product" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="product" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useproduct" file="file-job.mkvi"> + <cd:command name="useproduct" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentproduct" level="system" file="file-job.mkvi"/> + <cd:command name="currentproduct" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="component" type="environment" level="document" file="file-job.mkvi"> + <cd:command name="component" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="component" type="environment" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="component" type="environment" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -142,27 +142,27 @@ </cd:arguments> </cd:command> - <cd:command name="component" level="document" file="file-job.mkvi"> + <cd:command name="component" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="component" variant="string" level="document" file="file-job.mkvi"> + <cd:command name="component" variant="string" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="usecomponent" file="file-job.mkvi"> + <cd:command name="usecomponent" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="currentcomponent" level="system" file="file-job.mkvi"/> + <cd:command name="currentcomponent" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="document" type="environment" level="document" file="file-job.mkvi"> + <cd:command name="document" type="environment" level="document" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupdocument"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupdocument" level="style" file="file-job.mkvi"> + <cd:command name="setupdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -198,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="presetdocument" file="file-job.mkvi"> + <cd:command name="presetdocument" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdocument"/> @@ -206,10 +206,16 @@ </cd:arguments> </cd:command> - <cd:command name="documentvariable" file="file-job.mkvi"> + <cd:command name="documentvariable" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="unexpandeddocumentvariable" level="style" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-key"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml index 10c0dbb90..47d005e20 100644 --- a/tex/context/interface/mkiv/i-dummy.xml +++ b/tex/context/interface/mkiv/i-dummy.xml @@ -36,23 +36,23 @@ </cd:arguments> </cd:command> - <cd:command name="usedummystyleandcolor" level="system" file="mult-aux.mkiv"> + <cd:command name="usedummystyleandcolor" level="system" category="fonts colors" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="usedummystyleparameter" level="system" category="fonts" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummycolorparameter" level="system" file="mult-aux.mkiv"> + <cd:command name="usedummycolorparameter" level="system" category="colors" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml index 6720083b2..d20a62cd4 100644 --- a/tex/context/interface/mkiv/i-effect.xml +++ b/tex/context/interface/mkiv/i-effect.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineeffect" level="style" file="attr-eff.mkiv"> + <cd:command name="defineeffect" level="style" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupeffect" level="style" file="attr-eff.mkiv"> + <cd:command name="setupeffect" level="style" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -40,19 +40,19 @@ </cd:arguments> </cd:command> - <cd:command name="effect" type="environment" level="document" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" level="document" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="effect" type="environment" generated="yes" variant="example" level="document" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" generated="yes" variant="example" level="document" category="pdf" file="attr-eff.mkiv"> <cd:sequence> <cd:variable value="effect"/> </cd:sequence> </cd:command> - <cd:command name="effect" level="document" file="attr-eff.mkiv"> + <cd:command name="effect" level="document" category="pdf" file="attr-eff.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml index 575d192a5..149f4f613 100644 --- a/tex/context/interface/mkiv/i-enumeration.xml +++ b/tex/context/interface/mkiv/i-enumeration.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineenumeration" level="style" file="strc-enu.mkvi"> + <cd:command name="defineenumeration" level="style" category="structure" file="strc-enu.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupenumeration" level="style" file="strc-enu.mkvi"> + <cd:command name="setupenumeration" level="style" category="structure" file="strc-enu.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -181,7 +181,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupenumerations" level="style" file="strc-enu.mkvi"> + <cd:command name="setupenumerations" level="style" category="structure" file="strc-enu.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -190,7 +190,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example" level="document" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -199,7 +199,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" level="document" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -209,7 +209,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" generated="yes" variant="example" level="document" file="strc-enu.mkvi"> + <cd:command name="enumeration" generated="yes" variant="example" level="document" category="structure" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -221,4 +221,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-export.xml b/tex/context/interface/mkiv/i-export.xml index e3be678c0..3c3afff2b 100644 --- a/tex/context/interface/mkiv/i-export.xml +++ b/tex/context/interface/mkiv/i-export.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setelementexporttag" level="system" file="back-exp.mkiv"> + <cd:command name="setelementexporttag" level="system" category="xml" file="back-exp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupexport" level="style" file="back-exp.mkiv"> + <cd:command name="setupexport" level="style" category="xml" file="back-exp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> @@ -74,4 +74,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml index a3435e8da..7a67786f9 100644 --- a/tex/context/interface/mkiv/i-field.xml +++ b/tex/context/interface/mkiv/i-field.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="presetfieldsymbols" level="system" file="scrn-fld.mkvi"> + <cd:command name="presetfieldsymbols" level="system" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="definefieldcategory" level="style" file="scrn-fld.mkvi"> + <cd:command name="definefieldcategory" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldcategory" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcategory" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefieldcategory" level="system" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldcategory" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -141,7 +141,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffieldcategoryelse" level="system" file="scrn-fld.mkvi"> + <cd:command name="doiffieldcategoryelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefieldbody" level="style" file="scrn-fld.mkvi"> + <cd:command name="definefieldbody" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -159,7 +159,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldbody" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfieldbody" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -171,7 +171,7 @@ </cd:arguments> </cd:command> - <cd:command name="fieldbody" file="scrn-fld.mkvi"> + <cd:command name="fieldbody" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -180,14 +180,14 @@ </cd:arguments> </cd:command> - <cd:command name="definefieldbodyset" file="scrn-fld.mkvi"> + <cd:command name="definefieldbodyset" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefieldbody" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldbody" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -195,7 +195,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffieldbodyelse" file="scrn-fld.mkvi"> + <cd:command name="doiffieldbodyelse" level="system" category="pdf conditional" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefield" file="scrn-fld.mkvi"> + <cd:command name="definefield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -221,7 +221,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesubfield" file="scrn-fld.mkvi"> + <cd:command name="definesubfield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -229,7 +229,7 @@ </cd:arguments> </cd:command> - <cd:command name="clonefield" file="scrn-fld.mkvi"> + <cd:command name="clonefield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -238,14 +238,14 @@ </cd:arguments> </cd:command> - <cd:command name="copyfield" file="scrn-fld.mkvi"> + <cd:command name="copyfield" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="fitfieldframed" file="scrn-fld.mkvi"> + <cd:command name="fitfieldframed" level="document" category="pdf background rules" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -254,7 +254,7 @@ </cd:arguments> </cd:command> - <cd:command name="fitfield" file="scrn-fld.mkvi"> + <cd:command name="fitfield" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldlabelframed" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfieldlabelframed" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -272,7 +272,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldcontentframed" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcontentframed" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -282,7 +282,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldtotalframed" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfieldtotalframed" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -310,7 +310,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfield" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfield" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfields" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupfields" level="style" category="pdf background" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -353,14 +353,14 @@ </cd:arguments> </cd:command> - <cd:command name="field" file="scrn-fld.mkvi"> + <cd:command name="field" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="definefieldstack" level="style" file="scrn-fld.mkvi"> + <cd:command name="definefieldstack" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> @@ -370,7 +370,7 @@ </cd:arguments> </cd:command> - <cd:command name="fieldstack" file="scrn-fld.mkvi"> + <cd:command name="fieldstack" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list-optional"/> @@ -380,4 +380,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-figure.xml b/tex/context/interface/mkiv/i-figure.xml index 92d3a9887..6adf84d2e 100644 --- a/tex/context/interface/mkiv/i-figure.xml +++ b/tex/context/interface/mkiv/i-figure.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="figure" type="environment" category="graphics" file="grph-fig.mkiv"> + <cd:command name="figure" type="environment" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="referring" file="grph-fig.mkiv"> + <cd:command name="referring" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="marking" file="grph-fig.mkiv"> + <cd:command name="marking" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="remark" file="grph-fig.mkiv"> + <cd:command name="remark" level="document" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:position list="yes"/> <cd:position list="yes"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="colorbar" file="grph-fig.mkiv"> + <cd:command name="colorbar" level="document" category="colors" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml index 3db82077c..bf12e5825 100644 --- a/tex/context/interface/mkiv/i-file.xml +++ b/tex/context/interface/mkiv/i-file.xml @@ -4,33 +4,33 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="input" file="file-ini.mkvi"> + <cd:command name="input" level="document" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="input" variant="string" file="file-ini.mkvi"> + <cd:command name="input" variant="string" level="document" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="doiffile" level="system" file="file-ini.mkvi"> + <cd:command name="doiffile" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotfile" level="system" file="file-ini.mkvi"> + <cd:command name="doifnotfile" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefile" level="system" file="file-ini.mkvi"> + <cd:command name="doifelsefile" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffileelse" level="system" file="file-ini.mkvi"> + <cd:command name="doiffileelse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -46,33 +46,33 @@ </cd:arguments> </cd:command> - <cd:command name="jobfilename" file="core-sys.mkiv"/> + <cd:command name="jobfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="jobfilesuffix" file="core-sys.mkiv"/> + <cd:command name="jobfilesuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilebarename" file="core-sys.mkiv"/> + <cd:command name="inputfilebarename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilerealsuffix" file="core-sys.mkiv"/> + <cd:command name="inputfilerealsuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilesuffix" file="core-sys.mkiv"/> + <cd:command name="inputfilesuffix" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="inputfilename" file="core-sys.mkiv"/> + <cd:command name="inputfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="outputfilename" file="core-sys.mkiv"/> + <cd:command name="outputfilename" level="system" category="structure" file="core-sys.mkiv"/> - <cd:command name="readingfile" type="environment" level="system" file="file-ini.mkvi"/> + <cd:command name="readingfile" type="environment" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="endofline" type="environment" begin="push" end="pop" level="system" file="file-ini.mkvi"/> + <cd:command name="endofline" type="environment" begin="push" end="pop" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="restoreendofline" level="system" file="file-ini.mkvi"/> + <cd:command name="restoreendofline" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="inputgivenfile" level="system" file="file-ini.mkvi"> + <cd:command name="inputgivenfile" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="doifelsepath" level="system" file="file-ini.mkvi"> + <cd:command name="doifelsepath" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpathelse" level="system" file="file-ini.mkvi"> + <cd:command name="doifpathelse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefileexists" level="system" file="file-ini.mkvi"> + <cd:command name="doifelsefileexists" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffileexistselse" level="system" file="file-ini.mkvi"> + <cd:command name="doiffileexistselse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepathexists" level="system" file="file-ini.mkvi"> + <cd:command name="doifelsepathexists" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -112,7 +112,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpathexistselse" level="system" file="file-ini.mkvi"> + <cd:command name="doifpathexistselse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-true"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseparentfile" level="system" file="file-ini.mkvi"> + <cd:command name="doifelseparentfile" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -128,7 +128,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifparentfileelse" level="system" file="file-ini.mkvi"> + <cd:command name="doifparentfileelse" level="system" category="structure conditional" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -136,27 +136,27 @@ </cd:arguments> </cd:command> - <cd:command name="splitfilename" level="system" file="file-ini.mkvi"> + <cd:command name="splitfilename" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="splitofffull" level="system" file="file-ini.mkvi"/> + <cd:command name="splitofffull" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffpath" level="system" file="file-ini.mkvi"/> + <cd:command name="splitoffpath" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffbase" level="system" file="file-ini.mkvi"/> + <cd:command name="splitoffbase" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffname" level="system" file="file-ini.mkvi"/> + <cd:command name="splitoffname" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitofftype" level="system" file="file-ini.mkvi"/> + <cd:command name="splitofftype" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffkind" level="system" file="file-ini.mkvi"/> + <cd:command name="splitoffkind" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="splitoffroot" level="system" file="file-ini.mkvi"/> + <cd:command name="splitoffroot" level="system" category="structure" file="file-ini.mkvi"/> - <cd:command name="doifelseinputfile" level="system" file="file-job.mkvi"> + <cd:command name="doifelseinputfile" level="system" category="structure conditional" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -164,7 +164,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinputfileelse" level="system" file="file-job.mkvi"> + <cd:command name="doifinputfileelse" level="system" category="structure conditional" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -172,122 +172,128 @@ </cd:arguments> </cd:command> - <cd:command name="processfile" level="system" file="file-ini.mkvi"> + <cd:command name="processfile" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="usepath" level="style" file="file-job.mkvi"> + <cd:command name="usepath" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> - <cd:command name="usesubpath" level="style" file="file-job.mkvi"> + <cd:command name="usesubpath" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> - <cd:command name="path" type="environment" begin="push" end="pop" file="file-job.mkvi"> + <cd:command name="path" type="environment" begin="push" end="pop" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path"/> </cd:arguments> </cd:command> - <cd:command name="resetpath" file="file-job.mkvi"/> + <cd:command name="resetpath" level="style" category="structure" file="file-job.mkvi"/> - <cd:command name="allinputpaths" file="file-job.mkvi"/> + <cd:command name="allinputpaths" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="locatefilepath" file="file-ini.mkvi"> + <cd:command name="locatefilepath" level="system" category="structure" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="locatedfilepath" level="system" file="file-job.mkvi"/> + <cd:command name="locatedfilepath" level="system" category="structure" file="file-job.mkvi"/> - <cd:command name="usezipfile" level="style" file="file-job.mkvi"> + <cd:command name="usezipfile" level="style" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-file-optional"/> </cd:arguments> </cd:command> - <cd:command name="processfilemany" level="system" file="file-job.mkvi"> + <cd:command name="processfilemany" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfileonce" level="system" file="file-job.mkvi"> + <cd:command name="processfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfilenone" level="system" file="file-job.mkvi"> + <cd:command name="processfilenone" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="loadtexfile" file="file-job.mkvi"> + <cd:command name="loadtexfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadluafile" file="file-job.mkvi"> + <cd:command name="loadluafile" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfile" file="file-job.mkvi"> + <cd:command name="loadcldfile" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadanyfile" level="system" file="file-job.mkvi"> + <cd:command name="loadanyfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadtexfileonce" level="system" file="file-job.mkvi"> + <cd:command name="loadtexfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadluafileonce" level="system" file="file-job.mkvi"> + <cd:command name="loadluafileonce" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfileonce" level="system" file="file-job.mkvi"> + <cd:command name="loadcldfileonce" level="system" category="structure lua" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadanyfileonce" level="system" file="file-job.mkvi"> + <cd:command name="loadanyfileonce" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="continueifinputfile" level="system" file="file-job.mkvi"> + <cd:command name="continueifinputfile" level="system" category="structure" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readjobfile" level="system" file="file-res.mkvi"> + <cd:command name="samplefile" level="document" category="structure" file="file-job.mkvi"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="readjobfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -295,7 +301,7 @@ </cd:arguments> </cd:command> - <cd:command name="readlocfile" level="system" file="file-res.mkvi"> + <cd:command name="readlocfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -303,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsysfile" level="system" file="file-res.mkvi"> + <cd:command name="readsysfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -311,7 +317,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfixfile" level="system" file="file-res.mkvi"> + <cd:command name="readfixfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -320,7 +326,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsetfile" level="system" file="file-res.mkvi"> + <cd:command name="readsetfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -329,7 +335,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfile" level="system" file="file-res.mkvi"> + <cd:command name="readfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -337,13 +343,13 @@ </cd:arguments> </cd:command> - <cd:command name="ReadFile" level="system" file="file-res.mkvi"> + <cd:command name="ReadFile" level="system" category="structure" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readtexfile" level="system" file="file-res.mkvi"> + <cd:command name="readtexfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -351,7 +357,7 @@ </cd:arguments> </cd:command> - <cd:command name="readxmlfile" level="system" file="file-res.mkvi"> + <cd:command name="readxmlfile" level="system" category="structure conditional xml" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -359,7 +365,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocfile" level="system" file="file-res.mkvi"> + <cd:command name="doifelselocfile" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -367,7 +373,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflocfileelse" level="system" file="file-res.mkvi"> + <cd:command name="doiflocfileelse" level="system" category="structure conditional" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -375,30 +381,30 @@ </cd:arguments> </cd:command> - <cd:command name="locfilename" level="system" file="file-res.mkvi"> + <cd:command name="locfilename" level="system" category="structure" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilesynonym" level="system" file="file-sys.mkvi"> + <cd:command name="definefilesynonym" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilefallback" level="system" file="file-sys.mkvi"> + <cd:command name="definefilefallback" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file-list"/> </cd:arguments> </cd:command> - <cd:command name="truefilename" level="system" file="file-sys.mkvi"> + <cd:command name="truefilename" level="system" category="structure" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml index 9be6ce275..69cc37fca 100644 --- a/tex/context/interface/mkiv/i-filler.xml +++ b/tex/context/interface/mkiv/i-filler.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefiller" level="style" file="spac-flr.mkiv"> + <cd:command name="definefiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfiller" level="style" file="spac-flr.mkiv"> + <cd:command name="setupfiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ <!-- - <cd:command name="setupfillers" file="spac-flr.mkiv"> + <cd:command name="setupfillers" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -86,7 +86,7 @@ --> - <cd:command name="filler" file="spac-flr.mkiv"> + <cd:command name="filler" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkedfiller" file="spac-flr.mkiv"> + <cd:command name="checkedfiller" level="style" category="rules" file="spac-flr.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="sym"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelinefiller" level="style" file="node-rul.mkiv"> + <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefiller" level="style" file="node-rul.mkiv"> + <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -177,7 +177,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefillers" level="style" file="node-rul.mkiv"> + <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -186,7 +186,7 @@ </cd:arguments> </cd:command> - <cd:command name="linefiller" type="environment" file="node-rul.mkiv"> + <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> @@ -198,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlinefiller" file="node-rul.mkiv"> + <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="filler"/> diff --git a/tex/context/interface/mkiv/i-fillinline.xml b/tex/context/interface/mkiv/i-fillinline.xml index 7f75d6ee1..eb2f9d6ae 100644 --- a/tex/context/interface/mkiv/i-fillinline.xml +++ b/tex/context/interface/mkiv/i-fillinline.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupfillinlines" level="style" file="pack-mrl.mkiv"> + <cd:command name="setupfillinlines" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillinline" level="document" file="pack-mrl.mkiv"> + <cd:command name="fillinline" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> @@ -40,4 +40,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fillinrule.xml b/tex/context/interface/mkiv/i-fillinrule.xml index 84d8f8f3d..d73b70ff9 100644 --- a/tex/context/interface/mkiv/i-fillinrule.xml +++ b/tex/context/interface/mkiv/i-fillinrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupfillinrules" level="style" file="pack-mrl.mkiv"> + <cd:command name="setupfillinrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillinrules" level="document" file="pack-mrl.mkiv"> + <cd:command name="fillinrules" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="fillintext" level="document" file="pack-mrl.mkiv"> + <cd:command name="fillintext" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -63,4 +63,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml index 1a530d152..b22035651 100644 --- a/tex/context/interface/mkiv/i-firstline.xml +++ b/tex/context/interface/mkiv/i-firstline.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefirstline" level="style" file="typo-fln.mkiv"> + <cd:command name="definefirstline" level="style" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfirstline" level="style" file="typo-fln.mkiv"> + <cd:command name="setupfirstline" level="style" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,17 +36,17 @@ </cd:arguments> </cd:command> - <cd:command name="setfirstline" file="typo-fln.mkiv"> + <cd:command name="setfirstline" level="document" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="applytofirstcharacter" level="system" file="typo-fln.mkiv"> + <cd:command name="applytofirstcharacter" level="system" category="fonts colors" file="typo-fln.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 05e24af7a..4398625c3 100644 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ b/tex/context/interface/mkiv/i-fittingpage.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefittingpage" level="style" file="page-app.mkiv"> + <cd:command name="definefittingpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfittingpage" level="style" file="page-app.mkiv"> + <cd:command name="setupfittingpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" level="document" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" category="background layout" file="page-app.mkiv"> <cd:sequence> <cd:instance value="fittingpage"/> </cd:sequence> @@ -66,7 +66,7 @@ <!-- - <cd:command name="TEXpage" type="environment" file="page-app.mkiv"> + <cd:command name="TEXpage" type="environment" level="document" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfittingpage"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPpage" type="environment" file="meta-fig.mkiv"> + <cd:command name="MPpage" type="environment" level="document" category="background layout metapost" file="meta-fig.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfittingpage"/> @@ -84,7 +84,7 @@ --> - <cd:command name="setupTEXpage" level="style" file="page-app.mkiv"> + <cd:command name="setupTEXpage" level="style" category="background layout" file="page-app.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> @@ -92,7 +92,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPpage" level="style" file="meta-fig.mkiv"> + <cd:command name="setupMPpage" level="style" category="background layout metapost" file="meta-fig.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index 856b41a18..b01c72a87 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefloat" level="style" file="strc-flt.mkvi"> + <cd:command name="definefloat" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:keywords optional="yes"> @@ -20,7 +20,7 @@ </cd:instances> </cd:command> - <cd:command name="definefloat" variant="name" level="style" file="strc-flt.mkvi"> + <cd:command name="definefloat" variant="name" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural-optional"/> @@ -31,7 +31,7 @@ </cd:instances> </cd:command> - <cd:command name="setupfloat" level="style" file="strc-flt.mkvi"> + <cd:command name="setupfloat" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -170,7 +170,6 @@ <cd:constant type="none"/> <cd:inherit name="blank"/> </cd:parameter> - </cd:parameter> <cd:parameter name="sidethreshold"> <cd:constant type="old"/> <cd:constant type="dimension" default="yes"/> <!-- value=".5\strutdp" --> @@ -203,7 +202,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfloats" level="style" file="strc-flt.mkvi"> + <cd:command name="setupfloats" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -214,7 +213,7 @@ <!-- - <cd:command name="definefloatcaption" file="strc-flt.mkvi"> + <cd:command name="definefloatcaption" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -226,7 +225,7 @@ --> - <cd:command name="setupfloatcaption" level="style" file="strc-flt.mkvi"> + <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -338,7 +337,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" level="style" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -347,7 +346,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaptions" level="style" file="strc-flt.mkvi"> + <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -356,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="placefloat" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> + <cd:command name="placefloat" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -372,7 +371,7 @@ </cd:instances> </cd:command> - <cd:command name="placefloat" level="document" file="strc-flt.mkvi"> + <cd:command name="placefloat" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -382,7 +381,7 @@ </cd:arguments> </cd:command> - <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> + <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -396,7 +395,7 @@ </cd:instances> </cd:command> - <cd:command name="placefloat" type="environment" level="document" file="strc-flt.mkvi"> + <cd:command name="placefloat" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="assignment-floatdata-list-optional"/> @@ -404,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> + <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:instance value="float"/> <cd:string value="text"/> @@ -419,7 +418,7 @@ </cd:instances> </cd:command> - <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> + <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="floats"/> @@ -434,7 +433,7 @@ </cd:instances> </cd:command> - <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> + <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" category="structure" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="floats"/> @@ -449,48 +448,48 @@ </cd:instances> </cd:command> - <cd:command name="floatuserdataparameter" level="system" file="strc-flt.mkvi"> + <cd:command name="floatuserdataparameter" level="system" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelserightpagefloat" level="system" file="strc-flt.mkvi"> + <cd:command name="doifelserightpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifrightpagefloatelse" level="system" file="strc-flt.mkvi"> + <cd:command name="doifrightpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpagefloat" level="system" file="strc-flt.mkvi"> + <cd:command name="doifelseoddpagefloat" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpagefloatelse" level="system" file="strc-flt.mkvi"> + <cd:command name="doifoddpagefloatelse" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemainfloatbody" level="system" file="strc-flt.mkvi"> + <cd:command name="doifelsemainfloatbody" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifmainfloatbodyelse" level="system" file="strc-flt.mkvi"> + <cd:command name="doifmainfloatbodyelse" level="system" category="structure conditional" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -499,7 +498,7 @@ <!-- - <cd:command name="placefigure" file="strc-flt.mkvi"> + <cd:command name="placefigure" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -508,14 +507,14 @@ </cd:arguments> </cd:command> - <cd:command name="placefigure" type="environment" file="strc-flt.mkvi"> + <cd:command name="placefigure" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="figuretext" type="environment" file="strc-flt.mkvi"> + <cd:command name="figuretext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -523,7 +522,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistoffigures" file="strc-flt.mkvi"> + <cd:command name="placelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -531,7 +530,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistoffigures" file="strc-flt.mkvi"> + <cd:command name="completelistoffigures" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -539,7 +538,7 @@ </cd:arguments> </cd:command> - <cd:command name="placetable" file="strc-flt.mkvi"> + <cd:command name="placetable" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -548,14 +547,14 @@ </cd:arguments> </cd:command> - <cd:command name="placetable" type="environment" file="strc-flt.mkvi"> + <cd:command name="placetable" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabletext" type="environment" file="strc-flt.mkvi"> + <cd:command name="tabletext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -563,7 +562,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistoftables" file="strc-flt.mkvi"> + <cd:command name="placelistoftables" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -571,7 +570,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistoftables" file="strc-flt.mkvi"> + <cd:command name="completelistoftables" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -579,7 +578,7 @@ </cd:arguments> </cd:command> - <cd:command name="placegraphic" file="strc-flt.mkvi"> + <cd:command name="placegraphic" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -588,14 +587,14 @@ </cd:arguments> </cd:command> - <cd:command name="placegraphic" type="environment" file="strc-flt.mkvi"> + <cd:command name="placegraphic" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="graphictext" type="environment" file="strc-flt.mkvi"> + <cd:command name="graphictext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -603,7 +602,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofgraphics" file="strc-flt.mkvi"> + <cd:command name="placelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -611,7 +610,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofgraphics" file="strc-flt.mkvi"> + <cd:command name="completelistofgraphics" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -619,7 +618,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeintermezzo" file="strc-flt.mkvi"> + <cd:command name="placeintermezzo" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -628,14 +627,14 @@ </cd:arguments> </cd:command> - <cd:command name="placeintermezzo" type="environment" file="strc-flt.mkvi"> + <cd:command name="placeintermezzo" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="intermezzotext" type="environment" file="strc-flt.mkvi"> + <cd:command name="intermezzotext" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -643,7 +642,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofintermezzi" file="strc-flt.mkvi"> + <cd:command name="placelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -651,7 +650,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofintermezzi" file="strc-flt.mkvi"> + <cd:command name="completelistofintermezzi" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -659,7 +658,7 @@ </cd:arguments> </cd:command> - <cd:command name="placechemical" file="strc-flt.mkvi"> + <cd:command name="placechemical" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -668,14 +667,14 @@ </cd:arguments> </cd:command> - <cd:command name="placechemical" type="environment" file="strc-flt.mkvi"> + <cd:command name="placechemical" type="environment" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placelistofchemicals" file="strc-flt.mkvi"> + <cd:command name="placelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -683,7 +682,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofchemicals" file="strc-flt.mkvi"> + <cd:command name="completelistofchemicals" level="document" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -693,7 +692,7 @@ --> - <cd:command name="setuplocalfloats" level="style" file="strc-flt.mkvi"> + <cd:command name="setuplocalfloats" level="style" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -709,25 +708,25 @@ </cd:arguments> </cd:command> - <cd:command name="noflocalfloats" file="strc-flt.mkvi"/> + <cd:command name="noflocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="resetlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="resetlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="somelocalfloat" file="strc-flt.mkvi"/> + <cd:command name="somelocalfloat" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="getlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="getlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="flushlocalfloats" file="strc-flt.mkvi"/> + <cd:command name="flushlocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="getlocalfloat" file="strc-flt.mkvi"> + <cd:command name="getlocalfloat" level="system" category="structure" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="forcelocalfloats" file="strc-flt.mkvi"/> + <cd:command name="forcelocalfloats" level="system" category="structure" file="strc-flt.mkvi"/> - <cd:command name="setupfloatsplitting" level="style" file="tabl-tsp.mkiv"> + <cd:command name="setupfloatsplitting" level="style" category="structure counter" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -750,7 +749,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitfloat" level="system" file="tabl-tsp.mkiv"> + <cd:command name="splitfloat" level="system" category="structure" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloatsplitting"/> @@ -760,20 +759,20 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinsidesplitfloat" level="system" file="tabl-tsp.mkiv"> + <cd:command name="doifnotinsidesplitfloat" level="system" category="structure conditional" file="tabl-tsp.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="placenamedfloat" level="document" file="page-flt.mkiv"> + <cd:command name="placenamedfloat" level="document" category="structure" file="page-flt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="placefloatwithsetups" file="page-flt.mkiv"> + <cd:command name="placefloatwithsetups" level="document" category="structure" file="page-flt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -783,4 +782,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fontfamily.xml b/tex/context/interface/mkiv/i-fontfamily.xml index 59aafb519..e20346319 100644 --- a/tex/context/interface/mkiv/i-fontfamily.xml +++ b/tex/context/interface/mkiv/i-fontfamily.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefontfamily" category="fonts" level="style" file="font-sel.mkvi"> + <cd:command name="definefontfamily" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamily" variant="preset" category="fonts" level="style" file="font-sel.mkvi"> + <cd:command name="definefontfamily" variant="preset" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefallbackfamily" category="fonts" level="style" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -177,7 +177,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefallbackfamily" variant="preset" category="fonts" level="style" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" variant="preset" level="style" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -206,7 +206,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamilypreset" category="fonts" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" level="system" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -215,11 +215,11 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamilypreset" variant="name" category="fonts" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" variant="name" level="system" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index 02da28a93..ea9711787 100644 --- a/tex/context/interface/mkiv/i-fonts.xml +++ b/tex/context/interface/mkiv/i-fonts.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefontfallback" category="fonts" level="style" file="font-col.mkvi"> + <cd:command name="definefontfallback" level="style" category="fonts" file="font-col.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -38,70 +38,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetfontfallback" category="fonts" file="font-col.mkvi"> + <cd:command name="resetfontfallback" level="style" category="fonts" file="font-col.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="emphasistypeface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="emphasistypeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="emphasisboldface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="emphasisboldface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normalitalicface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="normalboldface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normalslantedface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="normalitalicface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normalboldface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="normalslantedface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normaltypeface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="normaltypeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swaptypeface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="swaptypeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="typeface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="typeface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="boldface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="boldface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="italicface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="italicface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="slantedface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="slantedface" level="document" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swapface" category="fonts" file="font-emp.mkvi"/> + <cd:command name="swapface" level="document" category="fonts" file="font-emp.mkvi"/> + + <cd:command name="em" level="document" category="fonts" file="font-emp.mkvi"/> <!-- - <cd:command name="emphbf" file="font-emp.mkvi"> + <cd:command name="emphbf" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphit" file="font-emp.mkvi"> + <cd:command name="emphit" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphsl" file="font-emp.mkvi"> + <cd:command name="emphsl" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphtf" file="font-emp.mkvi"> + <cd:command name="emphtf" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emph" file="font-emp.mkvi"> + <cd:command name="emph" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="emphasized" file="font-emp.mkvi"> + <cd:command name="emphasized" level="document" category="fonts" file="font-emp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> @@ -109,7 +111,7 @@ --> - <cd:command name="definefontfeature" category="fonts" level="style" file="font-fea.mkvi"> + <cd:command name="definefontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -201,6 +203,10 @@ <cd:parameter name="boundingbox"> <cd:constant type="yes"/> <cd:constant type="no"/> + <cd:constant type="background"/> + <cd:constant type="frame"/> + <cd:constant type="empty"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="compose"> <cd:constant type="yes"/> @@ -289,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="adaptfontfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="adaptfontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <!-- pattern --> <cd:assignments list="yes"> @@ -298,72 +304,72 @@ </cd:arguments> </cd:command> - <cd:command name="fontfeaturelist" category="fonts" file="font-fea.mkvi"> + <cd:command name="fontfeaturelist" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="addfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="addfeature" category="fonts" level="style" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="addfeature" variant="direct" category="fonts" file="font-fea.mkvi"> + <cd:command name="addfeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="subtractfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" variant="direct" category="fonts" file="font-fea.mkvi"> + <cd:command name="subtractfeature" variant="direct" clevel="style" ategory="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="replacefeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" variant="direct" category="fonts" file="font-fea.mkvi"> + <cd:command name="replacefeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" variant="direct" category="fonts" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" variant="direct" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfeature" category="fonts" file="font-fea.mkvi"/> + <cd:command name="resetfeature" level="style" category="fonts" file="font-fea.mkvi"/> - <cd:command name="revivefeature" category="fonts" file="font-fea.mkvi"/> + <cd:command name="revivefeature" level="style" category="fonts" file="font-fea.mkvi"/> - <cd:command name="setfontfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="setfontfeature" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="feature" category="fonts" file="font-fea.mkvi"> + <cd:command name="feature" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -380,11 +386,11 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="feature" variant="direct" category="fonts" file="font-fea.mkvi"> + <cd:command name="feature" variant="direct" level="document" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -401,11 +407,11 @@ <cd:constant type="old"/> <cd:constant type="local"/> </cd:keywords> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentfonthasfeature" category="fonts" level="system" file="font-fea.mkvi"> + <cd:command name="doifelsecurrentfonthasfeature" level="system" category="fonts conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -413,7 +419,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcurrentfonthasfeatureelse" category="fonts" level="system" file="font-fea.mkvi"> + <cd:command name="doifcurrentfonthasfeatureelse" level="system" category="fonts conditional" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -421,31 +427,31 @@ </cd:arguments> </cd:command> - <cd:command name="doaddfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="doaddfeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="dosubtractfeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="dosubtractfeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doreplacefeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="doreplacefeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doresetandafffeature" category="fonts" file="font-fea.mkvi"> + <cd:command name="doresetandafffeature" level="system" category="fonts" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="fontclass" type="environment" category="fonts" file="font-fil.mkvi"> + <cd:command name="fontclass" type="environment" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -454,14 +460,14 @@ </cd:arguments> </cd:command> - <cd:command name="classfont" category="fonts" file="font-fil.mkvi"> + <cd:command name="classfont" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="definefontsynonym" category="fonts" level="style" file="font-fil.mkvi"> + <cd:command name="definefontsynonym" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -483,7 +489,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfile" category="fonts" file="font-fil.mkvi"> + <cd:command name="definefontfile" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -505,20 +511,20 @@ </cd:arguments> </cd:command> - <cd:command name="truefontname" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="truefontname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="expandfontsynonym" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="expandfontsynonym" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontsynonym" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="doifelsefontsynonym" level="system" category="fonts conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -526,7 +532,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontsynonymelse" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="doiffontsynonymelse" level="system" category="fonts conditional" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -534,87 +540,87 @@ </cd:arguments> </cd:command> - <cd:command name="tracedfontname" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="tracedfontname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="fontclassname" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="fontclassname" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="loadfontgoodies" category="fonts" file="font-gds.mkvi"> + <cd:command name="loadfontgoodies" level="style" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setfontcolorsheme" category="fonts" file="font-gds.mkvi"> + <cd:command name="setfontcolorsheme" level="style" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontcolorsheme" category="fonts" file="font-gds.mkvi"/> + <cd:command name="resetfontcolorsheme" level="style" category="fonts" file="font-gds.mkvi"/> - <cd:command name="definedfont" category="fonts" level="document" file="font-ini.mkvi"> + <cd:command name="definedfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="font" type="environment" category="fonts" level="document" file="font-ini.mkvi"> + <cd:command name="font" type="environment" level="document" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="bodyfontsize" category="fonts" file="font-ini.mkvi"/> + <cd:command name="bodyfontsize" clevel="system" ategory="fonts" file="font-ini.mkvi"/> - <cd:command name="normalizebodyfontsize" category="fonts" level="system" file="font-ini.mkvi"> + <cd:command name="normalizebodyfontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="thenormalizedbodyfontsize" category="fonts" level="system" file="font-ini.mkvi"> + <cd:command name="thenormalizedbodyfontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="mapfontsize" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="mapfontsize" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-dimension"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="definefontstyle" category="fonts" file="font-ini.mkvi"> + <cd:command name="definefontstyle" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefontsize" category="fonts" file="font-ini.mkvi"> + <cd:command name="definefontsize" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefontalternative" category="fonts" file="font-ini.mkvi"> + <cd:command name="definefontalternative" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefont" category="fonts" level="style" file="font-ini.mkvi"> + <cd:command name="definefont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -624,7 +630,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefont" variant="argument" category="fonts" level="style" file="font-ini.mkvi"> + <cd:command name="definefont" variant="argument" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -632,14 +638,14 @@ </cd:arguments> </cd:command> - <cd:command name="definefrozenfont" category="fonts" file="font-ini.mkvi"> + <cd:command name="definefrozenfont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="definebodyfontenvironment" category="fonts" file="font-ini.mkvi"> + <cd:command name="definebodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -708,7 +714,7 @@ <!-- - <cd:command name="setupbodyfontenvironment" file="font-ini.mkvi"> + <cd:command name="setupbodyfontenvironment" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -723,31 +729,31 @@ --> - <cd:command name="processbodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="processbodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="bodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi"/> + <cd:command name="bodyfontenvironmentlist" level="system" category="fonts" file="font-fil.mkvi"/> - <cd:command name="registerfontclass" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="registerfontclass" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setcurrentfontclass" category="fonts" level="system" file="font-fil.mkvi"> + <cd:command name="setcurrentfontclass" level="system" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="tx" category="fonts" level="document" file="font-ini.mkvi"/> + <cd:command name="tx" level="document" category="fonts" file="font-ini.mkvi"/> - <cd:command name="txx" category="fonts" level="document" file="font-ini.mkvi"/> + <cd:command name="txx" level="document" category="fonts" file="font-ini.mkvi"/> - <cd:command name="definebodyfont" category="fonts" level="style" file="font-fil.mkvi"> + <cd:command name="definebodyfont" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -808,7 +814,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebodyfont" variant="argument" category="fonts" level="style" file="font-fil.mkvi"> + <cd:command name="definebodyfont" variant="argument" level="style" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -829,7 +835,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfonts" category="fonts" level="style" file="font-ini.mkiv"> + <cd:command name="setupfonts" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> @@ -840,7 +846,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbodyfont" category="fonts" level="style" file="font-ini.mkiv"> + <cd:command name="setupbodyfont" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:dimension"/> @@ -873,7 +879,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchtobodyfont" category="fonts" level="style" file="font-ini.mkvi"> + <cd:command name="switchtobodyfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -881,7 +887,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastswitchtobodyfont" category="fonts" file="font-ini.mkiv"> + <cd:command name="fastswitchtobodyfont" level="system" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -894,7 +900,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfont" category="fonts" file="font-ini.mkvi"> + <cd:command name="usebodyfont" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -902,31 +908,31 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfontparameter" category="fonts" file="font-ini.mkvi"> + <cd:command name="usebodyfontparameter" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fontchar" category="fonts" file="font-ini.mkvi"> + <cd:command name="fontchar" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fontcharbyindex" category="fonts" file="font-ini.mkvi"> + <cd:command name="fontcharbyindex" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tochar" category="fonts" file="font-ini.mkvi"> + <cd:command name="tochar" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" category="fonts" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" clevel="style" ategory="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -949,13 +955,13 @@ </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" variant="command" category="fonts" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" variant="command" level="style" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definebodyfontswitch" category="fonts" file="font-ini.mkvi"> + <cd:command name="definebodyfontswitch" level="style" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -964,28 +970,28 @@ </cd:arguments> </cd:command> - <cd:command name="setsmallbodyfont" category="fonts" file="font-ini.mkvi"/> + <cd:command name="setsmallbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setbigbodyfont" category="fonts" file="font-ini.mkvi"/> + <cd:command name="setbigbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setmainbodyfont" category="fonts" file="font-ini.mkvi"/> + <cd:command name="setmainbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="restoreglobalbodyfont" category="fonts" file="font-ini.mkvi"/> + <cd:command name="restoreglobalbodyfont" level="style" category="fonts" file="font-ini.mkvi"/> - <cd:command name="predefinefont" category="fonts" file="font-ini.mkvi"> + <cd:command name="predefinefont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="predefinedfont" category="fonts" file="font-ini.mkvi"> + <cd:command name="predefinedfont" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showbodyfont" category="fonts" file="font-run.mkiv"> + <cd:command name="showbodyfont" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -993,7 +999,7 @@ </cd:arguments> </cd:command> - <cd:command name="showbodyfontenvironment" category="fonts" file="font-run.mkiv"> + <cd:command name="showbodyfontenvironment" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -1001,14 +1007,14 @@ </cd:arguments> </cd:command> - <cd:command name="showfont" category="fonts" file="font-run.mkiv"> + <cd:command name="showfont" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-font"/> <cd:resolve name="keyword-number-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="showfontstyle" category="fonts" file="font-run.mkiv"> + <cd:command name="showfontstyle" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -1036,19 +1042,19 @@ </cd:arguments> </cd:command> - <cd:command name="showligature" category="fonts" file="font-run.mkiv"> + <cd:command name="showligature" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showligatures" category="fonts" file="font-run.mkiv"> + <cd:command name="showligatures" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showfontstrip" category="fonts" file="font-run.mkiv"> + <cd:command name="showfontstrip" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -1056,109 +1062,109 @@ </cd:arguments> </cd:command> - <cd:command name="showminimalbaseline" category="fonts" file="font-run.mkiv"/> + <cd:command name="showminimalbaseline" level="document" category="fonts" file="font-run.mkiv"/> - <cd:command name="showkerning" category="fonts" file="font-run.mkiv"> + <cd:command name="showkerning" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showcharratio" category="fonts" file="font-run.mkiv"> + <cd:command name="showcharratio" level="document" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontparameters" category="fonts" file="font-run.mkiv"/> + <cd:command name="showfontparameters" level="document" category="fonts" file="font-run.mkiv"/> - <cd:command name="setsmallcaps" category="fonts" file="font-pre.mkiv"/> + <cd:command name="setsmallcaps" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setoldstyle" category="fonts" file="font-pre.mkiv"/> + <cd:command name="setoldstyle" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="settabular" category="fonts" file="font-pre.mkiv"/> + <cd:command name="settabular" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setsuperiors" category="fonts" file="font-pre.mkiv"/> + <cd:command name="setsuperiors" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="tinyfont" category="fonts" file="font-pre.mkiv"/> + <cd:command name="tinyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofont" category="fonts" file="font-pre.mkiv"/> + <cd:command name="infofont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofontbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="infofontbold" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbodyfont" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallbodyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigbodyfont" category="fonts" file="font-pre.mkiv"/> + <cd:command name="bigbodyfont" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smaller" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smaller" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigger" category="fonts" file="font-pre.mkiv"/> + <cd:command name="bigger" level="style" category="fonts" file="font-pre.mkiv"/> - <cd:command name="normal" category="fonts" file="font-pre.mkiv"/> + <cd:command name="normal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="bold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mono" category="fonts" file="font-pre.mkiv"/> + <cd:command name="mono" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slanted" category="fonts" file="font-pre.mkiv"/> + <cd:command name="slanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italic" category="fonts" file="font-pre.mkiv"/> + <cd:command name="italic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="boldslanted" category="fonts" file="font-pre.mkiv"/> + <cd:command name="boldslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slantedbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="slantedbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bolditalic" category="fonts" file="font-pre.mkiv"/> + <cd:command name="bolditalic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italicbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="italicbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="small" category="fonts" file="font-pre.mkiv"/> + <cd:command name="small" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallnormal" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smalltype" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smalltype" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslanted" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallboldslanted" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallboldslanted" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslantedbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallslantedbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbolditalic" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallbolditalic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallitalicbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="smallitalicbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sans" category="fonts" file="font-pre.mkiv"/> + <cd:command name="sans" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansserif" category="fonts" file="font-pre.mkiv"/> + <cd:command name="sansserif" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="roman" category="fonts" file="font-pre.mkiv"/> + <cd:command name="roman" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serif" category="fonts" file="font-pre.mkiv"/> + <cd:command name="serif" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="regular" category="fonts" file="font-pre.mkiv"/> + <cd:command name="regular" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="handwritten" category="fonts" file="font-pre.mkiv"/> + <cd:command name="handwritten" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="calligraphic" category="fonts" file="font-pre.mkiv"/> + <cd:command name="calligraphic" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansnormal" category="fonts" file="font-pre.mkiv"/> + <cd:command name="sansnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="sansbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifnormal" category="fonts" file="font-pre.mkiv"/> + <cd:command name="serifnormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifbold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="serifbold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mononormal" category="fonts" file="font-pre.mkiv"/> + <cd:command name="mononormal" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/> + <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/> - <cd:command name="definefontsolution" category="fonts" level="style" file="font-sol.mkvi"> + <cd:command name="definefontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1168,7 +1174,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontsolution" category="fonts" level="style" file="font-sol.mkvi"> + <cd:command name="setupfontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1200,7 +1206,7 @@ <!-- - <cd:command name="setupfontsolutions" file="font-sol.mkvi"> + <cd:command name="setupfontsolutions" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1211,21 +1217,21 @@ --> - <cd:command name="setfontsolution" category="fonts" file="font-sol.mkvi"> + <cd:command name="setfontsolution" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontsolution" category="fonts" file="font-sol.mkvi"/> + <cd:command name="resetfontsolution" level="style" category="fonts" file="font-sol.mkvi"/> - <cd:command name="fontsolution" type="environment" category="fonts" file="font-sol.mkvi"> + <cd:command name="fontsolution" type="environment" level="style" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definealternativestyle" category="fonts" level="style" file="font-sty.mkvi"> + <cd:command name="definealternativestyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-command"/> @@ -1233,17 +1239,28 @@ </cd:arguments> </cd:command> - <cd:command name="applyalternativestyle" category="fonts" file="font-sty.mkvi"> + <cd:command name="applyalternativestyle" level="system" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dontconvertfont" category="fonts" file="font-sty.mkvi"/> + <cd:command name="setupalternativestyles" level="style" category="fonts" file="font-sty.mkvi"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="method"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="auto"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="dontconvertfont" level="system" category="fonts" file="font-sty.mkvi"/> - <cd:command name="redoconvertfont" category="fonts" file="font-sty.mkvi"/> + <cd:command name="redoconvertfont" level="system" category="fonts" file="font-sty.mkvi"/> - <cd:command name="definestyle" category="fonts" level="style" file="font-sty.mkvi"> + <cd:command name="definestyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1253,7 +1270,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstyle" category="fonts" level="style" file="font-sty.mkvi"> + <cd:command name="setupstyle" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1270,13 +1287,13 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" type="environment" generated="yes" variant="instance" level="document" category="fonts" file="font-sty.mkvi"> <cd:sequence> <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command name="style" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" generated="yes" variant="instance" level="document" category="fonts" file="font-sty.mkvi"> <cd:sequence> <cd:instance value="style"/> </cd:sequence> @@ -1285,7 +1302,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" variant="argument" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" type="environment" variant="argument" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1294,7 +1311,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" type="environment" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1302,7 +1319,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" variant="argument" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" variant="argument" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1312,7 +1329,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" category="fonts" file="font-sty.mkvi"> + <cd:command name="style" level="document" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1321,7 +1338,7 @@ </cd:arguments> </cd:command> - <cd:command name="definestyleinstance" category="fonts" level="style" file="font-sty.mkvi"> + <cd:command name="definestyleinstance" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -1347,59 +1364,59 @@ </cd:arguments> </cd:command> - <cd:command name="styleinstance" category="fonts" file="font-sty.mkvi"> + <cd:command name="styleinstance" level="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseitalic" category="fonts" file="font-sym.mkvi"> + <cd:command name="doifelseitalic" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifitalicelse" category="fonts" file="font-sym.mkvi"> + <cd:command name="doifitalicelse" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="getprivateslot" category="fonts" file="font-ini.mkvi"> + <cd:command name="getprivateslot" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getprivatechar" category="fonts" file="font-ini.mkvi"> + <cd:command name="getprivatechar" level="system" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="glyphfontfile" category="fonts" file="font-sym.mkvi"> + <cd:command name="glyphfontfile" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="getnamedglyphstyled" category="fonts" file="font-sym.mkvi"> + <cd:command name="getnamedglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getnamedglyphdirect" category="fonts" file="font-sym.mkvi"> + <cd:command name="getnamedglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getglyphstyled" category="fonts" file="font-sym.mkvi"> + <cd:command name="getglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1409,7 +1426,7 @@ </cd:arguments> </cd:command> - <cd:command name="getglyphdirect" category="fonts" file="font-sym.mkvi"> + <cd:command name="getglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1419,27 +1436,27 @@ </cd:arguments> </cd:command> - <cd:command name="resolvedglyphstyled" category="fonts" file="font-sym.mkvi"> + <cd:command name="resolvedglyphstyled" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="resolvedglyphdirect" category="fonts" file="font-sym.mkvi"> + <cd:command name="resolvedglyphdirect" level="style" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="setfont" category="fonts" file="font-sym.mkvi"> + <cd:command name="setfont" level="system" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="string-font"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontchar" category="fonts" file="font-sym.mkvi"> + <cd:command name="doifelsefontchar" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1448,7 +1465,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontcharelse" category="fonts" file="font-sym.mkvi"> + <cd:command name="doiffontcharelse" level="system" category="fonts conditional" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1457,15 +1474,15 @@ </cd:arguments> </cd:command> - <cd:command name="showchardata" category="fonts" file="font-tra.mkiv"> + <cd:command name="showchardata" level="document" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontdata" category="fonts" file="font-tra.mkiv"/> + <cd:command name="showfontdata" level="document" category="fonts" file="font-tra.mkiv"/> - <cd:command name="doifelsefontpresent" category="fonts" file="font-tra.mkiv"> + <cd:command name="doifelsefontpresent" level="system" category="fonts conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1473,7 +1490,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontpresentelse" category="fonts" file="font-tra.mkiv"> + <cd:command name="doiffontpresentelse" level="system" category="fonts conditional" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1481,7 +1498,7 @@ </cd:arguments> </cd:command> - <cd:command name="showotfcomposition" category="fonts" file="font-tra.mkiv"> + <cd:command name="showotfcomposition" level="document" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1495,31 +1512,31 @@ </cd:arguments> </cd:command> - <cd:command name="fontclass" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontclass" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontbody" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontbody" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontstyle" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontstyle" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontalternative" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontalternative" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontsize" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontsize" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontface" category="fonts" file="font-var.mkvi"/> + <cd:command name="fontface" level="system" category="fonts" file="font-var.mkvi"/> - <cd:command name="typescriptone" category="fonts" file="type-ini.mkvi"/> + <cd:command name="typescriptone" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescripttwo" category="fonts" file="type-ini.mkvi"/> + <cd:command name="typescripttwo" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptthree" category="fonts" file="type-ini.mkvi"/> + <cd:command name="typescriptthree" level="system" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptcollection" type="environment" category="fonts" file="type-ini.mkvi"> + <cd:command name="typescriptcollection" type="environment" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usetypescriptfile" category="fonts" level="style" file="type-ini.mkvi"> + <cd:command name="usetypescriptfile" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -1528,7 +1545,7 @@ </cd:arguments> </cd:command> - <cd:command name="usetypescript" category="fonts" level="style" file="type-ini.mkvi"> + <cd:command name="usetypescript" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="serif"/> @@ -1554,22 +1571,22 @@ </cd:arguments> </cd:command> - <cd:command name="loadtypescriptfile" category="fonts" level="style" file="type-ini.mkvi"> + <cd:command name="loadtypescriptfile" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="quittypescriptscanning" category="fonts" file="type-ini.mkvi"/> + <cd:command name="quittypescriptscanning" level="style" category="fonts" file="type-ini.mkvi"/> - <cd:command name="definetypescriptsynonym" category="fonts" file="type-ini.mkvi"> + <cd:command name="definetypescriptsynonym" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="typescript" type="environment" category="fonts" level="style" file="type-ini.mkvi"> + <cd:command name="typescript" type="environment" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="serif"/> @@ -1587,20 +1604,20 @@ </cd:arguments> </cd:command> - <cd:command name="definetypescriptprefix" category="fonts" file="type-ini.mkvi"> + <cd:command name="definetypescriptprefix" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="typescriptprefix" category="fonts" file="type-ini.mkvi"> + <cd:command name="typescriptprefix" level="system" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definetypeface" category="fonts" level="style" file="type-ini.mkvi"> + <cd:command name="definetypeface" level="style" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -1649,7 +1666,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontexpansion" category="fonts" level="style" file="hand-ini.mkiv"> + <cd:command name="setupfontexpansion" level="style" category="fonts" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1672,7 +1689,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontprotrusion" category="fonts" level="style" file="hand-ini.mkiv"> + <cd:command name="setupfontprotrusion" level="style" category="fonts" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1692,10 +1709,10 @@ </cd:arguments> </cd:command> - <cd:command name="blockligatures" category="fonts" level="style" file="font-fea.mkvi"> + <cd:command name="blockligatures" level="style" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-list"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-form.xml b/tex/context/interface/mkiv/i-form.xml index 52246c457..fcb4979d0 100644 --- a/tex/context/interface/mkiv/i-form.xml +++ b/tex/context/interface/mkiv/i-form.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupforms" level="style" file="scrn-fld.mkvi"> + <cd:command name="setupforms" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -20,4 +20,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml index f1b94a0d7..a6208fe4a 100644 --- a/tex/context/interface/mkiv/i-formula.xml +++ b/tex/context/interface/mkiv/i-formula.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineformula" category="mathematics" file="math-for.mkiv"> + <cd:command name="defineformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupformula" category="mathematics" level="style" file="math-for.mkiv"> + <cd:command name="setupformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -31,6 +31,11 @@ <cd:constant type="flushright"/> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="page"/> + </cd:parameter> <cd:parameter name="strut"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> @@ -86,6 +91,10 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </cd:parameter> + <cd:parameter name="hang"> + <cd:constant type="none" default="yes"/> + <cd:constant type="auto"/> + </cd:parameter> <cd:parameter name="expansion"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> @@ -100,16 +109,12 @@ <cd:parameter name="catcodes"> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="split"> - <cd:constant type="yes"/> - <cd:constant type="no" default="yes"/> - </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupformulas" category="mathematics" level="style" file="math-for.mkiv"> + <cd:command name="setupformulas" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -118,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="definesubformula" file="math-for.mkiv"> + <cd:command name="definesubformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -128,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubformula" category="mathematics" level="style" file="math-for.mkiv"> + <cd:command name="setupsubformula" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -139,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubformulas" category="mathematics" level="style" file="math-for.mkiv"> + <cd:command name="setupsubformulas" level="style" category="mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -148,7 +153,7 @@ </cd:arguments> </cd:command> - <cd:command name="formula" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="formula" type="environment" generated="yes" variant="instance" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:sequence> <cd:instance value="formula"/> <cd:string value="formula"/> @@ -161,33 +166,68 @@ </cd:instances> </cd:command> - <cd:command name="formula" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> + <!-- + + <cd:command name="formula" type="environment" generated="yes" variant="instance:assignment" level="document" category="mathematics" file="strc-mat.mkiv"> + <cd:sequence> + <cd:instance value="formula"/> + <cd:string value="formula"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + <cd:instances> + <cd:resolve name="instance-formula"/> + </cd:instances> + </cd:command> + + --> + + <cd:command name="formula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> </cd:command> + <cd:command name="formula" type="environment" variant="assignment" level="document" category="mathematics" file="strc-mat.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="option"> + <cd:resolve name="value-formula"/> + </cd:parameter> + <cd:parameter name="margin"> + <cd:resolve name="value-leftskip"/> + </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="snaptogrid"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <!-- - <cd:command name="spformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="spformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="sdformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="sdformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="mpformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="mpformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="mdformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="mdformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> @@ -195,7 +235,7 @@ --> - <cd:command name="defineformulaalternative" category="mathematics" level="system" file="strc-mat.mkiv"> + <cd:command name="defineformulaalternative" level="system" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-csname"/> @@ -203,41 +243,41 @@ </cd:arguments> </cd:command> - <cd:command name="formula" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="formula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="displaymath" type="environment" category="mathematics" level="system" file="strc-mat.mkiv"/> + <cd:command name="displaymath" type="environment" level="system" category="mathematics" file="strc-mat.mkiv"/> - <cd:command name="formulas" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="formulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subformulas" type="environment" category="mathematics" file="strc-mat.mkiv"> + <cd:command name="subformulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="namedsubformulas" type="environment" category="mathematics" file="strc-mat.mkiv"> + <cd:command name="namedsubformulas" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="placeformula" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="placeformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="title"> @@ -253,31 +293,35 @@ </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" variant="argument" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" variant="argument" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placenamedformula" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="placenamedformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="placesubformula" category="mathematics" level="document" file="strc-mat.mkiv"> + <cd:command name="placesubformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="formulanumber" category="mathematics" file="strc-mat"> + <cd:command name="formulanumber" level="document" category="mathematics" file="strc-mat"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placecurrentformulanumber" category="mathematics" file="strc-mat"/> + <cd:command name="placecurrentformulanumber" level="system" category="mathematics" file="strc-mat"/> + + <cd:command name="alignhere" scope="formula" level="document" category="mathematics" file="strc-mat"/> + + <cd:command name="breakhere" scope="formula" level="document" category="mathematics" file="strc-mat"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml index 18d253784..33252dde2 100644 --- a/tex/context/interface/mkiv/i-fraction.xml +++ b/tex/context/interface/mkiv/i-fraction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathfraction" category="mathematics" level="style" file="math-frc.mkiv"> + <cd:command name="definemathfraction" level="style" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathfraction" category="mathematics" level="style" file="math-frc.mkiv"> + <cd:command name="setupmathfraction" level="style" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -52,15 +52,6 @@ <cd:parameter name="right"> <cd:constant type="cd:number"/> </cd:parameter> - <cd:parameter name="inlinethreshold"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="displaythreshold"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="fences"> - <cd:constant type="cd:string"/> - </cd:parameter> <cd:parameter name="rulethickness"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -72,11 +63,22 @@ <cd:constant type="none" default="yes"/> <cd:constant type="overlay"/> </cd:parameter> + <cd:parameter name="inlinethreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="displaythreshold"> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="fences"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupmathfractions" category="mathematics" level="style" file="math-frc.mkiv"> + <cd:command name="setupmathfractions" level="style" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -85,7 +87,7 @@ </cd:arguments> </cd:command> - <cd:command name="fraction" generated="yes" variant="instance" category="mathematics" level="document" file="math-frc.mkiv"> + <cd:command name="fraction" generated="yes" variant="instance" level="document" category="mathematics" file="math-frc.mkiv"> <cd:sequence> <cd:instance value="fraction"/> </cd:sequence> @@ -100,63 +102,63 @@ <!-- - <cd:command name="frac" file="math-frc.mkiv"> + <cd:command name="frac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="xfrac" file="math-frc.mkiv"> + <cd:command name="xfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="xxfrac" file="math-frc.mkiv"> + <cd:command name="xxfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tfrac" file="math-frc.mkiv"> + <cd:command name="tfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sfrac" file="math-frc.mkiv"> + <cd:command name="sfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="dfrac" file="math-frc.mkiv"> + <cd:command name="dfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="binom" file="math-frc.mkiv"> + <cd:command name="binom" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="dbinom" file="math-frc.mkiv"> + <cd:command name="dbinom" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="tbinom" file="math-frc.mkiv"> + <cd:command name="tbinom" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -165,21 +167,21 @@ --> - <cd:command name="splitfrac" category="mathematics" level="document" file="math-frc.mkiv"> + <cd:command name="splitfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="splitdfrac" category="mathematics" level="document" file="math-frc.mkiv"> + <cd:command name="splitdfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cfrac" category="mathematics" level="document" file="math-frc.mkiv"> + <cd:command name="cfrac" level="document" category="mathematics" file="math-frc.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="l"/> @@ -200,4 +202,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index db01f60cd..a4667dd2e 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/tex/context/interface/mkiv/i-framed.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineframed" level="style" file="pack-rul.mkiv"> + <cd:command name="defineframed" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframed" level="style" file="pack-rul.mkiv"> + <cd:command name="setupframed" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -220,19 +220,19 @@ </cd:arguments> </cd:command> - <cd:command name="frameddimension" file="pack-rul.mkiv"> + <cd:command name="frameddimension" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framedparameter" file="pack-rul.mkiv"> + <cd:command name="framedparameter" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="framed" level="document" file="pack-rul.mkiv"> + <cd:command name="framed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -241,7 +241,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> + <cd:command name="framed" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framed"/> </cd:sequence> @@ -256,7 +256,7 @@ </cd:instances> </cd:command> - <cd:command name="normalframedwithsettings" file="pack-rul.mkiv"> + <cd:command name="normalframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupframed"/> @@ -265,7 +265,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" type="environment" level="document" file="pack-rul.mkiv"> + <cd:command name="framed" type="environment" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -274,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastlocalframed" file="pack-rul.mkiv"> + <cd:command name="fastlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -284,7 +284,7 @@ </cd:arguments> </cd:command> - <cd:command name="localframed" file="pack-rul.mkiv"> + <cd:command name="localframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -294,14 +294,14 @@ </cd:arguments> </cd:command> - <cd:command name="directlocalframed" file="pack-rul.mkiv"> + <cd:command name="directlocalframed" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="localframedwithsettings" file="pack-rul.mkiv"> + <cd:command name="localframedwithsettings" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -311,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeframed" level="document" file="pack-rul.mkiv"> + <cd:command name="placeframed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -321,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="inframed" level="document" file="pack-rul.mkiv"> + <cd:command name="inframed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -332,7 +332,7 @@ <!-- - <cd:command name="unframed" file="pack-rul.mkiv"> + <cd:command name="unframed" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -343,7 +343,7 @@ --> - <cd:command name="definemathframed" level="style" file="pack-rul.mkiv"> + <cd:command name="definemathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -353,7 +353,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathframed" level="style" file="pack-rul.mkiv"> + <cd:command name="setupmathframed" level="style" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -362,7 +362,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathframed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> + <cd:command name="mathframed" generated="yes" variant="instance" level="document" category="background rules mathematics" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="mathframed"/> </cd:sequence> @@ -379,7 +379,7 @@ <!-- - <cd:command name="mframed" file="pack-rul.mkiv"> + <cd:command name="mframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathframed"/> @@ -388,7 +388,7 @@ </cd:arguments> </cd:command> - <cd:command name="inmframed" file="pack-rul.mkiv"> + <cd:command name="inmframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathframed"/> @@ -397,7 +397,7 @@ </cd:arguments> </cd:command> - <cd:command name="mcframed" file="pack-rul.mkiv"> + <cd:command name="mcframed" level="document" category="background rules mathematics" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathframed"/> @@ -408,7 +408,7 @@ --> - <cd:command name="defineformulaframed" level="style" file="math-for.mkiv"> + <cd:command name="defineformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -418,7 +418,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupformulaframed" level="style" file="math-for.mkiv"> + <cd:command name="setupformulaframed" level="style" category="background rules mathematics" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -427,7 +427,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineframedtext" level="style" file="pack-rul.mkiv"> + <cd:command name="defineframedtext" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -437,7 +437,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtext" level="style" file="pack-rul.mkiv"> + <cd:command name="setupframedtext" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -478,7 +478,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtexts" level="style" file="pack-rul.mkiv"> + <cd:command name="setupframedtexts" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -487,7 +487,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedtext" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> + <cd:command name="framedtext" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -502,7 +502,7 @@ </cd:instances> </cd:command> - <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> + <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" category="background rules" file="pack-rul.mkiv"> <cd:sequence> <cd:instance value="framedtext"/> </cd:sequence> @@ -524,7 +524,7 @@ <!-- - <cd:command name="framedtext" file="pack-rul.mkiv"> + <cd:command name="framedtext" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframedtext"/> @@ -533,7 +533,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedtext" type="environment" file="pack-rul.mkiv"> + <cd:command name="framedtext" type="environment" level="document" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -549,7 +549,7 @@ --> - <cd:command name="defineframedcontent" level="style" file="pack-rul.mkiv"> + <cd:command name="defineframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -559,7 +559,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedcontent" level="style" file="pack-rul.mkiv"> + <cd:command name="setupframedcontent" level="style" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -590,7 +590,7 @@ </cd:arguments> </cd:command> - <cd:command name="framedcontent" type="environment" file="pack-rul.mkiv"> + <cd:command name="framedcontent" type="environment" level="system" category="background rules" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -599,32 +599,32 @@ </cd:arguments> </cd:command> - <cd:command name="installleftframerenderer" level="system" file="pack-fen.mkiv"> + <cd:command name="installleftframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installrightframerenderer" level="system" file="pack-fen.mkiv"> + <cd:command name="installrightframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installtopframerenderer" level="system" file="pack-fen.mkiv"> + <cd:command name="installtopframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installbottomframerenderer" level="system" file="pack-fen.mkiv"> + <cd:command name="installbottomframerenderer" level="system" category="background rules" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-framedtable.xml b/tex/context/interface/mkiv/i-framedtable.xml new file mode 100644 index 000000000..51699b5bc --- /dev/null +++ b/tex/context/interface/mkiv/i-framedtable.xml @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="defineframedtable" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="setupframedtable" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupframedtablerow" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupframedtablecolumn" level="style" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="cd:number"/> + <cd:constant type="each"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedtable" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedrow" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="framedcell" type="environment" level="document" category="tables" file="tabl-frm.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index 9d27f154d..d90be9e7b 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineexternalfigure" category="graphics" level="style" file="grph-inc.mkiv"> + <cd:command name="defineexternalfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ <!-- - <cd:command name="defineexternalfigures" file="grph-inc.mkiv"> + <cd:command name="defineexternalfigures" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -28,7 +28,7 @@ --> - <cd:command name="setupexternalfigure" category="graphics" level="style" file="grph-inc.mkvi"> + <cd:command name="setupexternalfigure" level="style" category="graphics" file="grph-inc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -178,9 +178,11 @@ <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="align"> - <cd:inherit name="setupalign"/> - </cd:parameter> + <!-- + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + --> <cd:parameter name="xmax"> <cd:constant type="cd:number"/> </cd:parameter> @@ -240,7 +242,7 @@ <!-- - <cd:command name="setupexternalfigures" file="grph-inc.mkvi"> + <cd:command name="setupexternalfigures" level="style" category="graphics" file="grph-inc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -251,7 +253,7 @@ --> - <cd:command name="useexternalfigure" category="graphics" level="style" file="grph-inc.mkiv"> + <cd:command name="useexternalfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -262,7 +264,7 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigure" category="graphics" level="document" file="grph-inc.mkiv"> + <cd:command name="externalfigure" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -272,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="getfiguredimensions" category="graphics" level="system" file="grph-inc.mkiv"> + <cd:command name="getfiguredimensions" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -281,32 +283,32 @@ </cd:arguments> </cd:command> - <cd:command name="figurewidth" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurewidth" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figureheight" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figureheight" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalwidth" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalwidth" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalheight" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalheight" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefullname" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurefullname" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefilename" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurefilename" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefilepath" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurefilepath" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="figurefiletype" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="figurefiletype" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="noffigurepages" category="graphics" level="system" file="grph-inc.mkiv"/> + <cd:command name="noffigurepages" level="system" category="graphics" file="grph-inc.mkiv"/> - <cd:command name="definegraphictypesynonym" category="graphics" level="system" file="grph-inc.mkiv"> + <cd:command name="definegraphictypesynonym" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefigure" category="graphics" level="system" file="grph-inc.mkiv"> + <cd:command name="doifelsefigure" level="system" category="graphics conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -314,7 +316,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffigureelse" category="graphics" level="system" file="grph-inc.mkiv"> + <cd:command name="doiffigureelse" level="system" category="graphics conditional" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -322,7 +324,7 @@ </cd:arguments> </cd:command> - <cd:command name="registerexternalfigure" category="graphics" level="system" file="grph-inc.mkiv"> + <cd:command name="registerexternalfigure" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -332,7 +334,7 @@ </cd:arguments> </cd:command> - <cd:command name="usefigurebase" category="graphics" level="style" file="grph-inc.mkiv"> + <cd:command name="usefigurebase" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -341,81 +343,81 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigurecollection" type="environment" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollection" type="environment" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminwidth" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxwidth" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminheight" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxheight" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionparameter" category="graphics" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionparameter" level="system" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="efcminwidth" category="graphics" file="grph-inc.mkiv"> + <cd:command name="efcminwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxwidth" category="graphics" file="grph-inc.mkiv"> + <cd:command name="efcmaxwidth" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcminheight" category="graphics" file="grph-inc.mkiv"> + <cd:command name="efcminheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxheight" category="graphics" file="grph-inc.mkiv"> + <cd:command name="efcmaxheight" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcparameter" category="graphics" file="grph-inc.mkiv"> + <cd:command name="efcparameter" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="overlayfigure" category="graphics" file="grph-inc.mkiv"> + <cd:command name="overlayfigure" level="style" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="bitmapimage" category="graphics" level="document" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -442,7 +444,7 @@ </cd:arguments> </cd:command> - <cd:command name="bitmapimage" type="environment" category="graphics" level="document" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" type="environment" level="document" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -466,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetbuffer" level="document" file="grph-fig.mkiv"> + <cd:command name="typesetbuffer" level="document" category="graphics buffer" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -478,7 +480,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetypesetting" level="style" file="grph-fig.mkiv"> + <cd:command name="definetypesetting" level="style" category="graphics structure" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> @@ -488,7 +490,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetfile" level="document" file="grph-fig.mkiv"> + <cd:command name="typesetfile" level="document" category="graphics structure" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -504,7 +506,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimage" category="graphics" file="pack-box.mkiv"> + <cd:command name="backgroundimage" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> @@ -513,7 +515,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimagefill" category="graphics" file="pack-box.mkiv"> + <cd:command name="backgroundimagefill" level="style" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> @@ -522,4 +524,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml index 155930ef8..bd96388f3 100644 --- a/tex/context/interface/mkiv/i-grid.xml +++ b/tex/context/interface/mkiv/i-grid.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="showgrid" category="layout" file="page-grd.mkiv"> + <cd:command name="showgrid" level="document" category="layout" file="page-grd.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -23,7 +23,7 @@ </cd:arguments> </cd:command> - <cd:command name="definegridsnapping" category="layout" file="spac-ver.mkiv"> + <cd:command name="definegridsnapping" level="style" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="snaptogrid" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -69,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="snaptogrid" variant="list" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -79,7 +79,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeongrid" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="placeongrid" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeongrid" variant="list" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="placeongrid" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="gridsnapping" type="environment" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-grid"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="gridsnapping" type="environment" variant="list" category="layout" level="document" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" variant="list" level="document" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -113,15 +113,15 @@ </cd:arguments> </cd:command> - <cd:command name="usegridparameter" category="layout" level="system" file="spac-ver.mkiv"> + <cd:command name="usegridparameter" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="showgridsnapping" category="layout" file="spac-ver.mkiv"/> + <cd:command name="showgridsnapping" level="document" category="layout" file="spac-ver.mkiv"/> - <cd:command name="basegrid" level="document" file="meta-grd.mkiv"> + <cd:command name="basegrid" level="document" category="graphics" file="meta-grd.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="grid" level="document" file="meta-grd.mkiv"> + <cd:command name="grid" level="document" category="graphics" file="meta-grd.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -186,4 +186,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml index 673c34895..6e8612c5a 100644 --- a/tex/context/interface/mkiv/i-help.xml +++ b/tex/context/interface/mkiv/i-help.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehelp" level="style" file="scrn-hlp.mkvi"> + <cd:command name="definehelp" level="style" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphelp" level="style" file="scrn-hlp.mkvi"> + <cd:command name="setuphelp" level="style" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -23,7 +23,7 @@ </cd:arguments> </cd:command> - <cd:command name="help" generated="yes" variant="instance" file="scrn-hlp.mkvi"> + <cd:command name="help" generated="yes" variant="instance" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:sequence> <cd:instance value="help"/> </cd:sequence> @@ -37,7 +37,7 @@ </cd:instances> </cd:command> - <cd:command name="help" type="environment" generated="yes" variant="instance" file="scrn-hlp.mkvi"> + <cd:command name="help" type="environment" generated="yes" variant="instance" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:sequence> <cd:instance value="help"/> </cd:sequence> @@ -49,30 +49,30 @@ </cd:instances> </cd:command> - <cd:command name="doifelsehelp" level="system" file="scrn-hlp.mkvi"> + <cd:command name="doifelsehelp" level="system" category="pdf conditional" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifhelpelse" level="system" file="scrn-hlp.mkvi"> + <cd:command name="doifhelpelse" level="system" category="pdf conditional" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="placehelp" file="scrn-hlp.mkvi"/> + <cd:command name="placehelp" level="document" category="pdf" file="scrn-hlp.mkvi"/> - <cd:command name="showhelp" file="scrn-hlp.mkvi"> + <cd:command name="showhelp" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="helptext" file="scrn-hlp.mkvi"> + <cd:command name="helptext" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> <cd:resolve name="argument-text"/> @@ -80,10 +80,10 @@ </cd:arguments> </cd:command> - <cd:command name="helptext" type="environment" file="scrn-hlp.mkvi"> + <cd:command name="helptext" type="environment" level="document" category="pdf" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hemistich.xml b/tex/context/interface/mkiv/i-hemistich.xml index 673f861ee..a508c51f8 100644 --- a/tex/context/interface/mkiv/i-hemistich.xml +++ b/tex/context/interface/mkiv/i-hemistich.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehemistich" level="style" file="m-hemistich.mkiv"> + <cd:command name="definehemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphemistich" level="style" file="m-hemistich.mkiv"> + <cd:command name="setuphemistich" level="style" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistiches" level="document" file="m-hemistich.mkiv"> + <cd:command name="hemistiches" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -58,7 +58,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistiches" variant="assignment" level="document" file="m-hemistich.mkiv"> + <cd:command name="hemistiches" variant="assignment" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuphemistich"/> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistich" generated="yes" variant="instance" level="document" file="m-hemistich.mkiv"> + <cd:command name="hemistich" generated="yes" variant="instance" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:sequence> <cd:instance value="hemistich"/> </cd:sequence> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="hemistichescaesura" level="document" file="m-hemistich.mkiv"> + <cd:command name="hemistichescaesura" level="document" category="whitespace fonts" file="m-hemistich.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords delimiters="braces"> diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml index db66912c5..9da39818e 100644 --- a/tex/context/interface/mkiv/i-highlight.xml +++ b/tex/context/interface/mkiv/i-highlight.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehighlight" category="fonts" level="style" file="core-sys.mkiv"> + <cd:command name="definehighlight" level="style" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphighlight" category="fonts" level="style" file="core-sys.mkiv"> + <cd:command name="setuphighlight" level="style" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="highlight" generated="yes" variant="example" category="fonts" level="document" file="core-sys.mkiv"> + <cd:command name="highlight" generated="yes" variant="example" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -41,24 +41,24 @@ </cd:arguments> </cd:command> - <cd:command name="highlight" category="fonts" level="document" file="core-sys.mkiv"> + <cd:command name="highlight" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="highlight" type="environment" category="fonts" level="document" file="core-sys.mkiv"> + <cd:command name="highlight" type="environment" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directhighlight" category="fonts" level="document" file="core-sys.mkiv"> + <cd:command name="directhighlight" level="document" category="fonts colors" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index f07f67232..75932d2fc 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehspace" level="style" file="spac-hor.mkiv"> + <cd:command name="definehspace" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="hspace" file="spac-hor.mkiv"> + <cd:command name="hspace" level="document" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -40,29 +40,29 @@ </cd:arguments> </cd:command> - <cd:command name="hairspace" file="spac-hor.mkiv"/> + <cd:command name="hairspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thinspace" file="spac-hor.mkiv"/> + <cd:command name="thinspace" level="style" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="medspace" file="spac-hor.mkiv"/> + <cd:command name="medspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thickspace" file="spac-hor.mkiv"/> + <cd:command name="thickspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="autoinsertnextspace" file="spac-hor.mkiv"/> + <cd:command name="autoinsertnextspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="hglue" file="spac-ver.mkiv"> + <cd:command name="hglue" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="string-dimension"/> </cd:arguments> </cd:command> - <cd:command name="frenchspacing" file="spac-hor.mkiv"/> + <cd:command name="frenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="newfrenchspacing" file="spac-hor.mkiv"/> + <cd:command name="newfrenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="nonfrenchspacing" file="spac-hor.mkiv"/> + <cd:command name="nonfrenchspacing" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="setupspacing" level="style" file="spac-hor.mkiv"> + <cd:command name="setupspacing" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -72,45 +72,45 @@ </cd:arguments> </cd:command> - <cd:command name="space" file="spac-hor.mkiv"/> + <cd:command name="space" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="removelastspace" level="system" file="spac-hor.mkiv"/> + <cd:command name="removelastspace" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="nospace" level="system" file="spac-hor.mkiv"/> + <cd:command name="nospace" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="fixedspace" file="spac-hor.mkiv"/> + <cd:command name="fixedspace" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="fixedspaces" file="spac-hor.mkiv"/> + <cd:command name="fixedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="keepunwantedspaces" level="system" file="spac-hor.mkiv"/> + <cd:command name="keepunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="removeunwantedspaces" level="system" file="spac-hor.mkiv"/> + <cd:command name="removeunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="thinspace" file="spac-hor.mkiv"/> + <cd:command name="thinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="negthinspace" file="spac-hor.mkiv"/> + <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="enspace" file="spac-hor.mkiv"/> + <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="enskip" file="spac-hor.mkiv"/> + <cd:command name="enskip" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="quad" file="spac-hor.mkiv"/> + <cd:command name="quad" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="qquad" file="spac-hor.mkiv"/> + <cd:command name="qquad" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="emspace" file="spac-hor.mkiv"/> + <cd:command name="emspace" level="style" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="dotfskip" file="spac-hor.mkiv"> + <cd:command name="dotfskip" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="leftskipadaption" level="system" file="spac-hor.mkiv"/> + <cd:command name="leftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> - <cd:command name="rightskipadaption" level="system" file="spac-hor.mkiv"/> + <cd:command name="rightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"/> - <cd:command name="dosetleftskipadaption" level="system" file="spac-hor.mkiv"> + <cd:command name="dosetleftskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -118,7 +118,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetrightskipadaption" level="system" file="spac-hor.mkiv"> + <cd:command name="dosetrightskipadaption" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -126,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptleftskip" level="system" file="spac-hor.mkiv"> + <cd:command name="doadaptleftskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-leftskip"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doadaptrightskip" level="system" file="spac-hor.mkiv"> + <cd:command name="doadaptrightskip" level="system" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-rightskip"/> @@ -142,7 +142,7 @@ </cd:arguments> </cd:command> - <cd:command name="activatespacehandler" level="system" file="spac-hor.mkiv"> + <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -156,10 +156,10 @@ </cd:arguments> </cd:command> - <cd:command name="quads" file="spac-hor.mkiv"> + <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml index 4c2d93895..75cdbae75 100644 --- a/tex/context/interface/mkiv/i-hyphenation.xml +++ b/tex/context/interface/mkiv/i-hyphenation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuphyphenation" level="style" file="lang-hyp.mkiv"> + <cd:command name="setuphyphenation" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="hyphenation" type="environment" file="lang-hyp.mkiv"> + <cd:command name="hyphenation" type="environment" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="original"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definehypenationfeatures" level="style" file="lang-hyp.mkiv"> + <cd:command name="definehypenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="sethyphenationfeatures" level="style" file="lang-hyp.mkiv"> + <cd:command name="sethyphenationfeatures" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -97,37 +97,37 @@ </cd:arguments> </cd:command> - <cd:command name="resethyphenationfeatures" file="lang-hyp.mkiv"/> + <cd:command name="resethyphenationfeatures" level="style" category="language" file="lang-hyp.mkiv"/> - <cd:command name="registerhyphenationpattern" file="lang-hyp.mkiv"> + <cd:command name="registerhyphenationpattern" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="unregisterhyphenationpattern" file="lang-hyp.mkiv"> + <cd:command name="unregisterhyphenationpattern" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showhyphenationtrace" file="lang-hyp.mkiv"> + <cd:command name="showhyphenationtrace" level="document" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="registerhyphenationexception" file="lang-hyp.mkiv"> + <cd:command name="registerhyphenationexception" level="style" category="language" file="lang-hyp.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuphyphenmark" level="style" file="typo-del.mkiv"> + <cd:command name="setuphyphenmark" level="style" category="language" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="sign"> @@ -138,13 +138,13 @@ </cd:arguments> </cd:command> - <cd:command name="definebreakpoints" level="style" file="typo-brk.mkiv"> + <cd:command name="definebreakpoints" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebreakpoint" level="style" file="typo-brk.mkiv"> + <cd:command name="definebreakpoint" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="setbreakpoints" level="style" file="typo-brk.mkiv"> + <cd:command name="setbreakpoints" level="style" category="language" file="typo-brk.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -193,72 +193,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetbreakpoints" file="typo-brk.mkiv"/> + <cd:command name="resetbreakpoints" level="style" category="language" file="typo-brk.mkiv"/> - <cd:command name="showhyphens" file="supp-box.mkiv"> + <cd:command name="showhyphens" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedword" file="supp-box.mkiv"> + <cd:command name="hyphenatedword" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedpar" file="supp-box.mkiv"> + <cd:command name="hyphenatedpar" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedfile" file="supp-box.mkiv"> + <cd:command name="hyphenatedfile" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedcoloredword" file="supp-box.mkiv"> + <cd:command name="hyphenatedcoloredword" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedhbox" file="supp-box.mkiv"> + <cd:command name="hyphenatedhbox" level="document" category="language" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlbefore" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlbefore" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlafter" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlafter" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sethyphenatedurlnormal" file="lang-url.mkiv"> + <cd:command name="sethyphenatedurlnormal" level="style" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedurl" file="lang-url.mkiv"> + <cd:command name="hyphenatedurl" level="document" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hyphenatedfilename" file="lang-url.mkiv"> + <cd:command name="hyphenatedfilename" level="document" category="language" file="lang-url.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml index 2b315ad78..98fdcf253 100644 --- a/tex/context/interface/mkiv/i-imposition.xml +++ b/tex/context/interface/mkiv/i-imposition.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installshipoutmethod" level="system" file="page-imp.mkiv"> + <cd:command name="installshipoutmethod" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="invokepageheandler" level="system" file="page-imp.mkiv"> + <cd:command name="invokepageheandler" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuparranging" category="layout" file="page-imp.mkiv"> + <cd:command name="setuparranging" level="style" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="disable"/> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="installpagearrangement" category="layout" level="system" file="page-imp.mkiv"> + <cd:command name="installpagearrangement" level="system" category="layout" file="page-imp.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -77,6 +77,6 @@ </cd:arguments> </cd:command> - <cd:command name="arrangedpages" type="environment" begin="push" end="pop" category="layout" level="system" file="page-imp.mkiv"/> + <cd:command name="arrangedpages" type="environment" begin="push" end="pop" level="system" category="layout" file="page-imp.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml index 9f44e22dd..ed91b9193 100644 --- a/tex/context/interface/mkiv/i-indent.xml +++ b/tex/context/interface/mkiv/i-indent.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineindenting" level="style" file="spac-hor.mkiv"> + <cd:command name="defineindenting" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupindenting" level="style" file="spac-hor.mkiv"> + <cd:command name="setupindenting" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="small" prefix="cd:sign" method="none"/> @@ -54,21 +54,21 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizeindenting" level="system" file="spac-hor.mkiv"/> + <cd:command name="synchronizeindenting" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="useindentingparameter" level="system" file="spac-hor.mkiv"> + <cd:command name="useindentingparameter" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="indentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="indentation" coreprimitive="yes" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="noindentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="noindentation" coreprimitive="yes" level="document" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="doindentation" file="spac-hor.mkiv" coreprimitive="yes"/> + <cd:command name="doindentation" coreprimitive="yes" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="checknextindentation" level="system" file="spac-hor.mkiv"> + <cd:command name="checknextindentation" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -78,14 +78,14 @@ </cd:arguments> </cd:command> - <cd:command name="useindentnextparameter" level="system" file="spac-hor.mkiv"> + <cd:command name="useindentnextparameter" level="system" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorechecknextindentation" level="system" file="spac-hor.mkiv"/> + <cd:command name="dorechecknextindentation" level="system" category="whitespace" file="spac-hor.mkiv"/> - <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" file="spac-hor.mkiv"/> + <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" category="whitespace" file="spac-hor.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-indentedtext.xml b/tex/context/interface/mkiv/i-indentedtext.xml index 3d1b470ac..8d19c321f 100644 --- a/tex/context/interface/mkiv/i-indentedtext.xml +++ b/tex/context/interface/mkiv/i-indentedtext.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineindentedtext" level="style" file="strc-ind.mkiv"> + <cd:command name="defineindentedtext" level="style" category="structure" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupindentedtext" level="style" file="strc-ind.mkiv"> + <cd:command name="setupindentedtext" level="style" category="structure" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -57,16 +57,16 @@ </cd:arguments> </cd:command> - <cd:command name="indentedtext" type="environment" generated="yes" variant="example" level="document" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" generated="yes" variant="example" level="document" category="structure" file="strc-ind.mkiv"> <cd:sequence> <cd:variable value="indentedtext"/> </cd:sequence> </cd:command> - <cd:command name="indentedtext" type="environment" level="document" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" level="document" category="structure" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-initial.xml b/tex/context/interface/mkiv/i-initial.xml index 4b7c2a607..7f0993acc 100644 --- a/tex/context/interface/mkiv/i-initial.xml +++ b/tex/context/interface/mkiv/i-initial.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinitial" category="fonts" level="style" file="typo-drp.mkiv"> + <cd:command name="defineinitial" level="style" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinitial" category="fonts" level="style" file="typo-drp.mkiv"> + <cd:command name="setupinitial" level="style"category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,13 +63,13 @@ </cd:arguments> </cd:command> - <cd:command name="placeinitial" category="fonts" file="typo-drp.mkiv"> + <cd:command name="placeinitial" level="document" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="setinitial" category="fonts" file="typo-drp.mkiv"> + <cd:command name="setinitial" level="document" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -78,4 +78,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-injector.xml b/tex/context/interface/mkiv/i-injector.xml index 321aa75c8..3728d7bb8 100644 --- a/tex/context/interface/mkiv/i-injector.xml +++ b/tex/context/interface/mkiv/i-injector.xml @@ -4,37 +4,37 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="resetinjector" file="typo-inj.mkiv"> + <cd:command name="resetinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="markinjector" file="typo-inj.mkiv"> + <cd:command name="markinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checkinjector" file="typo-inj.mkiv"> + <cd:command name="checkinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checkpreviousinjector" file="typo-inj.mkiv"> + <cd:command name="checkpreviousinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="checknextinjector" file="typo-inj.mkiv"> + <cd:command name="checknextinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setinjector" file="typo-inj.mkiv"> + <cd:command name="setinjector" level="document" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-list"/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="showinjector" file="typo-inj.mkiv"> + <cd:command name="showinjector" level="document" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> @@ -50,19 +50,19 @@ <!-- - <cd:command name="doinstallinjector" file="typo-inj.mkiv"> + <cd:command name="doinstallinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doactivateinjector" file="typo-inj.mkiv"> + <cd:command name="doactivateinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dotestinjector" file="typo-inj.mkiv"> + <cd:command name="dotestinjector" level="system" file="typo-inj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -70,4 +70,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml index 943e10069..c8c4ed721 100644 --- a/tex/context/interface/mkiv/i-insertion.xml +++ b/tex/context/interface/mkiv/i-insertion.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinsertion" level="system" file="page-ins.mkiv"> + <cd:command name="defineinsertion" level="system" category="structure" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinsertion" level="system" file="page-ins.mkiv"> + <cd:command name="setupinsertion" level="system" category="structure" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsertion" level="system" file="page-ins.mkiv"> + <cd:command name="doifelseinsertion" level="system" category="structure conditional" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsertionelse" level="system" file="page-ins.mkiv"> + <cd:command name="doifinsertionelse" level="system" category="structure conditional" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -45,4 +45,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml index dd8fce866..2496e5d94 100644 --- a/tex/context/interface/mkiv/i-interaction.xml +++ b/tex/context/interface/mkiv/i-interaction.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteraction" level="style" file="scrn-ini.mkvi"> + <cd:command name="defineinteraction" level="style" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteraction" level="style" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" level="style" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -119,13 +119,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteraction" variant="name" level="style" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" variant="name" level="style" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="interaction" type="environment" file="scrn-ini.mkvi"> + <cd:command name="interaction" type="environment" level="system" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="setinteraction" file="scrn-ini.mkvi"> + <cd:command name="setinteraction" level="system" category="pdf" file="scrn-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hidden"/> @@ -143,18 +143,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocation" level="system" file="scrn-ini.mkvi"> + <cd:command name="doifelselocation" level="system" category="pdf conditional" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiflocationelse" level="system" file="scrn-ini.mkvi"> + <cd:command name="doiflocationelse" level="system" category="pdf conditional" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionbar.xml b/tex/context/interface/mkiv/i-interactionbar.xml index ecc707df9..e03d2a071 100644 --- a/tex/context/interface/mkiv/i-interactionbar.xml +++ b/tex/context/interface/mkiv/i-interactionbar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteractionbar" level="style" file="scrn-bar.mkvi"> + <cd:command name="defineinteractionbar" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteractionbar" level="style" file="scrn-bar.mkvi"> + <cd:command name="setupinteractionbar" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="interactionbar" file="scrn-bar.mkvi"> + <cd:command name="interactionbar" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="interactionbuttons" file="scrn-bar.mkvi"> + <cd:command name="interactionbuttons" level="style" category="pdf" file="scrn-bar.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupinteractionbar"/> @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionmenu.xml b/tex/context/interface/mkiv/i-interactionmenu.xml index 78068d1f5..32fac36f9 100644 --- a/tex/context/interface/mkiv/i-interactionmenu.xml +++ b/tex/context/interface/mkiv/i-interactionmenu.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinteractionmenu" level="style" file="scrn-but.mkvi"> + <cd:command name="defineinteractionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteractionmenu" level="style" file="scrn-but.mkvi"> + <cd:command name="setupinteractionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,7 +125,7 @@ <!-- - <cd:command name="setupinteractionmenus" file="scrn-but.mkvi"> + <cd:command name="setupinteractionmenus" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -136,13 +136,13 @@ --> - <cd:command name="interactionmenu" type="environment" file="scrn-but.mkvi"> + <cd:command name="interactionmenu" type="environment" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetinteractionmenu" file="scrn-but.mkvi"> + <cd:command name="resetinteractionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -150,7 +150,7 @@ <!-- - <cd:command name="raw" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="raw" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -158,13 +158,13 @@ </cd:arguments> </cd:command> - <cd:command name="raw" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="raw" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="but" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="but" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -172,13 +172,13 @@ </cd:arguments> </cd:command> - <cd:command name="but" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="but" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="got" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="got" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="string-text"/> @@ -186,38 +186,38 @@ </cd:arguments> </cd:command> - <cd:command name="got" type="environment" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="got" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nop" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="nop" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="nop" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="nop" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> - <cd:command name="txt" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="txt" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="txt" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="txt" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> - <cd:command name="rul" scope="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="rul" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="\"/> </cd:arguments> </cd:command> - <cd:command name="rul" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="rul" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> <cd:command name="com" scope="interactionmenu" file="scrn-but.mkvi"> <cd:arguments> @@ -226,17 +226,17 @@ </cd:arguments> </cd:command> - <cd:command name="com" type="environment" scope="interactionmenu" file="scrn-but.mkvi"/> + <cd:command name="com" type="environment" scope="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"/> --> - <cd:command name="includemenu" file="scrn-but.mkvi"> + <cd:command name="includemenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -245,7 +245,7 @@ </cd:arguments> </cd:command> - <cd:command name="menubutton" variant="interactionmenu" file="scrn-but.mkvi"> + <cd:command name="menubutton" variant="interactionmenu" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -258,7 +258,7 @@ </cd:arguments> </cd:command> - <cd:command name="menubutton" variant="button" file="scrn-but.mkvi"> + <cd:command name="menubutton" variant="button" level="style" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupbutton"/> @@ -270,11 +270,11 @@ </cd:arguments> </cd:command> - <cd:command name="registermenubuttons" file="scrn-but.mkvi"> + <cd:command name="registermenubuttons" level="system" category="pdf" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml index dafdb310f..79c15428b 100644 --- a/tex/context/interface/mkiv/i-interactionscreen.xml +++ b/tex/context/interface/mkiv/i-interactionscreen.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupinteractionscreen" level="style" file="scrn-pag.mkvi"> + <cd:command name="setupinteractionscreen" level="style" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -45,6 +45,8 @@ <cd:constant type="portrait"/> <cd:constant type="page"/> <cd:constant type="paper"/> + <cd:constant type="attachment"/> + <cd:constant type="layer"/> </cd:parameter> <cd:parameter name="copies"> <cd:constant type="cd:number"/> @@ -57,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="screen" file="scrn-pag.mkvi"> + <cd:command name="screen" level="document" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="page"/> diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml index 08c273812..66b48535e 100644 --- a/tex/context/interface/mkiv/i-interface.xml +++ b/tex/context/interface/mkiv/i-interface.xml @@ -199,4 +199,4 @@ </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-interlinespace.xml b/tex/context/interface/mkiv/i-interlinespace.xml index 6573a8e05..94911afb9 100644 --- a/tex/context/interface/mkiv/i-interlinespace.xml +++ b/tex/context/interface/mkiv/i-interlinespace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineinterlinespace" level="style" file="spac-ver.mkiv"> + <cd:command name="defineinterlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinterlinespace" level="style" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinterlinespace" variant="argument" level="style" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -69,13 +69,13 @@ </cd:arguments> </cd:command> - <cd:command name="setupinterlinespace" variant="name" level="style" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" level="style" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" variant="argument" level="style" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -100,13 +100,13 @@ </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" variant="name" level="style" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -115,7 +115,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" variant="argument" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" variant="argument" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -131,13 +131,13 @@ </cd:arguments> </cd:command> - <cd:command name="switchtointerlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="switchtointerlinespace" variant="name" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" level="system" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:assignments delimiters="braces" list="yes"> <cd:inherit name="setupinterlinespace"/> @@ -145,7 +145,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" variant="argument" level="system" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="argument" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -161,16 +161,16 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" variant="name" level="system" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="name" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="useinterlinespaceparameter" level="system" file="spac-ver.mkiv"> + <cd:command name="useinterlinespaceparameter" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-italiccorrection.xml b/tex/context/interface/mkiv/i-italiccorrection.xml index def238233..2d406bdf5 100644 --- a/tex/context/interface/mkiv/i-italiccorrection.xml +++ b/tex/context/interface/mkiv/i-italiccorrection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setitaliccorrection" category="fonts" file="typo-itc.mkvi"> + <cd:command name="setitaliccorrection" level="system" category="fonts" file="typo-itc.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -14,11 +14,11 @@ </cd:arguments> </cd:command> - <cd:command name="resetitaliccorrection" category="fonts" file="typo-itc.mkvi"/> + <cd:command name="resetitaliccorrection" level="style" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="italiccorrection" category="fonts" file="typo-itc.mkvi"/> + <cd:command name="italiccorrection" level="style" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="setupitaliccorrection" category="fonts" file="typo-itc.mkvi"> + <cd:command name="setupitaliccorrection" level="style" category="fonts" file="typo-itc.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> @@ -29,4 +29,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index 7145ebfb3..b811592be 100644 --- a/tex/context/interface/mkiv/i-itemgroup.xml +++ b/tex/context/interface/mkiv/i-itemgroup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineitemgroup" level="style" file="strc-itm.mkvi"> + <cd:command name="defineitemgroup" level="style" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" level="style" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -201,7 +201,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" variant="assignment" level="style" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" variant="assignment" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -387,7 +387,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroups" level="style" file="strc-itm.mkvi"> + <cd:command name="setupitemgroups" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -399,7 +399,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" category="structure counter" file="strc-itm.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -421,7 +421,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" level="document" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-itm.mkvi"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -438,7 +438,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" level="document" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -450,15 +450,15 @@ </cd:arguments> </cd:command> - <cd:command name="item" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="item" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="noitem" scope="itemgroup" level="document" file="strc-itm.mkvi"/> + <cd:command name="noitem" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="itemtag" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="itemtag" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> @@ -466,36 +466,36 @@ <!-- - <cd:command name="itm" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="itm" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="but" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="but" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="nop" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="nop" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="txt" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="txt" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="head" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="head" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command name="headsym" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="headsym" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -503,44 +503,44 @@ </cd:arguments> </cd:command> - <cd:command name="sym" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="sym" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ran" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="ran" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mar" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="mar" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="sub" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="sub" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> - <cd:command name="its" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="its" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"/> --> - <cd:command name="item" type="environment" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="item" type="environment" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="head" type="environment" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="head" type="environment" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="item" default="yes"/> @@ -549,7 +549,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -560,7 +560,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" level="document" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> @@ -571,7 +571,7 @@ <!-- - <cd:command name="itemize" type="environment" file="strc-itm.mkvi"> + <cd:command name="itemize" type="environment" level="document" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupitemgroup"/> @@ -582,7 +582,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemize" file="strc-itm.mkvi"> + <cd:command name="setupitemize" level="style" category="structure" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="each"/> @@ -599,4 +599,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-items.xml b/tex/context/interface/mkiv/i-items.xml index b73524229..ab50b669d 100644 --- a/tex/context/interface/mkiv/i-items.xml +++ b/tex/context/interface/mkiv/i-items.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineitems" level="style" file="typo-itm.mkiv"> + <cd:command name="defineitems" level="style" category="symbols" file="typo-itm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitems" level="style" file="typo-itm.mkiv"> + <cd:command name="setupitems" level="style" category="symbols" file="typo-itm.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="items" level="document" file="typo-itm.mkiv"> + <cd:command name="items" level="document" category="symbols" file="typo-itm.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> @@ -82,4 +82,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-javascript.xml b/tex/context/interface/mkiv/i-javascript.xml index 4cf9dbf85..e97c5109c 100644 --- a/tex/context/interface/mkiv/i-javascript.xml +++ b/tex/context/interface/mkiv/i-javascript.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="JScode" type="environment" level="system" file="java-ini.mkiv"> + <cd:command name="JScode" type="environment" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:keywords delimiters="none"> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="JSpreamble" type="environment" level="system" file="java-ini.mkiv"> + <cd:command name="JSpreamble" type="environment" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:keywords delimiters="none"> @@ -27,25 +27,25 @@ </cd:arguments> </cd:command> - <cd:command name="setJSpreamble" level="system" file="java-ini.mkiv"> + <cd:command name="setJSpreamble" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="addtoJSpreamble" level="system" file="java-ini.mkiv"> + <cd:command name="addtoJSpreamble" level="system" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="useJSscripts" level="style" file="java-ini.mkiv"> + <cd:command name="useJSscripts" level="style" category="pdf" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml index d2a332ab3..b45e916f2 100644 --- a/tex/context/interface/mkiv/i-kerning.xml +++ b/tex/context/interface/mkiv/i-kerning.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definecharacterkerning" level="style" file="typo-krn.mkiv"> + <cd:command name="definecharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcharacterkerning" level="style" file="typo-krn.mkiv"> + <cd:command name="setupcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setcharacterkerning" file="typo-krn.mkiv"> + <cd:command name="setcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -47,9 +47,9 @@ </cd:arguments> </cd:command> - <cd:command name="resetcharacterkerning" file="typo-krn.mkiv"/> + <cd:command name="resetcharacterkerning" level="style" category="fonts whitespace" file="typo-krn.mkiv"/> - <cd:command name="characterkerning" generated="yes" variant="example" level="document" file="typo-krn.mkiv"> + <cd:command name="characterkerning" generated="yes" variant="example" level="document" category="fonts whitespace" file="typo-krn.mkiv"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -59,21 +59,21 @@ </cd:arguments> </cd:command> - <cd:command name="kerncharacters" level="document" file="typo-krn.mkiv"> + <cd:command name="kerncharacters" level="document" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="letterspacing" level="document" file="typo-krn.mkiv"> + <cd:command name="letterspacing" level="document" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="stretched" level="document" file="typo-krn.mkiv"> + <cd:command name="stretched" level="document" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstretched" level="style" file="typo-krn.mkiv"> + <cd:command name="setupstretched" level="style" category="fonts whitespace" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -90,4 +90,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml index ff2ebc005..a09360aa7 100644 --- a/tex/context/interface/mkiv/i-label.xml +++ b/tex/context/interface/mkiv/i-label.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelabel" level="style" file="strc-lab.mkiv"> + <cd:command name="definelabel" level="style" category="structure" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplabel" level="style" file="strc-lab.mkiv"> + <cd:command name="setuplabel" level="style" category="structure" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -131,6 +131,12 @@ <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="stretch"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="shrink"> + <cd:constant type="cd:number"/> + </cd:parameter> <cd:parameter name="hang"> <cd:constant type="fit"/> <cd:constant type="broad"/> @@ -178,7 +184,7 @@ <!-- - <cd:command name="setuplabels" file="strc-lab.mkiv"> + <cd:command name="setuplabels" level="style" category="structure" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -189,7 +195,7 @@ --> - <cd:command name="label" generated="yes" variant="example" level="document" file="strc-lab.mkiv"> + <cd:command name="label" generated="yes" variant="example" level="document" category="structure" file="strc-lab.mkiv"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -199,7 +205,7 @@ </cd:arguments> </cd:command> - <cd:command name="currentlabel" generated="yes" variant="example" level="document" file="strc-lab.mkiv"> + <cd:command name="currentlabel" generated="yes" variant="example" level="document" category="structure" file="strc-lab.mkiv"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> @@ -210,4 +216,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml index 4a58a069c..7ad6b6ba8 100644 --- a/tex/context/interface/mkiv/i-labeltext.xml +++ b/tex/context/interface/mkiv/i-labeltext.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelabelclass" category="language" level="system" file="lang-lab.mkiv"> + <cd:command name="definelabelclass" level="system" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="setuplabeltext" generated="yes" variant="instance" category="language" level="style" file="lang-lab.mkiv"> + <cd:command name="setuplabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="label"/> @@ -26,7 +26,7 @@ </cd:instances> </cd:command> - <cd:command name="presetlabeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="presetlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="preset"/> <cd:instance value="label"/> @@ -41,7 +41,7 @@ </cd:instances> </cd:command> - <cd:command name="copylabeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="copylabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="copy"/> <cd:instance value="label"/> @@ -56,7 +56,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltext" type="environment" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="labeltext" type="environment" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -70,7 +70,7 @@ </cd:instances> </cd:command> - <cd:command name="labellanguage" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="labellanguage" generated="yes" variant="instance" level="system" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="language"/> @@ -80,7 +80,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="labeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -93,7 +93,7 @@ </cd:instances> </cd:command> - <cd:command name="labeltexts" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="labeltexts" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:instance value="label"/> <cd:string value="texts"/> @@ -107,7 +107,7 @@ </cd:instances> </cd:command> - <cd:command name="leftlabeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="leftlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="left"/> <cd:instance value="label"/> @@ -121,7 +121,7 @@ </cd:instances> </cd:command> - <cd:command name="rightlabeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> + <cd:command name="rightlabeltext" generated="yes" variant="instance" level="style" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> @@ -137,382 +137,382 @@ <!-- - <cd:command name="setuplabeltext" file="lang-lab.mkiv"> + <cd:command name="setuplabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetlabeltext" file="lang-lab.mkiv"> + <cd:command name="presetlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copylabeltext" file="lang-lab.mkiv"> + <cd:command name="copylabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="labeltext" type="environment" file="lang-lab.mkiv"> + <cd:command name="labeltext" type="environment" flevel="style" category="language" ile="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="labellanguage" file="lang-lab.mkiv"/> + <cd:command name="labellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="labeltext" file="lang-lab.mkiv"> + <cd:command name="labeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="labeltexts" file="lang-lab.mkiv"> + <cd:command name="labeltexts" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="leftlabeltext" file="lang-lab.mkiv"> + <cd:command name="leftlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="rightlabeltext" file="lang-lab.mkiv"> + <cd:command name="rightlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupheadtext" file="lang-lab.mkiv"> + <cd:command name="setupheadtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetheadtext" file="lang-lab.mkiv"> + <cd:command name="presetheadtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyheadtext" file="lang-lab.mkiv"> + <cd:command name="copyheadtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="headtext" type="environment" file="lang-lab.mkiv"> + <cd:command name="headtext" type="environment" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="headlanguage" file="lang-lab.mkiv"/> + <cd:command name="headlanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="headtext" file="lang-lab.mkiv"> + <cd:command name="headtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="headtexts" file="lang-lab.mkiv"> + <cd:command name="headtexts" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="leftheadtext" file="lang-lab.mkiv"> + <cd:command name="leftheadtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="rightheadtext" file="lang-lab.mkiv"> + <cd:command name="rightheadtext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupmathlabeltext" file="lang-lab.mkiv"> + <cd:command name="setupmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetmathlabeltext" file="lang-lab.mkiv"> + <cd:command name="presetmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copymathlabeltext" file="lang-lab.mkiv"> + <cd:command name="copymathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="mathlabeltext" type="environment" file="lang-lab.mkiv"> + <cd:command name="mathlabeltext" type="environment" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="mathlabellanguage" file="lang-lab.mkiv"/> + <cd:command name="mathlabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="mathlabeltext" file="lang-lab.mkiv"> + <cd:command name="mathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="mathlabeltexts" file="lang-lab.mkiv"> + <cd:command name="mathlabeltexts" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="leftmathlabeltext" file="lang-lab.mkiv"> + <cd:command name="leftmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="rightmathlabeltext" file="lang-lab.mkiv"> + <cd:command name="rightmathlabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setuptaglabeltext" file="lang-lab.mkiv"> + <cd:command name="setuptaglabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presettaglabeltext" file="lang-lab.mkiv"> + <cd:command name="presettaglabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copytaglabeltext" file="lang-lab.mkiv"> + <cd:command name="copytaglabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="taglabeltext" type="environment" file="lang-lab.mkiv"> + <cd:command name="taglabeltext" type="environment" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="taglabellanguage" file="lang-lab.mkiv"/> + <cd:command name="taglabellanguage" level="system" category="language" file="lang-lab.mkiv"/> - <cd:command name="taglabeltext" file="lang-lab.mkiv"> + <cd:command name="taglabeltext" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupunittext" file="phys-dim.mkiv"> + <cd:command name="setupunittext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetunittext" file="phys-dim.mkiv"> + <cd:command name="presetunittext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyunittext" file="phys-dim.mkiv"> + <cd:command name="copyunittext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="unittext" type="environment" file="phys-dim.mkiv"> + <cd:command name="unittext" type="environment" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="unitlanguage" file="phys-dim.mkiv"/> + <cd:command name="unitlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="unittext" file="phys-dim.mkiv"> + <cd:command name="unittext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupoperatortext" file="phys-dim.mkiv"> + <cd:command name="setupoperatortext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetoperatortext" file="phys-dim.mkiv"> + <cd:command name="presetoperatortext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyoperatortext" file="phys-dim.mkiv"> + <cd:command name="copyoperatortext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="operatortext" type="environment" file="phys-dim.mkiv"> + <cd:command name="operatortext" type="environment" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="operatorlanguage" file="phys-dim.mkiv"/> + <cd:command name="operatorlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="operatortext" file="phys-dim.mkiv"> + <cd:command name="operatortext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupprefixtext" file="phys-dim.mkiv"> + <cd:command name="setupprefixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetprefixtext" file="phys-dim.mkiv"> + <cd:command name="presetprefixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyprefixtext" file="phys-dim.mkiv"> + <cd:command name="copyprefixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="prefixtext" type="environment" file="phys-dim.mkiv"> + <cd:command name="prefixtext" type="environment" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="prefixlanguage" file="phys-dim.mkiv"/> + <cd:command name="prefixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="prefixtext" file="phys-dim.mkiv"> + <cd:command name="prefixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupsuffixtext" file="phys-dim.mkiv"> + <cd:command name="setupsuffixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetsuffixtext" file="phys-dim.mkiv"> + <cd:command name="presetsuffixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copysuffixtext" file="phys-dim.mkiv"> + <cd:command name="copysuffixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="suffixtext" type="environment" file="phys-dim.mkiv"> + <cd:command name="suffixtext" type="environment" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="suffixlanguage" file="phys-dim.mkiv"/> + <cd:command name="suffixlanguage" level="system" category="language" file="phys-dim.mkiv"/> - <cd:command name="suffixtext" file="phys-dim.mkiv"> + <cd:command name="suffixtext" level="style" category="language" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setupbtxlabeltext" file="publ-ini.mkiv"> + <cd:command name="setupbtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="presetbtxlabeltext" file="publ-ini.mkiv"> + <cd:command name="presetbtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copybtxlabeltext" file="publ-ini.mkiv"> + <cd:command name="copybtxlabeltext" level="style" category="language" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="assignment-labeldata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxlabeltext" type="environment" file="publ-ini.mkiv"> + <cd:command name="btxlabeltext" type="environment" level="style" category="language" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:resolve name="keyword-key"/> </cd:arguments> </cd:command> - <cd:command name="btxlabellanguage" file="publ-ini.mkiv"/> + <cd:command name="btxlabellanguage" level="system" category="language" file="publ-ini.mkiv"/> - <cd:command name="btxlabeltext" file="publ-ini.mkiv"> + <cd:command name="btxlabeltext" level="style" category="language" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> @@ -520,4 +520,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index c60965a59..652f6ffc6 100644 --- a/tex/context/interface/mkiv/i-language.xml +++ b/tex/context/interface/mkiv/i-language.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installlanguage" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="installlanguage" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -13,14 +13,14 @@ </cd:arguments> </cd:command> - <cd:command name="installlanguage" variant="name" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="installlanguage" variant="name" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="setuplanguage" category="language" level="style" file="lang-ini.mkiv"> + <cd:command name="setuplanguage" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -124,7 +124,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselanguage" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="doifelselanguage" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -132,7 +132,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflanguageelse" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="doiflanguageelse" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepatterns" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="doifelsepatterns" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpatternselse" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="doifpatternselse" level="system" category="language conditional" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-language"/> <cd:resolve name="argument-true"/> @@ -156,41 +156,41 @@ </cd:arguments> </cd:command> - <cd:command name="language" generated="yes" variant="example" category="language" level="document" file="lang-ini.mkiv"> + <cd:command name="language" generated="yes" variant="example" level="document" category="language" file="lang-ini.mkiv"> <cd:sequence> <cd:variable value="language"/> </cd:sequence> </cd:command> - <cd:command name="language" category="language" level="document" file="lang-ini.mkiv"> + <cd:command name="language" level="document" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="mainlanguage" category="language" level="style" file="lang-ini.mkiv"> + <cd:command name="mainlanguage" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="uselanguageparameter" category="language" level="system" file="lang-ini.mkiv"> + <cd:command name="uselanguageparameter" level="system" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="exceptions" type="environment" category="language" level="style" file="lang-ini.mkiv"> + <cd:command name="exceptions" type="environment" level="style" category="language" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="currentlanguage" category="language" file="lang-ini.mkiv"/> + <cd:command name="currentlanguage" level="system" category="language" file="lang-ini.mkiv"/> - <cd:command name="currentmainlanguage" category="language" file="lang-ini.mkiv"/> + <cd:command name="currentmainlanguage" level="system" category="language" file="lang-ini.mkiv"/> - <cd:command name="commalistsentence" category="language" level="document" file="lang-lab.mkiv"> + <cd:command name="commalistsentence" level="document" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -201,4 +201,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml index 04704f75c..77aaf7d52 100644 --- a/tex/context/interface/mkiv/i-layer.xml +++ b/tex/context/interface/mkiv/i-layer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplayeredtext" level="style" file="pack-box.mkiv"> + <cd:command name="setuplayeredtext" level="style" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="layeredtext" file="pack-box.mkiv"> + <cd:command name="layeredtext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplayer"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelayeredtext" file="pack-box.mkiv"> + <cd:command name="placelayeredtext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayerframed" file="pack-box.mkiv"> + <cd:command name="setlayerframed" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayerframed" variant="combination" file="pack-box.mkiv"> + <cd:command name="setlayerframed" variant="combination" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -70,7 +70,7 @@ </cd:arguments> </cd:command> - <cd:command name="setlayertext" file="pack-box.mkiv"> + <cd:command name="setlayertext" level="document" category="background" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayer" level="style" file="pack-lyr.mkiv"> + <cd:command name="definelayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayer" level="style" file="pack-lyr.mkiv"> + <cd:command name="setuplayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -221,37 +221,37 @@ </cd:arguments> </cd:command> - <cd:command name="resetlayer" file="pack-lyr.mkiv"> + <cd:command name="resetlayer" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushlayer" file="pack-lyr.mkiv"> + <cd:command name="flushlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tightlayer" file="pack-lyr.mkiv"> + <cd:command name="tightlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placelayer" file="pack-lyr.mkiv"> + <cd:command name="placelayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="composedlayer" file="pack-lyr.mkiv"> + <cd:command name="composedlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setlayer" file="pack-lyr.mkiv"> + <cd:command name="setlayer" level="document" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -267,7 +267,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayerpreset" level="system" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" level="system" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -276,14 +276,14 @@ </cd:arguments> </cd:command> - <cd:command name="definelayerpreset" variant="name" level="system" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" variant="name" level="system" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelselayerdata" level="system" file="pack-lyr.mkiv"> + <cd:command name="doifelselayerdata" level="system" category="background conditional" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -291,7 +291,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayerdataelse" level="system" file="pack-lyr.mkiv"> + <cd:command name="doiflayerdataelse" level="system" category="background conditional" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -299,11 +299,11 @@ </cd:arguments> </cd:command> - <cd:command name="layerwidth" file="pack-lyr.mkiv"/> + <cd:command name="layerwidth" level="system" category="background" file="pack-lyr.mkiv"/> - <cd:command name="layerheight" file="pack-lyr.mkiv"/> + <cd:command name="layerheight" level="system" category="background" file="pack-lyr.mkiv"/> - <cd:command name="setMPlayer" file="pack-lyr.mkiv"> + <cd:command name="setMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -314,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="getMPlayer" file="pack-lyr.mkiv"> + <cd:command name="getMPlayer" level="document" category="background metapost" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -324,4 +324,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index 15e60115e..19b233988 100644 --- a/tex/context/interface/mkiv/i-layout.xml +++ b/tex/context/interface/mkiv/i-layout.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelayout" category="layout" level="style" file="page-lay.mkiv"> + <cd:command name="definelayout" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayout" category="layout" level="style" file="page-lay.mkiv"> + <cd:command name="setuplayout" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -211,7 +211,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayout" variant="name" category="layout" level="style" file="page-lay.mkiv"> + <cd:command name="setuplayout" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -220,7 +220,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutdefined" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doifelselayoutdefined" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -228,7 +228,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutdefinedelse" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doiflayoutdefinedelse" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -236,7 +236,7 @@ </cd:arguments> </cd:command> - <cd:command name="adaptlayout" category="layout" level="style" file="page-lay.mkiv"> + <cd:command name="adaptlayout" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-list-optional"/> <cd:assignments list="yes"> @@ -251,27 +251,27 @@ </cd:arguments> </cd:command> - <cd:command name="layout" type="environment" category="layout" file="page-lay.mkiv"> + <cd:command name="layout" type="environment" level="document" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpage" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doifelseoddpage" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpageelse" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doifoddpageelse" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifbothsidesoverruled" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doifbothsidesoverruled" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -279,7 +279,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifbothsides" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="doifbothsides" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -287,14 +287,14 @@ </cd:arguments> </cd:command> - <cd:command name="rightorleftpageaction" category="layout" level="system" file="page-lay.mkiv"> + <cd:command name="rightorleftpageaction" level="system" category="layout conditional" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="showprint" category="layout" file="page-run.mkiv"> + <cd:command name="showprint" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setuppapersize"/> @@ -308,7 +308,7 @@ </cd:arguments> </cd:command> - <cd:command name="showframe" category="layout" file="page-run.mkiv"> + <cd:command name="showframe" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="top"/> @@ -327,7 +327,7 @@ </cd:arguments> </cd:command> - <cd:command name="showsetups" category="layout" file="page-run.mkiv"> + <cd:command name="showsetups" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="pt" default="yes"/> @@ -345,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="showlayout" category="layout" file="page-run.mkiv"> + <cd:command name="showlayout" level="document" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="pt" default="yes"/> @@ -363,8 +363,22 @@ </cd:arguments> </cd:command> - <cd:command name="showmargins" category="layout" file="page-run.mkiv"/> + <cd:command name="showmargins" level="document" category="layout" file="page-run.mkiv"/> - <cd:command name="spread" type="environment" category="layout" file="page-spr.mkiv"/> + <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/> -</cd:interface> + <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml index 7459d7142..3dc562e68 100644 --- a/tex/context/interface/mkiv/i-linenumber.xml +++ b/tex/context/interface/mkiv/i-linenumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelinenumbering" level="style" file="page-lin.mkvi"> + <cd:command name="definelinenumbering" level="style" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinenumbering" level="style" file="page-lin.mkvi"> + <cd:command name="setuplinenumbering" level="style" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -89,7 +89,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenumbering" type="environment" level="document" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -112,7 +112,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenumbering" type="environment" variant="argument" level="document" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" variant="argument" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords optional="yes"> @@ -122,25 +122,25 @@ </cd:arguments> </cd:command> - <cd:command name="someline" level="document" file="page-lin.mkvi"> + <cd:command name="someline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="startline" level="document" file="page-lin.mkvi"> + <cd:command name="startline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="stopline" level="document" file="page-lin.mkvi"> + <cd:command name="stopline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesamelinereference" level="system" file="page-lin.mkvi"> + <cd:command name="doifelsesamelinereference" level="system" category="structure conditional" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -148,7 +148,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamelinereferenceelse" level="system" file="page-lin.mkvi"> + <cd:command name="doifsamelinereferenceelse" level="system" category="structure conditional" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -156,17 +156,17 @@ </cd:arguments> </cd:command> - <cd:command name="inline" level="document" file="page-lin.mkvi"> + <cd:command name="inline" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="inlinerange" level="document" file="page-lin.mkvi"> + <cd:command name="inlinerange" level="document" category="structure" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml index 0c46fbd10..500786276 100644 --- a/tex/context/interface/mkiv/i-lines.xml +++ b/tex/context/interface/mkiv/i-lines.xml @@ -104,7 +104,7 @@ <!-- - <cd:command name="lines" type="environment" file="spac-lin.mkiv"> + <cd:command name="lines" type="environment" level="document" file="spac-lin.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplines"/> @@ -120,4 +120,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linetable.xml b/tex/context/interface/mkiv/i-linetable.xml index fdfddbf44..a515f40fd 100644 --- a/tex/context/interface/mkiv/i-linetable.xml +++ b/tex/context/interface/mkiv/i-linetable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplinetable" category="tables" level="style" file="tabl-ltb.mkiv"> + <cd:command name="setuplinetable" level="style" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="r"/> @@ -98,7 +98,7 @@ </cd:arguments> </cd:command> - <cd:command name="linetablecell" type="environment" category="tables" file="tabl-ltb.mkiv"> + <cd:command name="linetablecell" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -106,19 +106,19 @@ </cd:arguments> </cd:command> - <cd:command name="linetable" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> + <cd:command name="linetable" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="linetablehead" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> + <cd:command name="linetablehead" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="linetablebody" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> + <cd:command name="linetablebody" type="environment" level="document" category="tables" file="tabl-ltb.mkiv"/> - <cd:command name="processlinetablebuffer" category="tables" level="document" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablebuffer" level="document" category="tables buffer" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="processlinetablefile" category="tables" level="document" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablefile" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> @@ -126,7 +126,7 @@ <!-- - <cd:command name="BC" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BC" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -136,21 +136,21 @@ </cd:arguments> </cd:command> - <cd:command name="BR" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BR" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="ER"/> </cd:arguments> </cd:command> - <cd:command name="BH" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="BH" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="EH"/> </cd:arguments> </cd:command> - <cd:command name="NC" scope="linetable" file="tabl-ltb.mkiv"> + <cd:command name="NC" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> @@ -158,8 +158,8 @@ </cd:arguments> </cd:command> - <cd:command name="NR" scope="linetable" file="tabl-ltb.mkiv"/> + <cd:command name="NR" scope="linetable" level="document" category="tables" file="tabl-ltb.mkiv"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-linewidth.xml b/tex/context/interface/mkiv/i-linewidth.xml index 6b2e5274c..6d9043a1f 100644 --- a/tex/context/interface/mkiv/i-linewidth.xml +++ b/tex/context/interface/mkiv/i-linewidth.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuplinewidth" level="style" file="pack-rul.mkiv"> + <cd:command name="setuplinewidth" level="style" category="layout" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> @@ -15,6 +15,6 @@ </cd:arguments> </cd:command> - <cd:command name="linewidth" file="pack-rul.mkiv"/> + <cd:command name="linewidth" level="style" category="layout" file="pack-rul.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml index bde2a69e6..8d4863dd2 100644 --- a/tex/context/interface/mkiv/i-list.xml +++ b/tex/context/interface/mkiv/i-list.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelist" level="style" file="strc-lst.mkvi"> + <cd:command name="definelist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplist" level="style" file="strc-lst.mkvi"> + <cd:command name="setuplist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list-optional"/> <cd:assignments list="yes"> @@ -296,7 +296,7 @@ <!-- - <cd:command name="setuplists" file="strc-lst.mkvi"> + <cd:command name="setuplists" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list-optional"/> <cd:assignments list="yes"> @@ -307,7 +307,7 @@ --> - <cd:command name="doifelselist" level="system" file="strc-lst.mkvi"> + <cd:command name="doifelselist" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -315,7 +315,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflistelse" level="system" file="strc-lst.mkvi"> + <cd:command name="doiflistelse" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -323,7 +323,7 @@ </cd:arguments> </cd:command> - <cd:command name="writebetweenlist" file="strc-lst.mkvi"> + <cd:command name="writebetweenlist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -333,7 +333,7 @@ </cd:arguments> </cd:command> - <cd:command name="writedatatolist" file="strc-lst.mkvi"> + <cd:command name="writedatatolist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -343,7 +343,7 @@ </cd:arguments> </cd:command> - <cd:command name="writetolist" file="strc-lst.mkvi"> + <cd:command name="writetolist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -354,7 +354,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelist" level="document" file="strc-lst.mkvi"> + <cd:command name="placelist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> @@ -363,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="placerawlist" file="strc-lst.mkvi"> + <cd:command name="placerawlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -372,7 +372,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelist" level="document" file="strc-lst.mkvi"> + <cd:command name="completelist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -381,7 +381,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecombinedlist" level="style" file="strc-lst.mkvi"> + <cd:command name="definecombinedlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-list"/> @@ -391,7 +391,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcombinedlist" level="style" file="strc-lst.mkvi"> + <cd:command name="setupcombinedlist" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes"> @@ -400,7 +400,7 @@ </cd:arguments> </cd:command> - <cd:command name="placecombinedlist" level="document" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -409,7 +409,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi"> + <cd:command name="setupcombinedlist" generated="yes" variant="instance" level="style" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="combinedlist"/> @@ -424,7 +424,7 @@ </cd:instances> </cd:command> - <cd:command name="placecombinedlist" generated="yes" variant="instance" level="document" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" generated="yes" variant="instance" level="document" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="combinedlist"/> @@ -439,7 +439,7 @@ </cd:instances> </cd:command> - <cd:command name="completecombinedlist" generated="yes" variant="instance" level="document" file="strc-lst.mkvi"> + <cd:command name="completecombinedlist" generated="yes" variant="instance" level="document" category="structure" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -456,7 +456,7 @@ <!-- - <cd:command name="setupcontent" file="strc-lst.mkvi"> + <cd:command name="setupcontent" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuplist"/> @@ -464,7 +464,7 @@ </cd:arguments> </cd:command> - <cd:command name="placecontent" file="strc-lst.mkvi"> + <cd:command name="placecontent" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -472,7 +472,7 @@ </cd:arguments> </cd:command> - <cd:command name="completecontent" file="strc-lst.mkvi"> + <cd:command name="completecontent" level="document" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplist"/> @@ -482,47 +482,47 @@ --> - <cd:command name="structurelistuservariable" file="strc-lst.mkvi"> + <cd:command name="structurelistuservariable" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="rawstructurelistuservariable" file="strc-lst.mkvi"> + <cd:command name="rawstructurelistuservariable" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthaspage" level="system" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthaspage" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthaspageelse" level="system" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthaspageelse" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthasnumber" level="system" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthasnumber" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthasnumberelse" level="system" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthasnumberelse" level="system" category="structure conditional" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="definelistextra" level="style" file="strc-lst.mkvi"> + <cd:command name="definelistextra" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -532,7 +532,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplistextra" level="style" file="strc-lst.mkvi"> + <cd:command name="setuplistextra" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -546,7 +546,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelistalternative" level="style" file="strc-lst.mkvi"> + <cd:command name="definelistalternative" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -556,7 +556,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplistalternative" level="style" file="strc-lst.mkvi"> + <cd:command name="setuplistalternative" level="style" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -588,7 +588,7 @@ </cd:arguments> </cd:command> - <cd:command name="determinelistcharacteristics" file="strc-lst.mkvi"> + <cd:command name="determinelistcharacteristics" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> @@ -597,21 +597,21 @@ </cd:arguments> </cd:command> - <cd:command name="currentlistentrynumber" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrynumber" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrytitle" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrytitle" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrytitlerendered" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrytitlerendered" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrypagenumber" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrypagenumber" level="style" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistsymbol" file="strc-lst.mkvi"/> + <cd:command name="currentlistsymbol" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="listlength" file="strc-lst.mkvi"/> + <cd:command name="listlength" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrywrapper" type="environment" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrywrapper" type="environment" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentryreferenceattribute" level="system" file="strc-lst.mkvi"> + <cd:command name="currentlistentryreferenceattribute" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="number"/> @@ -622,9 +622,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentlistentrydestinationattribute" level="system" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrydestinationattribute" level="system" category="structure" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrylimitedtext" level="system" file="strc-lst.mkvi"> + <cd:command name="currentlistentrylimitedtext" level="system" category="structure" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-logo.xml b/tex/context/interface/mkiv/i-logo.xml index e3327400a..8f8186a83 100644 --- a/tex/context/interface/mkiv/i-logo.xml +++ b/tex/context/interface/mkiv/i-logo.xml @@ -4,102 +4,102 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="TeX" file="cont-log.mkiv"/> + <cd:command name="TeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="ConTeXt" file="cont-log.mkiv"/> + <cd:command name="ConTeXt" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PPCHTeX" file="cont-log.mkiv"/> + <cd:command name="PPCHTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PRAGMA" file="cont-log.mkiv"/> + <cd:command name="PRAGMA" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LaTeX" file="cont-log.mkiv"/> + <cd:command name="LaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TaBlE" file="cont-log.mkiv"/> + <cd:command name="TaBlE" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PiCTeX" file="cont-log.mkiv"/> + <cd:command name="PiCTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="AmSTeX" file="cont-log.mkiv"/> + <cd:command name="AmSTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LamSTeX" file="cont-log.mkiv"/> + <cd:command name="LamSTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="Context" file="cont-log.mkiv"/> + <cd:command name="Context" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaFont" file="cont-log.mkiv"/> + <cd:command name="MetaFont" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaPost" file="cont-log.mkiv"/> + <cd:command name="MetaPost" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MetaFun" file="cont-log.mkiv"/> + <cd:command name="MetaFun" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="eTeX" file="cont-log.mkiv"/> + <cd:command name="eTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="pdfTeX" file="cont-log.mkiv"/> + <cd:command name="pdfTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="pdfeTeX" file="cont-log.mkiv"/> + <cd:command name="pdfeTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="Lua" file="cont-log.mkiv"/> + <cd:command name="Lua" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="luaTeX" file="cont-log.mkiv"/> + <cd:command name="luaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="luajitTeX" file="cont-log.mkiv"/> + <cd:command name="luajitTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="metaTeX" file="cont-log.mkiv"/> + <cd:command name="metaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="XeTeX" file="cont-log.mkiv"/> + <cd:command name="XeTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LuaTeX" file="cont-log.mkiv"/> + <cd:command name="LuaTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LuajitTeX" file="cont-log.mkiv"/> + <cd:command name="LuajitTeX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKII" file="cont-log.mkiv"/> + <cd:command name="MKII" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKIV" file="cont-log.mkiv"/> + <cd:command name="MKIV" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKVI" file="cont-log.mkiv"/> + <cd:command name="MKVI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKIX" file="cont-log.mkiv"/> + <cd:command name="MKIX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MKXI" file="cont-log.mkiv"/> + <cd:command name="MKXI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPII" file="cont-log.mkiv"/> + <cd:command name="MPII" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPIV" file="cont-log.mkiv"/> + <cd:command name="MPIV" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="MPVI" file="cont-log.mkiv"/> + <cd:command name="MPVI" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAFONT" file="cont-log.mkiv"/> + <cd:command name="METAFONT" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAPOST" file="cont-log.mkiv"/> + <cd:command name="METAPOST" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PPCHTEX" file="cont-log.mkiv"/> + <cd:command name="PPCHTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="CONTEXT" file="cont-log.mkiv"/> + <cd:command name="CONTEXT" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="METAFUN" file="cont-log.mkiv"/> + <cd:command name="METAFUN" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TEX" file="cont-log.mkiv"/> + <cd:command name="TEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LATEX" file="cont-log.mkiv"/> + <cd:command name="LATEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PICTEX" file="cont-log.mkiv"/> + <cd:command name="PICTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="TABLE" file="cont-log.mkiv"/> + <cd:command name="TABLE" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="AMSTEX" file="cont-log.mkiv"/> + <cd:command name="AMSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LAMSTEX" file="cont-log.mkiv"/> + <cd:command name="LAMSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="INRSTEX" file="cont-log.mkiv"/> + <cd:command name="INRSTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="ETEX" file="cont-log.mkiv"/> + <cd:command name="ETEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PDFTEX" file="cont-log.mkiv"/> + <cd:command name="PDFTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="PDFETEX" file="cont-log.mkiv"/> + <cd:command name="PDFETEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LUATEX" file="cont-log.mkiv"/> + <cd:command name="LUATEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="LUAJITTEX" file="cont-log.mkiv"/> + <cd:command name="LUAJITTEX" level="document" category="symbols" file="cont-log.mkiv"/> - <cd:command name="XETEX" file="cont-log.mkiv"/> + <cd:command name="XETEX" level="document" category="symbols" file="cont-log.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml index 9b31c5b96..c174a9f54 100644 --- a/tex/context/interface/mkiv/i-lohi.xml +++ b/tex/context/interface/mkiv/i-lohi.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelow" level="style" file="typo-scr.mkiv"> + <cd:command name="definelow" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplow" level="style" file="typo-scr.mkiv"> + <cd:command name="setuplow" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="low" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> + <cd:command name="low" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> @@ -46,13 +46,13 @@ </cd:instances> </cd:command> - <cd:command name="low" level="document" file="typo-scr.mkiv"> + <cd:command name="low" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definehigh" level="style" file="typo-scr.mkiv"> + <cd:command name="definehigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphigh" level="style" file="typo-scr.mkiv"> + <cd:command name="setuphigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="high" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> + <cd:command name="high" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> @@ -94,13 +94,13 @@ </cd:instances> </cd:command> - <cd:command name="high" level="document" file="typo-scr.mkiv"> + <cd:command name="high" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelowhigh" level="style" file="typo-scr.mkiv"> + <cd:command name="definelowhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -110,7 +110,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplowhigh" level="style" file="typo-scr.mkiv"> + <cd:command name="setuplowhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowhigh" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> + <cd:command name="lowhigh" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="lohi" level="document" file="typo-scr.mkiv"> + <cd:command name="lohi" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -158,7 +158,7 @@ </cd:arguments> </cd:command> - <cd:command name="hilo" level="document" file="typo-scr.mkiv"> + <cd:command name="hilo" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -169,7 +169,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelowmidhigh" level="style" file="typo-scr.mkiv"> + <cd:command name="definelowmidhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplowmidhigh" level="style" file="typo-scr.mkiv"> + <cd:command name="setuplowmidhigh" level="style" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -199,7 +199,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowmidhigh" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> + <cd:command name="lowmidhigh" generated="yes" variant="instance" level="document" category="fonts" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -210,7 +210,7 @@ </cd:arguments> </cd:command> - <cd:command name="lomihi" level="document" file="typo-scr.mkiv"> + <cd:command name="lomihi" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -218,7 +218,7 @@ </cd:arguments> </cd:command> - <cd:command name="himilo" level="document" file="typo-scr.mkiv"> + <cd:command name="himilo" level="document" category="fonts" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -226,4 +226,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml index b4aa8ab5c..c7f114251 100644 --- a/tex/context/interface/mkiv/i-lua.xml +++ b/tex/context/interface/mkiv/i-lua.xml @@ -4,190 +4,190 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="taggedctxcommand" level="system" file="back-exp.mkiv"> + <cd:command name="taggedctxcommand" level="system" category="lua" file="back-exp.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luafunction" level="system" file="cldf-ini.mkiv"> + <cd:command name="luafunction" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldprocessfile" level="system" file="cldf-ini.mkiv"> + <cd:command name="cldprocessfile" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldloadfile" level="system" file="cldf-ini.mkiv"> + <cd:command name="cldloadfile" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldcontext" level="system" file="cldf-ini.mkiv"> + <cd:command name="cldcontext" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldcommand" level="system" file="cldf-ini.mkiv"> + <cd:command name="cldcommand" level="system" category="lua" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectlua" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxdirectlua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatelua" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxlatelua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxsprint" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxsprint" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxcommand" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxcommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectcommand" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxdirectcommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatecommand" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxlatecommand" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxreport" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxreport" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlua" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxlua" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luacode" level="system" file="luat-cod.mkiv"> + <cd:command name="luacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="lateluacode" level="system" file="luat-cod.mkiv"> + <cd:command name="lateluacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="directluacode" level="system" file="luat-cod.mkiv"> + <cd:command name="directluacode" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaversion" level="system" file="luat-cod.mkiv"/> + <cd:command name="luaversion" level="system" category="lua" file="luat-cod.mkiv"/> - <cd:command name="registerctxluafile" level="system" file="luat-cod.mkiv"> + <cd:command name="registerctxluafile" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="ctxloadluafile" level="system" file="luat-cod.mkiv"> + <cd:command name="ctxloadluafile" level="system" category="lua" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="lua" type="environment" level="system" file="luat-ini.mkiv"/> + <cd:command name="lua" type="environment" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luacode" type="environment" level="system" file="luat-ini.mkiv"/> + <cd:command name="luacode" type="environment" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luamajorversion" level="system" file="luat-ini.mkiv"/> + <cd:command name="luamajorversion" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luaminorversion" level="system" file="luat-ini.mkiv"/> + <cd:command name="luaminorversion" level="system" category="lua" file="luat-ini.mkiv"/> - <cd:command name="luaexpanded" level="system" file="luat-ini.mkiv"> + <cd:command name="luaexpanded" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" type="environment" level="system" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" level="system" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="luaconditional" level="system" file="luat-ini.mkiv"> + <cd:command name="luaconditional" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ctxluacode" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxluacode" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" type="environment" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> - <cd:command name="ctxfunction" type="environment" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" type="environment" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" level="system" category="lua" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" generated="yes" variant="example" level="system" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunction"/> </cd:sequence> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml index 39fe9d112..dc2bd9ad4 100644 --- a/tex/context/interface/mkiv/i-makeup.xml +++ b/tex/context/interface/mkiv/i-makeup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemakeup" level="style" file="page-mak.mkvi"> + <cd:command name="definemakeup" level="style" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmakeup" level="style" file="page-mak.mkvi"> + <cd:command name="setupmakeup" level="style" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -104,7 +104,7 @@ <cd:constant type="empty" default="yes"/> </cd:parameter> <cd:parameter name="style"> - <cd:inherit name="value-style"/> + <cd:resolve name="value-style"/> </cd:parameter> <cd:parameter name="color"> <cd:constant type="cd:color"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" level="document" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -122,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mak.mkvi"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -139,7 +139,7 @@ <!-- - <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi"> + <cd:command name="standardmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmakeup"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="textmakeup" type="environment" file="page-mak.mkvi"> + <cd:command name="textmakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmakeup"/> @@ -155,7 +155,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi"> + <cd:command name="pagemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmakeup"/> @@ -163,7 +163,7 @@ </cd:arguments> </cd:command> - <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi"> + <cd:command name="middlemakeup" type="environment" level="document" category="structure layout" file="page-mak.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmakeup"/> @@ -173,4 +173,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml index 89aca949a..0d0e3c2b4 100644 --- a/tex/context/interface/mkiv/i-marginblock.xml +++ b/tex/context/interface/mkiv/i-marginblock.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarginblock" level="style" file="page-mbk.mkvi"> + <cd:command name="definemarginblock" level="style" category="structure layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginblock" level="style" file="page-mbk.mkvi"> + <cd:command name="setupmarginblock" level="style" category="structure layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -67,7 +67,7 @@ <!-- - <cd:command name="setupmarginblocks" file="page-mbk.mkvi"> + <cd:command name="setupmarginblocks" level="style" category="structure layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -78,10 +78,10 @@ --> - <cd:command name="marginblock" type="environment" file="page-mbk.mkvi"> + <cd:command name="marginblock" type="environment" level="document" category="structure layout" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml index 2f77e71a0..0ebf17825 100644 --- a/tex/context/interface/mkiv/i-margindata.xml +++ b/tex/context/interface/mkiv/i-margindata.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemargindata" level="style" file="typo-mar.mkiv"> + <cd:command name="definemargindata" level="style" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmargindata" level="style" file="typo-mar.mkiv"> + <cd:command name="setupmargindata" level="style" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +107,7 @@ <!-- - <cd:command name="definemarginframed" file="typo-mar.mkiv"> + <cd:command name="definemarginframed" level="system" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -119,7 +119,7 @@ --> - <cd:command name="setupmarginframed" level="style" file="typo-mar.mkiv"> + <cd:command name="setupmarginframed" level="style" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -128,7 +128,7 @@ </cd:arguments> </cd:command> - <cd:command name="margindata" generated="yes" variant="instance" level="document" file="typo-mar.mkiv"> + <cd:command name="margindata" generated="yes" variant="instance" level="document" category="structure" file="typo-mar.mkiv"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -149,7 +149,7 @@ </cd:instances> </cd:command> - <cd:command name="margindata" level="document" file="typo-mar.mkiv"> + <cd:command name="margindata" level="document" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -167,7 +167,7 @@ <!-- - <cd:command name="inleftmargin" file="typo-mar.mkiv"> + <cd:command name="inleftmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="inrightmargin" file="typo-mar.mkiv"> + <cd:command name="inrightmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -191,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="inoutermargin" file="typo-mar.mkiv"> + <cd:command name="inoutermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininnermargin" file="typo-mar.mkiv"> + <cd:command name="ininnermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -215,7 +215,7 @@ </cd:arguments> </cd:command> - <cd:command name="inleftedge" file="typo-mar.mkiv"> + <cd:command name="inleftedge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="inrightedge" file="typo-mar.mkiv"> + <cd:command name="inrightedge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininneredge" file="typo-mar.mkiv"> + <cd:command name="ininneredge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -251,7 +251,7 @@ </cd:arguments> </cd:command> - <cd:command name="inouteredge" file="typo-mar.mkiv"> + <cd:command name="inouteredge" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="atleftmargin" file="typo-mar.mkiv"> + <cd:command name="atleftmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -275,7 +275,7 @@ </cd:arguments> </cd:command> - <cd:command name="atrightmargin" file="typo-mar.mkiv"> + <cd:command name="atrightmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -287,7 +287,7 @@ </cd:arguments> </cd:command> - <cd:command name="inleft" file="typo-mar.mkiv"> + <cd:command name="inleft" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -302,7 +302,7 @@ </cd:arguments> </cd:command> - <cd:command name="inright" file="typo-mar.mkiv"> + <cd:command name="inright" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -317,7 +317,7 @@ </cd:arguments> </cd:command> - <cd:command name="ininner" file="typo-mar.mkiv"> + <cd:command name="ininner" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="inouter" file="typo-mar.mkiv"> + <cd:command name="inouter" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -347,7 +347,7 @@ </cd:arguments> </cd:command> - <cd:command name="inmargin" file="typo-mar.mkiv"> + <cd:command name="inmargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -362,7 +362,7 @@ </cd:arguments> </cd:command> - <cd:command name="inother" file="typo-mar.mkiv"> + <cd:command name="inother" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -377,7 +377,7 @@ </cd:arguments> </cd:command> - <cd:command name="margintext" file="typo-mar.mkiv"> + <cd:command name="margintext" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -389,7 +389,7 @@ </cd:arguments> </cd:command> - <cd:command name="marginword" file="typo-mar.mkiv"> + <cd:command name="marginword" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -401,7 +401,7 @@ </cd:arguments> </cd:command> - <cd:command name="margintitle" file="typo-mar.mkiv"> + <cd:command name="margintitle" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -413,7 +413,7 @@ </cd:arguments> </cd:command> - <cd:command name="inothermargin" file="typo-mar.mkiv"> + <cd:command name="inothermargin" level="document" category="structure" file="typo-mar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -430,4 +430,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marker.xml b/tex/context/interface/mkiv/i-marker.xml index d01aee822..2db8a9de1 100644 --- a/tex/context/interface/mkiv/i-marker.xml +++ b/tex/context/interface/mkiv/i-marker.xml @@ -4,30 +4,30 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarker" level="system" file="attr-mkr.mkiv"> + <cd:command name="definemarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setmarker" level="system" file="attr-mkr.mkiv"> + <cd:command name="setmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetmarker" level="system" file="attr-mkr.mkiv"> + <cd:command name="resetmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="boxmarker" level="system" file="attr-mkr.mkiv"> + <cd:command name="boxmarker" level="system" category="attribute" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml index cb1bf11af..914922cf2 100644 --- a/tex/context/interface/mkiv/i-marking.xml +++ b/tex/context/interface/mkiv/i-marking.xml @@ -43,14 +43,14 @@ </cd:arguments> </cd:command> - <cd:command name="setmarking" file="strc-mar.mkiv"> + <cd:command name="setmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="resetmarking" file="strc-mar.mkiv"> + <cd:command name="resetmarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemarking" level="system" file="strc-mar.mkiv"> + <cd:command name="doifelsemarking" level="system" category="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmarkingelse" level="system" file="strc-mar.mkiv"> + <cd:command name="doifmarkingelse" level="system" category="conditional" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -171,4 +171,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index d83acda68..6563590ef 100644 --- a/tex/context/interface/mkiv/i-math.xml +++ b/tex/context/interface/mkiv/i-math.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathematics" category="mathematics" level="style" file="math-ini.mkiv"> + <cd:command name="definemathematics" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathematics" category="mathematics" level="style" file="math-ini.mkiv"> + <cd:command name="setupmathematics" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -106,35 +106,35 @@ </cd:arguments> </cd:command> - <cd:command name="inlineordisplaymath" level="system" file="math-ini.mkiv"> + <cd:command name="inlineordisplaymath" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mathematics" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathematics" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="math" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="math" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="m" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="m" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definemathcommand" category="mathematics" level="style" file="math-ini.mkiv"> + <cd:command name="definemathcommand" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -164,7 +164,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathcommand" generated="yes" variant="example" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mathcommand" generated="yes" variant="example" level="document" category="mathematics" file="math-ini.mkiv"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -174,63 +174,67 @@ </cd:arguments> </cd:command> - <cd:command name="mathcommand" category="mathematics" file="math-ini.mkiv"> - <cd:arguments> - <cd:resolve name="argument-name"/> - </cd:arguments> - </cd:command> + <!-- + + <cd:command name="mathcommand" level="document" category="mathematics" file="math-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + --> - <cd:command name="mathop" file="math-ini.mkiv"> + <cd:command name="mathop" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mbox" file="math-ini.mkiv"> + <cd:command name="mbox" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mtext" file="math-ini.mkiv"> + <cd:command name="mtext" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mathfunction" file="math-ini.mkiv"> + <cd:command name="mathfunction" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunction" file="math-ini.mkiv"> + <cd:command name="mfunction" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunctionlabeltext" level="system" file="math-ini.mkiv"> + <cd:command name="mfunctionlabeltext" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="stackrel" file="math-ini.mkiv"> + <cd:command name="stackrel" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="apply" file="math-ini.mkiv"> + <cd:command name="apply" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definemathstyle" file="math-ini.mkiv"> + <cd:command name="definemathstyle" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -239,7 +243,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathstyle" file="math-ini.mkiv"> + <cd:command name="setupmathstyle" level="style" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-mathstyle"/> @@ -248,7 +252,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmathstyle" file="math-ini.mkiv"> + <cd:command name="setmathstyle" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:resolve name="value-mathstyle"/> @@ -257,7 +261,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathstyle" type="environment" file="math-ini.mkiv"> + <cd:command name="mathstyle" type="environment" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-mathstyle"/> @@ -266,221 +270,221 @@ </cd:arguments> </cd:command> - <cd:command name="mathstyle" type="environment" begin="push" end="pop" level="system" file="math-ini.mkiv"/> + <cd:command name="mathstyle" type="environment" begin="push" end="pop" level="system" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="usemathstyleparameter" level="system" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usemathstyleparameter" type="environment" level="system" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" type="environment" level="system" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="mathtext" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtext" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtexttf" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtexttf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextit" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtextit" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextsl" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtextsl" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbf" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtextbf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbi" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtextbi" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbs" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathtextbs" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathword" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathword" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordtf" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordtf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordit" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordit" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordsl" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordsl" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbf" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordbf" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbi" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordbi" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbs" category="mathematics" level="document" file="math-ini.mkiv"> + <cd:command name="mathwordbs" level="document" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathrm" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathrm" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathss" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathss" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathtt" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathtt" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathtf" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathtf" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathsl" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathsl" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathit" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathit" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbf" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathbf" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbi" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathbi" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathbs" category="mathematics" level="document" file="math-ini.mkiv"/> + <cd:command name="mathbs" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathitalic" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathitalic" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathupright" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathupright" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathdefault" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathdefault" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathscript" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathscript" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathfraktur" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathfraktur" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathblackboard" category="mathematics" file="math-ini.mkiv"/> + <cd:command name="mathblackboard" level="document" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="displaymath" file="supp-mat.mkiv"> + <cd:command name="displaymath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="inlinemath" file="supp-mat.mkiv"> + <cd:command name="inlinemath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="textmath" file="supp-mat.mkiv"> + <cd:command name="textmath" level="style" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="imath" type="environment" file="supp-mat.mkiv"/> + <cd:command name="imath" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="dmath" type="environment" file="supp-mat.mkiv"/> + <cd:command name="dmath" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="mathmode" type="environment" file="supp-mat.mkiv"/> + <cd:command name="mathmode" type="environment" level="system" category="mathematics" file="supp-mat.mkiv"/> - <cd:command name="nonmathematics" file="supp-mat.mkiv"> + <cd:command name="nonmathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="displaymathematics" file="supp-mat.mkiv"> + <cd:command name="displaymathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="inlinemathematics" file="supp-mat.mkiv"> + <cd:command name="inlinemathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="automathematics" file="supp-mat.mkiv"> + <cd:command name="automathematics" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cramped" file="supp-mat.mkiv"> + <cd:command name="cramped" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedllap" file="supp-mat.mkiv"> + <cd:command name="crampedllap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedrlap" file="supp-mat.mkiv"> + <cd:command name="crampedrlap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="crampedclap" file="supp-mat.mkiv"> + <cd:command name="crampedclap" level="system" category="mathematics" file="supp-mat.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autointegral" file="math-del.mkiv"> + <cd:command name="autointegral" level="system" category="mathematics" file="math-del.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -488,4 +492,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml index c4154e084..325b288c7 100644 --- a/tex/context/interface/mkiv/i-mathalignment.xml +++ b/tex/context/interface/mkiv/i-mathalignment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathalignment" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="definemathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathalignment" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="setupmathalignment" level="style" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -69,7 +69,7 @@ <!-- - <cd:command name="mathalignment" type="environment" file="math-ali.mkiv"> + <cd:command name="mathalignment" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathalignment"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="align" type="environment" file="math-ali.mkiv"> + <cd:command name="align" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathalignment"/> @@ -87,4 +87,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml index 75f4040d1..837f2b782 100644 --- a/tex/context/interface/mkiv/i-mathcases.xml +++ b/tex/context/interface/mkiv/i-mathcases.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathcases" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="definemathcases" level="style" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathcases" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="setupmathcases" level="style" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathcases" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="mathcases" type="environment" generated="yes" variant="instance" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -57,7 +57,7 @@ <!-- - <cd:command name="mathcases" type="environment" file="math-ali.mkiv"> + <cd:command name="mathcases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathcases"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="cases" type="environment" file="math-ali.mkiv"> + <cd:command name="cases" type="environment" level="document" category="mathematics alignment" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathcases"/> @@ -75,4 +75,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml index 5b0bf2d56..097863889 100644 --- a/tex/context/interface/mkiv/i-mathfence.xml +++ b/tex/context/interface/mkiv/i-mathfence.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathfence" category="mathematics" level="style" file="math-fen.mkiv"> + <cd:command name="definemathfence" level="style" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathfence" category="mathematics" level="style" file="math-fen.mkiv"> + <cd:command name="setupmathfence" level="style" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="fence" generated="yes" variant="example" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="fence" generated="yes" variant="example" level="document" category="mathematics" file="math-fen.mkiv"> <cd:sequence> <cd:variable value="fence"/> </cd:sequence> @@ -61,147 +61,147 @@ </cd:arguments> </cd:command> - <cd:command name="fenced" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="fenced" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fence" category="mathematics" level="document" file="math-fen.mkiv"/> + <cd:command name="fence" level="document" category="mathematics" file="math-fen.mkiv"/> - <cd:command name="left" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="left" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="middle" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="middle" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="right" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="right" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="big" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="big" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Big" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Big" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigg" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="bigg" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigg" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Bigg" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigl" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="bigl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigm" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="bigm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigr" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="bigr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigl" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Bigl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigm" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Bigm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigr" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Bigr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggl" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="biggl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggm" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="biggm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggr" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="biggr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggl" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Biggl" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggm" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Biggm" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggr" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="Biggr" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="lfence" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="lfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="mfence" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="mfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="rfence" category="mathematics" level="document" file="math-fen.mkiv"> + <cd:command name="rfence" level="document" category="mathematics" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="checkedfences" category="mathematics" type="environment" file="math-fen.mkiv"/> + <cd:command name="checkedfences" type="environment" level="style" category="mathematics" file="math-fen.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml index 50a0f0e1e..64056dee6 100644 --- a/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/tex/context/interface/mkiv/i-mathmatrix.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathmatrix" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="definemathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathmatrix" category="mathematics" level="style" file="math-ali.mkiv"> + <cd:command name="setupmathmatrix" level="style" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -69,7 +69,7 @@ <!-- - <cd:command name="mathmatrix" type="environment" file="math-ali.mkiv"> + <cd:command name="mathmatrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="matrix" type="environment" file="math-ali.mkiv"> + <cd:command name="matrix" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -87,7 +87,7 @@ --> - <cd:command name="matrices" type="environment" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -95,28 +95,44 @@ </cd:arguments> </cd:command> - <cd:command name="intertext" type="environment" category="mathematics" level="document" file="math-ali.mkiv"/> + <cd:command name="intertext" type="environment" level="document" category="mathematics" file="math-ali.mkiv"/> - <cd:command name="intertext" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="intertext" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="substack" type="environment" category="mathematics" level="document" file="math-ali.mkiv"/> + <cd:command name="substack" type="environment" level="document" category="mathematics" file="math-ali.mkiv"/> - <cd:command name="overset" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="overset" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="underset" category="mathematics" level="document" file="math-ali.mkiv"> + <cd:command name="underset" level="document" category="mathematics" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="bordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="bbordermatrix" level="document" category="mathematics tables" file="math-pln.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="bordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/> + + <cd:command name="bbordermatrix" type="environment" level="document" category="mathematics tables" file="math-pln.mkiv"/> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathornament.xml b/tex/context/interface/mkiv/i-mathornament.xml index 9aad469ed..70100b8e4 100644 --- a/tex/context/interface/mkiv/i-mathornament.xml +++ b/tex/context/interface/mkiv/i-mathornament.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathornament" category="mathematics" level="style" file="math-rad.mkvi"> + <cd:command name="definemathornament" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathornament" category="mathematics" level="style" file="math-rad.mkvi"> + <cd:command name="setupmathornament" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathornament" generated="yes" variant="example" category="mathematics" level="document" file="math-rad.mkvi"> + <cd:command name="mathornament" generated="yes" variant="example" level="document" category="mathematics" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathornament"/> </cd:sequence> @@ -43,4 +43,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathradical.xml b/tex/context/interface/mkiv/i-mathradical.xml index 5fa4876f4..a7ba93b75 100644 --- a/tex/context/interface/mkiv/i-mathradical.xml +++ b/tex/context/interface/mkiv/i-mathradical.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathradical" category="mathematics" level="style" file="math-rad.mkvi"> + <cd:command name="definemathradical" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathradical" category="mathematics" level="style" file="math-rad.mkvi"> + <cd:command name="setupmathradical" level="style" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathradical" generated="yes" variant="example" category="mathematics" level="document" file="math-rad.mkvi"> + <cd:command name="mathradical" generated="yes" variant="example" level="document" category="mathematics" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathradical"/> </cd:sequence> @@ -46,11 +46,11 @@ </cd:arguments> </cd:command> - <cd:command name="sqrt" category="mathematics" level="document" file="math-rad.mkvi"> + <cd:command name="sqrt" level="document" category="mathematics" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-optional"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml index 7a130f74c..3e6613022 100644 --- a/tex/context/interface/mkiv/i-mathstackers.xml +++ b/tex/context/interface/mkiv/i-mathstackers.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemathstackers" category="mathematics" level="style" file="math-stc.mkvi"> + <cd:command name="definemathstackers" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathstackers" category="mathematics" level="style" file="math-stc.mkvi"> + <cd:command name="setupmathstackers" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -107,7 +107,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -120,23 +120,28 @@ </cd:arguments> </cd:command> - <cd:command name="mathextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathextensible"/> + <cd:instance value="mathextensible"/> </cd:sequence> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> + <!-- + <cd:keywords optional="yes"> + <cd:constant type="reverse"/> + <cd:constant type="mathematics"/> + <cd:constant type="text"/> + <cd:constant type="chemistry"/> + </cd:keywords> + --> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathextensible"/> + </cd:instances> </cd:command> - <cd:command name="definemathoverextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathoverextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -147,7 +152,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathoverextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathoverextensible" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -156,1613 +161,1042 @@ </cd:arguments> </cd:command> - <cd:command name="definemathunderextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathover" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bottom"/> + <cd:keywords> + <cd:constant type="top"/> <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathunderextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathunderextensible"/> - </cd:sequence> + <cd:command name="mathover" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="top"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathdoubleextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathunderextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="both"/> + <cd:constant type="bottom"/> <cd:constant type="vfenced"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> - <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathdoubleextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathunderextensible" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathdoubleextensible"/> + <cd:variable value="mathunderextensible"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathovertextextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathunder" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:keywords> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathovertextextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathovertextextensible"/> - </cd:sequence> + <cd:command name="mathunder" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bottom"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="definemathundertextextensible" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathdoubleextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> - <cd:constant type="bothtext"/> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> </cd:keywords> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="mathundertextextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathdoubleextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> - <cd:variable value="mathundertextextensible"/> + <cd:instance value="mathdoubleextensible"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathdoubleextensible"/> + </cd:instances> </cd:command> - <cd:command name="definemathtriplet" category="mathematics" file="math-sty.mkvi"> + <cd:command name="definemathdouble" level="style" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-optional"/> + <cd:keywords> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> + <cd:constant type="cd:name"/> + </cd:keywords> <cd:resolve name="keyword-name"/> - <cd:resolve name="keyword-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathtriplet" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> - <cd:sequence> - <cd:variable value="mathtriplet"/> - </cd:sequence> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mathtriplet" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xequal" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xRightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xLeftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xmapsto" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xhookrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightoverleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xleftrightharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xrightleftharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="xtriplerel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mequal" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mRightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mLeftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mmapsto" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mhookrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightoverleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mleftrightharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mrightleftharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="mtriplerel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftarrowfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightarrowfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftrightarrowfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="etwoheadrightarrowfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoondownfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eleftharpoonupfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoondownfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="erightharpoonupfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbarfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbarfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracefill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracefill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverparentfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderparentfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eoverbracketfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="eunderbracketfill" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tequal" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tmapsto" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tRightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tLeftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="thookrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightoverleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="tleftrightharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="trightleftharpoons" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="ttriplerel" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="cleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="crightoverleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <!-- - <cd:keywords optional="yes"> - <cd:constant type="reverse"/> - <cd:constant type="mathematics"/> - <cd:constant type="text"/> - <cd:constant type="chemistry"/> - </cd:keywords> - --> - <cd:resolve name="argument-text-optional"/> - <cd:resolve name="argument-text-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="undertwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underleftharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underrightharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbar" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbrace" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underparent" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="underbracket" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overtwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overleftharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoondown" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overrightharpoonup" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbar" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbrace" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparent" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracket" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebar" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebrace" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doubleparent" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="doublebracket" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbarunderbar" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbraceunderbrace" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overparentunderparent" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> - - <cd:command name="overbracketunderbracket" category="mathematics" file="math-stc.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="overbartext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathdouble" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="both"/> + <cd:constant type="vfenced"/> + </cd:keywords> + <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="overbracetext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="definemathovertextextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> + </cd:keywords> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="overparenttext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathovertextextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:instance value="mathovertextextensible"/> + </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathovertextextensible"/> + </cd:instances> </cd:command> - <cd:command name="overbrackettext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="definemathundertextextensible" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:keywords optional="yes"> + <cd:constant type="bothtext"/> + </cd:keywords> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="underbartext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathundertextextensible" generated="yes" variant="instance" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:instance value="mathundertextextensible"/> + </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-mathundertextextensible"/> + </cd:instances> </cd:command> - <cd:command name="underbracetext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="definemathtriplet" level="system" category="mathematics" file="math-sty.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="underparenttext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathtriplet" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:sequence> + <cd:variable value="mathtriplet"/> + </cd:sequence> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="underbrackettext" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathtriplet" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> - <cd:resolve name="argument-text"/> - <cd:resolve name="argument-text"/> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> - <cd:command name="singlebond" file="math-stc.mkvi"/> - - <cd:command name="doublebond" file="math-stc.mkvi"/> - - <cd:command name="triplebond" file="math-stc.mkvi"/> - - <cd:command name="definemathunstacked" category="mathematics" file="math-stc.mkvi"> + <!-- + + <cd:command name="xrel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xequal" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xmapsto" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xhookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xhookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xrightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xrightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="xtriplerel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mequal" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mmapsto" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mhookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mhookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mrightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="mtriplerel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eleftarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="erightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eleftrightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="etwoheadrightarrowfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eleftharpoondownfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eleftharpoonupfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="erightharpoondownfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="erightharpoonupfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eoverbarfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eunderbarfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eoverbracefill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eunderbracefill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eoverparentfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eunderparentfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eoverbracketfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="eunderbracketfill" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tequal" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tmapsto" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tLeftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tRightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tLeftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="ttwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="ttwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="thookleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="thookrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="tleftrightharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="trightleftharpoons" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="ttriplerel" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="cleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="crightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="crightoverleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text-optional"/> + <cd:resolve name="argument-text-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="underleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="undertwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="undertwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbar" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbrace" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underparent" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbracket" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overleftrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overtwoheadleftarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overtwoheadrightarrow" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overleftharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overleftharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overrightharpoondown" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overrightharpoonup" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbar" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbrace" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overparent" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbracket" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="doublebar" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="doublebrace" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="doubleparent" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="doublebracket" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbarunderbar" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbraceunderbrace" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overparentunderparent" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbracketunderbracket" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbartext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbracetext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overparenttext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overbrackettext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbartext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbracetext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underparenttext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="underbrackettext" level="document" category="mathematics" file="math-stc.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="singlebond" level="document" category="mathematics" file="math-stc.mkvi"/> + + <cd:command name="doublebond" level="document" category="mathematics" file="math-stc.mkvi"/> + + <cd:command name="triplebond" level="document" category="mathematics" file="math-stc.mkvi"/> + + <cd:command name="definemathunstacked" level="document" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -1772,18 +1206,18 @@ </cd:arguments> </cd:command> - <cd:command name="mathunstacked" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> + <cd:command name="mathunstacked" generated="yes" variant="example" level="document" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> </cd:command> - <cd:command name="And" file="math-stc.mkvi"/> + <cd:command name="And" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="impliedby" file="math-stc.mkvi"/> + <cd:command name="impliedby" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="implies" file="math-stc.mkvi"/> + <cd:command name="implies" level="document" category="mathematics" file="math-stc.mkvi"/> - <cd:command name="iff" file="math-stc.mkvi"/> + <cd:command name="iff" level="document" category="mathematics" file="math-stc.mkvi"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml index b12479a22..0e703d66f 100644 --- a/tex/context/interface/mkiv/i-metapost.xml +++ b/tex/context/interface/mkiv/i-metapost.xml @@ -4,21 +4,21 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="MPdefinitions" type="environment" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="MPdefinitions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPextensions" type="environment" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="MPextensions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPinitializations" type="environment" category="graphics" level="style" file="meta-ini.mkiv"/> + <cd:command name="MPinitializations" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="MPinclusions" type="environment" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPinclusions" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineMPinstance" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="defineMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPinstance" category="graphics" level="style" file="meta-ini.mkiv"> + <cd:command name="setupMPinstance" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -83,19 +83,19 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPinstance" category="graphics" file="meta-ini.mkiv"> + <cd:command name="resetMPinstance" level="system" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="processMPfigurefile" category="graphics" file="meta-ini.mkiv"> + <cd:command name="processMPfigurefile" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="MPdrawing" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> @@ -103,85 +103,85 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPdrawing" category="graphics" file="meta-ini.mkiv"/> + <cd:command name="resetMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="getMPdrawing" category="graphics" file="meta-ini.mkiv"/> + <cd:command name="getMPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" type="environment" begin="push" end="pop" category="graphics" file="meta-ini.mkiv"/> + <cd:command name="MPdrawing"level="system" type="environment" begin="push" end="pop" category="graphics metapost" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPclip" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPclip" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPfontsizehskip" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPfontsizehskip" level="system" category="graphics metapost fonts" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="setupMPvariables" file="meta-ini.mkiv"> + <cd:command name="setupMPvariables" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="setMPvariables" file="meta-ini.mkiv"> + <cd:command name="setMPvariables" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="setMPvariable" file="meta-ini.mkiv"> + <cd:command name="setMPvariable" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="MPrawvar" file="meta-ini.mkiv"> + <cd:command name="MPrawvar" level="system" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvariable" file="meta-ini.mkiv"> + <cd:command name="MPvariable" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="MPvar" file="meta-ini.mkiv"> + <cd:command name="MPvar" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="useMPvariables" file="meta-ini.mkiv"> + <cd:command name="useMPvariables" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-key-list"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPgraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPgraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -192,14 +192,14 @@ </cd:arguments> </cd:command> - <cd:command name="useMPgraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPgraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -210,14 +210,14 @@ </cd:arguments> </cd:command> - <cd:command name="usableMPgraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="usableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="reuseMPgraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="reuseMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -228,14 +228,14 @@ </cd:arguments> </cd:command> - <cd:command name="reusableMPgraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="reusableMPgraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -246,14 +246,14 @@ </cd:arguments> </cd:command> - <cd:command name="uniqueMPpagegraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="uniqueMPpagegraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -264,19 +264,19 @@ </cd:arguments> </cd:command> - <cd:command name="processMPbuffer" category="graphics" file="meta-ini.mkiv"> + <cd:command name="processMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="runMPbuffer" category="graphics" file="meta-ini.mkiv"> + <cd:command name="runMPbuffer" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPenvironment" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPenvironment" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -286,72 +286,72 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPenvironment" category="graphics" file="meta-ini.mkiv"/> + <cd:command name="resetMPenvironment" clevel="style" ategory="graphics" file="meta-ini.mkiv"/> - <cd:command name="useMPenvironmentbuffer" category="graphics" file="meta-ini.mkiv"> + <cd:command name="useMPenvironmentbuffer" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPcode" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPcode" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPrun" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPrun" type="environment" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPrun" category="graphics" file="meta-ini.mkiv"> + <cd:command name="useMPrun" level="document" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="useMPlibrary" category="graphics" file="meta-ini.mkiv"> + <cd:command name="useMPlibrary" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setMPtext" category="graphics" file="meta-ini.mkiv"> + <cd:command name="setMPtext" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="MPtext" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPtext" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPstring" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPstring" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPbetex" category="graphics" file="meta-ini.mkiv"> + <cd:command name="MPbetex" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseMPgraphic" category="graphics" file="meta-ini.mkiv"> + <cd:command name="doifelseMPgraphic" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -359,7 +359,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifMPgraphicelse" category="graphics" file="meta-ini.mkiv"> + <cd:command name="doifMPgraphicelse" level="style" category="graphics metapost conditional" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -367,20 +367,20 @@ </cd:arguments> </cd:command> - <cd:command name="staticMPfigure" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="staticMPfigure" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="staticMPgraphic" type="environment" category="graphics" file="meta-ini.mkiv"> + <cd:command name="staticMPgraphic" type="environment" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="usestaticMPfigure" category="graphics" file="meta-ini.mkiv"> + <cd:command name="usestaticMPfigure" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -389,7 +389,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupMPgraphics" category="graphics" file="meta-ini.mkiv"> + <cd:command name="setupMPgraphics" level="style" category="graphics metapost" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -403,4 +403,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml index 447e0e761..4e1ab9625 100644 --- a/tex/context/interface/mkiv/i-mixedcolumns.xml +++ b/tex/context/interface/mkiv/i-mixedcolumns.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemixedcolumns" level="style" file="page-mix.mkiv"> + <cd:command name="definemixedcolumns" level="style" category="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmixedcolumns" level="style" file="page-mix.mkiv"> + <cd:command name="setupmixedcolumns" level="style" category="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="mixedcolumns" type="environment" level="document" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-mix.mkiv"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -121,7 +121,7 @@ <!-- - <cd:command name="boxedcolumns" type="environment" file="page-mix.mkiv"> + <cd:command name="boxedcolumns" type="environment" level="document" category="structure layout" file="page-mix.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmixedcolumns"/> @@ -131,4 +131,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml index b1e80c7dd..8b35da6f8 100644 --- a/tex/context/interface/mkiv/i-modes.xml +++ b/tex/context/interface/mkiv/i-modes.xml @@ -4,79 +4,79 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="newmode" level="system" file="core-env.mkiv"> + <cd:command name="newmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setmode" level="system" file="core-env.mkiv"> + <cd:command name="setmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetmode" level="system" file="core-env.mkiv"> + <cd:command name="resetmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsystemmode" level="system" file="core-env.mkiv"> + <cd:command name="newsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setsystemmode" level="system" file="core-env.mkiv"> + <cd:command name="setsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsystemmode" level="system" file="core-env.mkiv"> + <cd:command name="resetsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="preventmode" file="core-env.mkiv"> + <cd:command name="preventmode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="enablemode" file="core-env.mkiv"> + <cd:command name="enablemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disablemode" file="core-env.mkiv"> + <cd:command name="disablemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globalpreventmode" level="system" file="core-env.mkiv"> + <cd:command name="globalpreventmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globalenablemode" level="system" file="core-env.mkiv"> + <cd:command name="globalenablemode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globaldisablemode" level="system" file="core-env.mkiv"> + <cd:command name="globaldisablemode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="definemode" file="core-env.mkiv"> + <cd:command name="definemode" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:keywords optional="yes"> @@ -87,13 +87,13 @@ </cd:arguments> </cd:command> - <cd:command name="booleanmodevalue" level="system" file="core-env.mkiv"> + <cd:command name="booleanmodevalue" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemode" file="core-env.mkiv"> + <cd:command name="doifelsemode" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -101,7 +101,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmodeelse" file="core-env.mkiv"> + <cd:command name="doifmodeelse" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -109,33 +109,33 @@ </cd:arguments> </cd:command> - <cd:command name="doifmode" file="core-env.mkiv"> + <cd:command name="doifmode" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotmode" file="core-env.mkiv"> + <cd:command name="doifnotmode" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="mode" type="environment" file="core-env.mkiv"> + <cd:command name="mode" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="notmode" type="environment" file="core-env.mkiv"> + <cd:command name="notmode" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelseallmodes" file="core-env.mkiv"> + <cd:command name="doifelseallmodes" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -143,7 +143,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallmodeselse" file="core-env.mkiv"> + <cd:command name="doifallmodeselse" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -151,7 +151,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifallmodes" file="core-env.mkiv"> + <cd:command name="doifallmodes" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -159,7 +159,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotallmodes" file="core-env.mkiv"> + <cd:command name="doifnotallmodes" level="style" category="structure conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -167,19 +167,19 @@ </cd:arguments> </cd:command> - <cd:command name="allmodes" type="environment" file="core-env.mkiv"> + <cd:command name="allmodes" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="notallmodes" type="environment" file="core-env.mkiv"> + <cd:command name="notallmodes" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="modeset" type="environment" file="core-env.mkiv"> + <cd:command name="modeset" type="environment" level="style" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -189,28 +189,28 @@ </cd:arguments> </cd:command> - <cd:command name="pushmode" level="system" file="core-env.mkiv"> + <cd:command name="pushmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="popmode" level="system" file="core-env.mkiv"> + <cd:command name="popmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="pushsystemmode" level="system" file="core-env.mkiv"> + <cd:command name="pushsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="popsystemmode" level="system" file="core-env.mkiv"> + <cd:command name="popsystemmode" level="system" category="structure" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml index 2916090f8..03ed005e2 100644 --- a/tex/context/interface/mkiv/i-modules.xml +++ b/tex/context/interface/mkiv/i-modules.xml @@ -24,7 +24,7 @@ <!-- - <cd:command name="usemodules" file="file-mod.mkvi"> + <cd:command name="usemodules" level="style" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -44,7 +44,7 @@ --> - <cd:command name="usetexmodule" file="file-mod.mkvi"> + <cd:command name="usetexmodule" level="style" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -123,4 +123,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml index 0486dd4b6..f38f515a7 100644 --- a/tex/context/interface/mkiv/i-narrow.xml +++ b/tex/context/interface/mkiv/i-narrow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definenarrower" level="style" file="spac-hor.mkiv"> + <cd:command name="definenarrower" level="style" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnarrower" level="style" file="spac-hor.mkiv"> + <cd:command name="setupnarrower" level="style" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrower" type="environment" level="document" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="left" prefix="cd:sign" method="none"/> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" level="document" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -86,7 +86,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="name" level="document" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="name" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords list="yes" optional="yes"> @@ -101,7 +101,7 @@ </cd:arguments> </cd:command> - <cd:command name="narrow" type="environment" variant="assignment" level="document" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="assignment" level="document" category="whitespace layout" file="spac-hor.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -118,4 +118,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml index 535b2be55..ac9ea9383 100644 --- a/tex/context/interface/mkiv/i-naturaltable.xml +++ b/tex/context/interface/mkiv/i-naturaltable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupTABLE" category="tables" level="style" file="tabl-ntb.mkiv"> + <cd:command name="setupTABLE" level="style" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -131,7 +131,7 @@ </cd:arguments> </cd:command> - <cd:command name="TD" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TD" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -160,7 +160,7 @@ </cd:arguments> </cd:command> - <cd:command name="TR" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TR" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -168,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="TC" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TC" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -176,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="TX" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TX" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="TY" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TY" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="TH" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TH" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -200,7 +200,7 @@ </cd:arguments> </cd:command> - <cd:command name="TN" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TN" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> @@ -208,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -216,7 +216,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -224,7 +224,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -232,7 +232,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" begin="b" end="e" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -240,7 +240,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineTABLEsetup" category="tables" level="style" file="tabl-ntb.mkiv"> + <cd:command name="defineTABLEsetup" level="style" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -249,19 +249,19 @@ </cd:arguments> </cd:command> - <cd:command name="TDs" type="environment" begin="b" end="e" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TDs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TRs" type="environment" begin="b" end="e" category="tables" file="tabl-ntb.mkiv"> + <cd:command name="TRs" type="environment" begin="b" end="e" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -269,7 +269,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEhead" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEnext" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -285,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEbody" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -293,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEfoot" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" level="document" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -301,4 +301,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index 734702264..9bcf43d5b 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definenotation" file="strc-not.mkvi"> + <cd:command name="definenotation" level="system" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -18,7 +18,7 @@ --> - <cd:command name="setupnotation" category="notes" level="style" file="strc-not.mkvi"> + <cd:command name="setupnotation" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -189,7 +189,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotations" category="notes" level="style" file="strc-not.mkvi"> + <cd:command name="setupnotations" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -198,7 +198,7 @@ </cd:arguments> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -210,7 +210,7 @@ </cd:instances> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -222,7 +222,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -235,7 +235,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance:assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -247,7 +247,7 @@ </cd:instances> </cd:command> - <cd:command name="definenote" category="notes" level="style" file="strc-not.mkvi"> + <cd:command name="definenote" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -257,7 +257,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnote" category="notes" level="style" file="strc-not.mkvi"> + <cd:command name="setupnote" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -400,7 +400,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotes" category="notes" level="style" file="strc-not.mkvi"> + <cd:command name="setupnotes" level="style" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -409,7 +409,7 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" category="notes" file="strc-not.mkvi"> + <cd:command name="setnote" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -417,14 +417,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" variant="assignment" category="notes" file="strc-not.mkvi"> + <cd:command name="setnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="setnotetext" category="notes" file="strc-not.mkvi"> + <cd:command name="setnotetext" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -432,14 +432,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="assignment" category="notes" file="strc-not.mkvi"> + <cd:command name="setnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="placenotes" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="placenotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:assignments list="yes" optional="yes"> @@ -448,13 +448,13 @@ </cd:arguments> </cd:command> - <cd:command name="localnotes" type="environment" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="localnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="placelocalnotes" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="placelocalnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -463,11 +463,11 @@ </cd:arguments> </cd:command> - <cd:command name="postponenotes" category="notes" file="strc-not.mkvi"/> + <cd:command name="postponenotes" level="style" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="flushnotes" category="notes" file="strc-not.mkvi"/> + <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="doifelsenoteonsamepage" category="notes" level="system" file="strc-not.mkvi"> + <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -475,7 +475,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnoteonsamepageelse" category="notes" level="system" file="strc-not.mkvi"> + <cd:command name="doifnoteonsamepageelse" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -483,21 +483,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotescollected" category="notes" level="system" file="strc-not.mkvi"> + <cd:command name="doifnotescollected" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="notesymbol" category="notes" file="strc-not.mkvi"> + <cd:command name="notesymbol" level="system" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> </cd:command> - <cd:command name="note" category="notes" level="document" file="strc-not.mkvi"> + <cd:command name="note" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-reference"/> @@ -506,26 +506,26 @@ <!-- - <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <cd:command name="footnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="footnote" type="environment" file="strc-not.mkvi"> + <cd:command name="footnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="footnote" file="strc-not.mkvi"> + <cd:command name="footnote" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="footnote" variant="assignment" file="strc-not.mkvi"> + <cd:command name="footnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> @@ -533,20 +533,20 @@ --> - <cd:command name="footnotetext" category="notes" file="strc-not.mkvi"> + <cd:command name="footnotetext" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="footnotetext" variant="assignment" category="notes" file="strc-not.mkvi"> + <cd:command name="footnotetext" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="placefootnotes" category="notes" file="strc-not.mkvi"> + <cd:command name="placefootnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -554,9 +554,9 @@ </cd:arguments> </cd:command> - <cd:command name="localfootnotes" type="environment" category="notes" file="strc-not.mkvi"/> + <cd:command name="localfootnotes" type="environment" level="document" category="structure notes" file="strc-not.mkvi"/> - <cd:command name="placelocalfootnotes" category="notes" file="strc-not.mkvi"> + <cd:command name="placelocalfootnotes" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -566,26 +566,26 @@ <!-- - <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <cd:command name="endnote" type="environment" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="endnote" type="environment" file="strc-not.mkvi"> + <cd:command name="endnote" type="environment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="endnote" file="strc-not.mkvi"> + <cd:command name="endnote" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="endnote" variant="assignment" file="strc-not.mkvi"> + <cd:command name="endnote" variant="assignment" level="document" category="structure notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> @@ -593,7 +593,7 @@ --> - <cd:command name="definelinenote" category="notes" level="style" file="strc-lnt.mkvi"> + <cd:command name="definelinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -603,7 +603,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinenote" category="notes" level="style" file="strc-lnt.mkvi"> + <cd:command name="setuplinenote" level="style" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -627,7 +627,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> + <cd:command name="linenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -639,7 +639,7 @@ </cd:instances> </cd:command> - <cd:command name="startlinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -653,7 +653,7 @@ </cd:instances> </cd:command> - <cd:command name="stoplinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" generated="yes" variant="instance" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -666,14 +666,14 @@ </cd:instances> </cd:command> - <cd:command name="fromlinenote" category="notes" level="document" file="strc-lnt.mkvi"> + <cd:command name="fromlinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="tolinenote" category="notes" level="document" file="strc-lnt.mkvi"> + <cd:command name="tolinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -681,20 +681,20 @@ <!-- - <cd:command name="linenote" file="strc-lnt.mkvi"> + <cd:command name="linenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="startlinenote" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="stoplinenote" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" level="document" category="structure notes" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> @@ -702,4 +702,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml index 9520ee567..2083c3572 100644 --- a/tex/context/interface/mkiv/i-object.xml +++ b/tex/context/interface/mkiv/i-object.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ifinobject" level="system" file="pack-obj.mkiv"> + <cd:command name="ifinobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -13,15 +13,15 @@ </cd:arguments> </cd:command> - <cd:command name="objectmargin" level="system" file="pack-obj.mkiv"/> + <cd:command name="objectmargin" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectwidth" level="system" file="pack-obj.mkiv"/> + <cd:command name="objectwidth" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectheight" level="system" file="pack-obj.mkiv"/> + <cd:command name="objectheight" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="objectdepth" level="system" file="pack-obj.mkiv"/> + <cd:command name="objectdepth" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="setreferencedobject" level="system" file="pack-obj.mkiv"> + <cd:command name="setreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightreferencedobject" level="system" file="pack-obj.mkiv"> + <cd:command name="settightreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="setunreferencedobject" level="system" file="pack-obj.mkiv"> + <cd:command name="setunreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightunreferencedobject" level="system" file="pack-obj.mkiv"> + <cd:command name="settightunreferencedobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -57,7 +57,7 @@ </cd:arguments> </cd:command> - <cd:command name="setobject" level="system" file="pack-obj.mkiv"> + <cd:command name="setobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="settightobject" level="system" file="pack-obj.mkiv"> + <cd:command name="settightobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -75,25 +75,25 @@ </cd:arguments> </cd:command> - <cd:command name="getobject" level="system" file="pack-obj.mkiv"> + <cd:command name="getobject" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getobjectdimensions" level="system" file="pack-obj.mkiv"> + <cd:command name="getobjectdimensions" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defaultobjectreference" level="system" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectreference" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="defaultobjectpage" level="system" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectpage" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="doifelseobjectfound" level="system" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectfound" level="system" category="pdf conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifobjectfoundelse" level="system" file="pack-obj.mkiv"> + <cd:command name="doifobjectfoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseobjectreferencefound" level="system" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectreferencefound" level="system" category="pdf conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifobjectreferencefoundelse" level="system" file="pack-obj.mkiv"> + <cd:command name="doifobjectreferencefoundelse" level="system" category="pdf conditional" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -129,4 +129,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml index a645d746c..15a162b1a 100644 --- a/tex/context/interface/mkiv/i-offset.xml +++ b/tex/context/interface/mkiv/i-offset.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupoffsetbox" level="style" file="pack-box.mkiv"> + <cd:command name="setupoffsetbox" level="style" category="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -44,7 +44,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupoffset" level="style" file="pack-box.mkiv"> + <cd:command name="setupoffset" level="style" category="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="offsetbox" file="pack-box.mkiv"> + <cd:command name="offsetbox" level="system" category="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffsetbox"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="offset" level="document" file="pack-box.mkiv"> + <cd:command name="offset" level="document" category="layout" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-opposite.xml b/tex/context/interface/mkiv/i-opposite.xml index 5ee68f94d..3ed22559f 100644 --- a/tex/context/interface/mkiv/i-opposite.xml +++ b/tex/context/interface/mkiv/i-opposite.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupoppositeplacing" level="style" file="page-fac.mkiv"> + <cd:command name="setupoppositeplacing" level="style" category="layout" file="page-fac.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -24,6 +24,6 @@ </cd:arguments> </cd:command> - <cd:command name="opposite" type="environment" level="document" file="page-fac.mkiv"/> + <cd:command name="opposite" type="environment" level="document" category="layout" file="page-fac.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml index d2e8d3f1c..847fda4e6 100644 --- a/tex/context/interface/mkiv/i-ornament.xml +++ b/tex/context/interface/mkiv/i-ornament.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ornamenttext" variant="collector" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="collector" level="document" category="background fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornamenttext" variant="layer" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="layer" level="document" category="background fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -44,7 +44,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornamenttext" variant="direct" file="pack-box.mkiv"> + <cd:command name="ornamenttext" variant="direct" level="document" category="background fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="argument-text"/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineornament" variant="collector" level="style" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="collector" level="style" category="background fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineornament" variant="layer" level="style" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="layer" level="style" category="background fonts colors" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="ornament" generated="yes" variant="example" file="pack-box.mkiv"> + <cd:command name="ornament" generated="yes" variant="example" level="document" category="background fonts colors" file="pack-box.mkiv"> <cd:sequence> <cd:variable value="ornament"/> </cd:sequence> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-output.xml b/tex/context/interface/mkiv/i-output.xml index f336c07a4..28b5b3799 100644 --- a/tex/context/interface/mkiv/i-output.xml +++ b/tex/context/interface/mkiv/i-output.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineoutputroutine" level="system" file="page-otr.mkvi"> + <cd:command name="defineoutputroutine" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupoutputroutine" level="system" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -25,25 +25,25 @@ </cd:arguments> </cd:command> - <cd:command name="setupoutputroutine" variant="name" level="system" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" variant="name" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineoutputroutinecommand" level="system" file="page-otr.mkvi"> + <cd:command name="defineoutputroutinecommand" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-key-list"/> </cd:arguments> </cd:command> - <cd:command name="traceoutputroutines" level="system" file="page-otr.mkvi"/> + <cd:command name="traceoutputroutines" level="system" category="layout" file="page-otr.mkvi"/> - <cd:command name="installoutputroutine" level="system" file="page-otr.mkvi"> + <cd:command name="installoutputroutine" level="system" category="layout" file="page-otr.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml index d2ce6d524..40d0bda93 100644 --- a/tex/context/interface/mkiv/i-overlay.xml +++ b/tex/context/interface/mkiv/i-overlay.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineoverlay" level="style" file="pack-lyr.mkiv"> + <cd:command name="defineoverlay" level="style" category="background" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-optional"/> @@ -12,21 +12,21 @@ </cd:arguments> </cd:command> - <cd:command name="overlaycolor" file="pack-rul.mkiv"/> + <cd:command name="overlaycolor" level="system" category="background colors" file="pack-rul.mkiv"/> - <cd:command name="overlaylinecolor" file="pack-rul.mkiv"/> + <cd:command name="overlaylinecolor" level="system" category="background colors" file="pack-rul.mkiv"/> - <cd:command name="overlaywidth" file="pack-rul.mkiv"/> + <cd:command name="overlaywidth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlayheight" file="pack-rul.mkiv"/> + <cd:command name="overlayheight" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlaydepth" file="pack-rul.mkiv"/> + <cd:command name="overlaydepth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlayoffset" file="pack-rul.mkiv"/> + <cd:command name="overlayoffset" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="overlaylinewidth" file="pack-rul.mkiv"/> + <cd:command name="overlaylinewidth" level="system" category="background" file="pack-rul.mkiv"/> - <cd:command name="doifelseoverlay" level="system" file="pack-rul.mkiv"> + <cd:command name="doifelseoverlay" level="system" category="background conditional" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoverlayelse" level="system" file="pack-rul.mkiv"> + <cd:command name="doifoverlayelse" level="system" category="background conditional" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -42,4 +42,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml index f9e38d9fc..9972800ec 100644 --- a/tex/context/interface/mkiv/i-pagebreak.xml +++ b/tex/context/interface/mkiv/i-pagebreak.xml @@ -111,14 +111,14 @@ </cd:arguments> </cd:command> - <cd:command name="testpageonly" file="page-brk.mkiv"> + <cd:command name="testpageonly" level="system" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> </cd:arguments> </cd:command> - <cd:command name="testpagesync" file="page-brk.mkiv"> + <cd:command name="testpagesync" level="system" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> @@ -132,4 +132,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagecomment.xml b/tex/context/interface/mkiv/i-pagecomment.xml index 211f08d3d..75b9056a8 100644 --- a/tex/context/interface/mkiv/i-pagecomment.xml +++ b/tex/context/interface/mkiv/i-pagecomment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuppagecomment" level="style" file="page-com.mkiv"> + <cd:command name="setuppagecomment" level="style" category="pdf" file="page-com.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -35,6 +35,6 @@ </cd:arguments> </cd:command> - <cd:command name="pagecomment" type="environment" file="page-com.mkiv"/> + <cd:command name="pagecomment" type="environment" level="document" category="pdf" file="page-com.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagefigure.xml b/tex/context/interface/mkiv/i-pagefigure.xml index 8f76ace34..0e8af435f 100644 --- a/tex/context/interface/mkiv/i-pagefigure.xml +++ b/tex/context/interface/mkiv/i-pagefigure.xml @@ -4,22 +4,32 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pagefigure" category="graphics" level="document" file="page-app.mkiv"> + <cd:command name="pagefigure" level="document" category="graphics" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagefigure" type="environment" category="graphics" level="document" file="page-app.mkiv"> + <cd:command name="pagefigure" type="environment" level="document" category="graphics" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupexternalfigure"/> + <cd:parameter name="offset"> + <cd:constant type="default"/> + <cd:constant type="overlay"/> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index d7aee5291..8e53ef8fc 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagegrid" level="style" file="page-cst.mkiv"> + <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegrid" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" level="document" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagegrid" file="page-cst.mkiv"> + <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="c"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagegridspan" level="style" file="page-cst.mkiv"> + <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridspan" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -129,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspan" type="environment" level="document" file="page-cst.mkiv"> + <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -138,13 +138,13 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspanwidth" file="page-cst.mkiv"> + <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="definepagegridarea" level="style" file="page-cst.mkiv"> + <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -154,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridarea" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,14 +192,14 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridareatext" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuppagegridlines" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -208,7 +208,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridstart" level="style" file="page-cst.mkiv"> + <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -217,4 +217,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageinjection.xml b/tex/context/interface/mkiv/i-pageinjection.xml index 735d44e28..f2ded298e 100644 --- a/tex/context/interface/mkiv/i-pageinjection.xml +++ b/tex/context/interface/mkiv/i-pageinjection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepageinjection" level="style" file="page-inj.mkvi"> + <cd:command name="definepageinjection" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppageinjection" level="style" file="page-inj.mkvi"> + <cd:command name="setuppageinjection" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -49,14 +49,14 @@ </cd:arguments> </cd:command> - <cd:command name="pageinjection" level="document" file="page-inj.mkvi"> + <cd:command name="pageinjection" level="document" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="pageinjection" variant="assignment" level="document" file="page-inj.mkvi"> + <cd:command name="pageinjection" variant="assignment" level="document" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppageinjection"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepageinjectionalternative" level="style" file="page-inj.mkvi"> + <cd:command name="definepageinjectionalternative" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppageinjectionalternative" level="style" file="page-inj.mkvi"> + <cd:command name="setuppageinjectionalternative" level="style" category="structure" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagelayout.xml b/tex/context/interface/mkiv/i-pagelayout.xml index 2e5ca2085..3aadda0ff 100644 --- a/tex/context/interface/mkiv/i-pagelayout.xml +++ b/tex/context/interface/mkiv/i-pagelayout.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pagearea" category="layout" file="page-plg.mkiv"> + <cd:command name="pagearea" level="style" category="layout" file="page-plg.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagelayout" type="environment" category="layout" file="page-plg.mkiv"> + <cd:command name="pagelayout" type="environment" level="style" category="layout" file="page-plg.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagemarks.xml b/tex/context/interface/mkiv/i-pagemarks.xml index f0eaae47f..036f518b9 100644 --- a/tex/context/interface/mkiv/i-pagemarks.xml +++ b/tex/context/interface/mkiv/i-pagemarks.xml @@ -4,7 +4,21 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <!-- todo: \markpage[name] | \markpage[name][list] (absolute or relative prefized by +) --> - <!-- todo: \doifelsemarkedpage{name} --> + <cd:command name="markpage" level="style" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:keywords optional="yes"> + <cd:constant type="cd:number" prefix="cd:sign" method="none"/> + </cd:keywords> + </cd:arguments> + </cd:command> -</cd:interface> + <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-lay.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml index 830bdb351..4c262db4b 100644 --- a/tex/context/interface/mkiv/i-pagenumber.xml +++ b/tex/context/interface/mkiv/i-pagenumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuprealpagenumber" category="counter" file="strc-pag.mkiv"> + <cd:command name="setuprealpagenumber" level="system" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupuserpagenumber" category="counter" level="style" file="strc-pag.mkiv"> + <cd:command name="setupuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubpagenumber" category="counter" level="style" file="strc-pag.mkiv"> + <cd:command name="setupsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagenumber" category="counter" level="style" file="strc-pag.mkiv"> + <cd:command name="setuppagenumber" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupuserpagenumber"/> @@ -48,17 +48,17 @@ <!-- - <cd:command name="resetrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetrealpagenumber" level="system" file="strc-pag.mkiv"/> --> - <cd:command name="resetuserpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetuserpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="resetpagenumber" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="setuppagenumbering" category="counter" level="style" file="strc-pag.mkiv"> + <cd:command name="setuppagenumbering" level="style" category="counter" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -111,74 +111,74 @@ </cd:arguments> </cd:command> - <cd:command name="firstrealpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextrealpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextuserpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstrealpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="firstsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prevsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="nextsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastrealpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastuserpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpage" category="counter" file="strc-pag.mkiv"/> + <cd:command name="lastsubpage" level="system" category="counter" file="strc-pag.mkiv"/> - <cd:command name="realpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="realpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="userpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="userpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="subpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="subpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="pagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="pagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prefixedpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="prefixedpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="incrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="incrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="decrementpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementsubpagenumber" category="counter" file="strc-pag.mkiv"/> + <cd:command name="decrementsubpagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="completepagenumber" category="counter" level="style" file="strc-pag.mkiv"/> + <cd:command name="completepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> - <cd:command name="placepagenumber" category="counter" level="style" file="strc-pag.mkiv"/> + <cd:command name="placepagenumber" level="style" category="counter" file="strc-pag.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml index 90d419bbc..082f53b6d 100644 --- a/tex/context/interface/mkiv/i-pageselection.xml +++ b/tex/context/interface/mkiv/i-pageselection.xml @@ -178,4 +178,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml index 779304d6c..01e014a28 100644 --- a/tex/context/interface/mkiv/i-pageshift.xml +++ b/tex/context/interface/mkiv/i-pageshift.xml @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml index e9b18bfed..941068399 100644 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ b/tex/context/interface/mkiv/i-pagestate.xml @@ -56,4 +56,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml index 8001742e0..a5a0b9b5f 100644 --- a/tex/context/interface/mkiv/i-pairedbox.xml +++ b/tex/context/interface/mkiv/i-pairedbox.xml @@ -139,7 +139,7 @@ <!-- - <cd:command name="setuplegend" file="pack-com.mkiv"> + <cd:command name="setuplegend" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppairedbox"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelegend" file="pack-com.mkiv"> + <cd:command name="placelegend" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppairedbox"/> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelegend" type="environment" file="pack-com.mkiv"> + <cd:command name="placelegend" type="environment" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppairedbox"/> @@ -167,18 +167,18 @@ --> - <cd:command name="placeontopofeachother" file="pack-com.mkiv"> + <cd:command name="placeontopofeachother" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="placesidebyside" file="pack-com.mkiv"> + <cd:command name="placesidebyside" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-papersize.xml b/tex/context/interface/mkiv/i-papersize.xml index 05bfb8a33..8156235bd 100644 --- a/tex/context/interface/mkiv/i-papersize.xml +++ b/tex/context/interface/mkiv/i-papersize.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definelayouttarget" file="page-lay.mkiv"> + <cd:command name="definelayouttarget" level="system" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayouttarget" file="page-lay.mkiv"> + <cd:command name="setuplayouttarget" level="system" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -102,7 +102,7 @@ --> - <cd:command name="definepapersize" level="style" file="page-lay.mkiv"> + <cd:command name="definepapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -137,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepapersize" variant="name" level="style" file="page-lay.mkiv"> + <cd:command name="definepapersize" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -149,7 +149,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppapersize" variant="name" level="style" file="page-lay.mkiv"> + <cd:command name="setuppapersize" variant="name" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -178,7 +178,7 @@ <!-- - <cd:command name="setuppapersize" file="page-lay.mkiv"> + <cd:command name="setuppapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppaper" file="page-lay.mkiv"> + <cd:command name="setuppaper" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuplayouttarget"/> @@ -197,7 +197,7 @@ --> - <cd:command name="setuppapersize" level="style" file="page-lay.mkiv"> + <cd:command name="setuppapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -281,7 +281,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppaper" level="style" file="page-lay.mkiv"> + <cd:command name="setuppaper" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppapersize"/> @@ -289,7 +289,7 @@ </cd:arguments> </cd:command> - <cd:command name="adaptpapersize" level="style" file="page-lay.mkiv"> + <cd:command name="adaptpapersize" level="style" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> @@ -300,4 +300,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraph.xml b/tex/context/interface/mkiv/i-paragraph.xml index 1729e26d2..b253f404b 100644 --- a/tex/context/interface/mkiv/i-paragraph.xml +++ b/tex/context/interface/mkiv/i-paragraph.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparagraph" level="style" file="strc-tag.mkiv"> + <cd:command name="defineparagraph" level="style" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupparagraph" level="style" file="strc-tag.mkiv"> + <cd:command name="setupparagraph" level="style" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="paragraph" type="environment" level="document" file="strc-tag.mkiv"> + <cd:command name="paragraph" type="environment" level="document" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="par" type="environment" level="document" file="strc-tag.mkiv"> + <cd:command name="par" type="environment" level="document" category="structure" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -52,9 +52,9 @@ </cd:arguments> </cd:command> - <cd:command name="par" type="environment" begin="b" end ="e" level="document" file="strc-tag.mkiv"/> + <cd:command name="par" type="environment" begin="b" end ="e" level="document" category="structure" file="strc-tag.mkiv"/> - <cd:command name="setupparagraphintro" level="style" file="spac-par.mkiv"> + <cd:command name="setupparagraphintro" level="style" category="structure" file="spac-par.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> @@ -68,4 +68,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml index 615e95597..6d35f11a0 100644 --- a/tex/context/interface/mkiv/i-paragraphnumber.xml +++ b/tex/context/interface/mkiv/i-paragraphnumber.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupparagraphnumbering" level="style" file="page-par.mkiv"> + <cd:command name="setupparagraphnumbering" level="style" category="structure counter" file="page-par.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml index 6cbbcd5b7..0d8ae3d2e 100644 --- a/tex/context/interface/mkiv/i-paragraphs.xml +++ b/tex/context/interface/mkiv/i-paragraphs.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparagraphs" level="style" file="tabl-mis.mkiv"> + <cd:command name="defineparagraphs" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupparagraphs" level="style" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords list="yes" optional="yes"> @@ -76,7 +76,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupparagraphs" variant="assignment" level="style" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" variant="assignment" level="style" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number" prefix="cd:name" method="range"/> @@ -136,33 +136,33 @@ </cd:arguments> </cd:command> - <cd:command name="paragraphs" type="environment" level="document" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" level="document" category="tables" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextparagraphs" level="document" file="tabl-mis.mkiv"/> + <cd:command name="nextparagraphs" level="document" category="tables" file="tabl-mis.mkiv"/> - <cd:command name="paragraphs" type="environment" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphs" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="nextparagraphs" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> + <cd:command name="nextparagraphs" generated="yes" variant="example" level="document" category="tables" file="tabl-mis.mkiv"> <cd:sequence> <cd:string value="next"/> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphscell" type="environment" level="document" file="tabl-mis.mkiv"/> + <cd:command name="paragraphscell" type="environment" level="document" category="tables" file="tabl-mis.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml index c8d177fcd..3f7154c9f 100644 --- a/tex/context/interface/mkiv/i-parallel.xml +++ b/tex/context/interface/mkiv/i-parallel.xml @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeparallel" file="buff-par.mkvi"> + <cd:command name="placeparallel" level="document" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseparallel" file="buff-par.mkvi"> + <cd:command name="doifelseparallel" level="style" category="conditional" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifparallelelse" file="buff-par.mkvi"> + <cd:command name="doifparallelelse" level="style" category="conditional" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="resetparallel" file="buff-par.mkvi"> + <cd:command name="resetparallel" level="style" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -76,10 +76,10 @@ </cd:arguments> </cd:command> - <cd:command name="parallel" type="environment" generated="yes" variant="example" file="buff-par.mkvi"> + <cd:command name="parallel" type="environment" generated="yes" variant="example" level="document" file="buff-par.mkvi"> <cd:sequence> <cd:variable value="parallel"/> </cd:sequence> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-parbuilder.xml b/tex/context/interface/mkiv/i-parbuilder.xml index 70879546d..95621fce0 100644 --- a/tex/context/interface/mkiv/i-parbuilder.xml +++ b/tex/context/interface/mkiv/i-parbuilder.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparbuilder" level="system" file="typo-bld.mkiv"> + <cd:command name="defineparbuilder" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="parbuilder" type="environment" level="system" file="typo-bld.mkiv"> + <cd:command name="parbuilder" type="environment" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmainparbuilder" level="system" file="typo-bld.mkiv"> + <cd:command name="setmainparbuilder" level="system" category="layout" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -32,4 +32,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pdf.xml b/tex/context/interface/mkiv/i-pdf.xml index e84f0a3aa..fc83777a1 100644 --- a/tex/context/interface/mkiv/i-pdf.xml +++ b/tex/context/interface/mkiv/i-pdf.xml @@ -4,119 +4,119 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pdfbackendsetcatalog" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcatalog" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetinfo" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetinfo" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetname" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetname" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageattribute" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageattribute" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpagesattribute" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpagesattribute" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageresource" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageresource" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetextgstate" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetextgstate" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetcolorspace" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcolorspace" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpattern" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpattern" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetshade" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetshade" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendcurrentresources" level="system" file="back-pdf.mkiv"/> + <cd:command name="pdfbackendcurrentresources" level="system" category="pdf" file="back-pdf.mkiv"/> - <cd:command name="pdfcolor" level="system" file="back-pdf.mkiv"> + <cd:command name="pdfcolor" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="PDFcolor" level="system" file="back-pdf.mkiv"> + <cd:command name="PDFcolor" level="system" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="TransparencyHack" level="system" file="back-pdf.mkiv"/> + <cd:command name="TransparencyHack" level="system" category="pdf" file="back-pdf.mkiv"/> - <cd:command name="lastpredefinedsymbol" level="system" file="pack-obj.mkiv"/> + <cd:command name="lastpredefinedsymbol" level="system" category="pdf" file="pack-obj.mkiv"/> - <cd:command name="predefinesymbol" level="system" file="pack-obj.mkiv"> + <cd:command name="predefinesymbol" level="system" category="pdf" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendactualtext" file="back-pdf.mkiv"> + <cd:command name="pdfbackendactualtext" level="style" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfactualtext" file="back-pdf.mkiv"> + <cd:command name="pdfactualtext" level="document" category="pdf" file="back-pdf.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="negative" type="environment" file="attr-neg.mkiv"/> + <cd:command name="negative" type="environment" level="document" category="pdf" file="attr-neg.mkiv"/> - <cd:command name="positive" type="environment" file="attr-neg.mkiv"/> + <cd:command name="positive" type="environment" level="document" category="pdf" file="attr-neg.mkiv"/> - <cd:command name="setuppagetransitions" level="style" file="scrn-pag.mkvi"> + <cd:command name="setuppagetransitions" level="style" category="pdf" file="scrn-pag.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset" default="yes"/> @@ -128,4 +128,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-penalty.xml b/tex/context/interface/mkiv/i-penalty.xml index ee241b9ff..d69c196f9 100644 --- a/tex/context/interface/mkiv/i-penalty.xml +++ b/tex/context/interface/mkiv/i-penalty.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="resetpenalties" file="spac-ver.mkiv"> + <cd:command name="resetpenalties" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="setpenalties" file="spac-ver.mkiv"> + <cd:command name="setpenalties" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -18,12 +18,12 @@ </cd:arguments> </cd:command> - <cd:command name="keeplinestogether" file="spac-ver.mkiv"> + <cd:command name="keeplinestogether" level="system" category="layout" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="setdefaultpenalties" file="spac-ver.mkiv"/> + <cd:command name="setdefaultpenalties" level="system" category="layout" file="spac-ver.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-periods.xml b/tex/context/interface/mkiv/i-periods.xml index ec471faf6..5cded3b1c 100644 --- a/tex/context/interface/mkiv/i-periods.xml +++ b/tex/context/interface/mkiv/i-periods.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupperiods" level="style" file="enco-ini.mkiv"> + <cd:command name="setupperiods" level="style" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -24,13 +24,13 @@ </cd:arguments> </cd:command> - <cd:command name="periods" level="document" file="enco-ini.mkiv"> + <cd:command name="periods" level="document" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="periods" variant="assignment" level="document" file="enco-ini.mkiv"> + <cd:command name="periods" variant="assignment" level="document" category="symbols" file="enco-ini.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupperiods"/> @@ -38,6 +38,6 @@ </cd:arguments> </cd:command> - <cd:command name="unknown" level="document" file="enco-ini.mkiv"/> + <cd:command name="unknown" level="document" category="symbols" file="enco-ini.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-phantom.xml b/tex/context/interface/mkiv/i-phantom.xml index e3f92b810..8458be67b 100644 --- a/tex/context/interface/mkiv/i-phantom.xml +++ b/tex/context/interface/mkiv/i-phantom.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="phantom" file="supp-box.mkiv"> + <cd:command name="phantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hphantom" file="supp-box.mkiv"> + <cd:command name="hphantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vphantom" file="supp-box.mkiv"> + <cd:command name="vphantom" level="style" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="phantombox" file="pack-box.mkiv"> + <cd:command name="phantombox" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -38,4 +38,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-placement.xml b/tex/context/interface/mkiv/i-placement.xml index 958ffaa6f..665d9aeb8 100644 --- a/tex/context/interface/mkiv/i-placement.xml +++ b/tex/context/interface/mkiv/i-placement.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineplacement" file="pack-mis.mkiv"> + <cd:command name="defineplacement" level="style" category="layout" file="pack-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupplacement" file="pack-mis.mkiv"> + <cd:command name="setupplacement" level="style" category="layout" file="pack-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="placement" file="pack-mis.mkiv"> + <cd:command name="placement" level="style" category="layout" file="pack-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -60,7 +60,7 @@ </cd:arguments> </cd:command> - <cd:command name="placement" generated="yes" variant="example" file="pack-mis.mkiv"> + <cd:command name="placement" generated="yes" variant="example" level="style" category="layout" file="pack-mis.mkiv"> <cd:sequence> <cd:variable value="placement"/> </cd:sequence> @@ -72,4 +72,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml index 145a4eb8c..b9f4b3780 100644 --- a/tex/context/interface/mkiv/i-position.xml +++ b/tex/context/interface/mkiv/i-position.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="doifpositionaction" level="system" file="anch-pgr.mkiv"> + <cd:command name="doifpositionaction" level="system" category="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionaction" level="system" file="anch-pgr.mkiv"> + <cd:command name="doifelsepositionaction" level="system" category="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionactionelse" level="system" file="anch-pgr.mkiv"> + <cd:command name="doifpositionactionelse" level="system" category="conditional" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -34,39 +34,39 @@ </cd:arguments> </cd:command> - <cd:command name="positionoverlay" file="anch-pgr.mkiv"> + <cd:command name="positionoverlay" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPoverlayanchor" file="anch-pgr.mkiv"> + <cd:command name="MPoverlayanchor" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="positionregionoverlay" file="anch-pgr.mkiv"> + <cd:command name="positionregionoverlay" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="positionoverlay" type="environment" file="anch-pgr.mkiv"> + <cd:command name="positionoverlay" type="environment" level="system" category="background" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpositiongraphic" type="environment" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPpositiongraphic" file="anch-pgr.mkiv"> + <cd:command name="MPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:assignments delimiters="braces" list="yes" optional="yes"> @@ -77,13 +77,13 @@ </cd:arguments> </cd:command> - <cd:command name="MPpositionmethod" type="environment" file="anch-pgr.mkiv"> + <cd:command name="MPpositionmethod" type="environment" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setMPpositiongraphic" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphic" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="setMPpositiongraphicrange" file="anch-pgr.mkiv"> + <cd:command name="setMPpositiongraphicrange" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -108,190 +108,190 @@ </cd:arguments> </cd:command> - <cd:command name="MPgetposboxes" file="anch-pgr.mkiv"> + <cd:command name="MPgetposboxes" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPgetmultipars" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultipars" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPgetmultishape" file="anch-pgr.mkiv"> + <cd:command name="MPgetmultishape" level="system" category="background metapost" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPp" file="anch-pos.mkiv"> + <cd:command name="MPp" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPr" file="anch-pos.mkiv"> + <cd:command name="MPr" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPc" file="anch-pos.mkiv"> + <cd:command name="MPc" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPn" file="anch-pos.mkiv"> + <cd:command name="MPn" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPx" file="anch-pos.mkiv"> + <cd:command name="MPx" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPy" file="anch-pos.mkiv"> + <cd:command name="MPy" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPw" file="anch-pos.mkiv"> + <cd:command name="MPw" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPh" file="anch-pos.mkiv"> + <cd:command name="MPh" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPd" file="anch-pos.mkiv"> + <cd:command name="MPd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPwhd" file="anch-pos.mkiv"> + <cd:command name="MPwhd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPxy" file="anch-pos.mkiv"> + <cd:command name="MPxy" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPll" file="anch-pos.mkiv"> + <cd:command name="MPll" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPlr" file="anch-pos.mkiv"> + <cd:command name="MPlr" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPur" file="anch-pos.mkiv"> + <cd:command name="MPur" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPul" file="anch-pos.mkiv"> + <cd:command name="MPul" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpos" file="anch-pos.mkiv"> + <cd:command name="MPpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPls" file="anch-pos.mkiv"> + <cd:command name="MPls" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPrs" file="anch-pos.mkiv"> + <cd:command name="MPrs" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpardata" file="anch-pos.mkiv"> + <cd:command name="MPpardata" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPxywhd" file="anch-pos.mkiv"> + <cd:command name="MPxywhd" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPposset" file="anch-pos.mkiv"> + <cd:command name="MPposset" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPpage" file="anch-pos.mkiv"> + <cd:command name="MPpage" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPregion" file="anch-pos.mkiv"> + <cd:command name="MPregion" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcolumn" file="anch-pos.mkiv"> + <cd:command name="MPcolumn" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPanchor" file="anch-pos.mkiv"> + <cd:command name="MPanchor" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPleftskip" file="anch-pos.mkiv"> + <cd:command name="MPleftskip" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPrightskip" file="anch-pos.mkiv"> + <cd:command name="MPrightskip" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPplus" file="anch-pos.mkiv"> + <cd:command name="MPplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -299,7 +299,7 @@ </cd:arguments> </cd:command> - <cd:command name="MPv" file="anch-pos.mkiv"> + <cd:command name="MPv" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -307,14 +307,14 @@ </cd:arguments> </cd:command> - <cd:command name="MPrest" file="anch-pos.mkiv"> + <cd:command name="MPrest" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPvv" file="anch-pos.mkiv"> + <cd:command name="MPvv" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> @@ -386,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifposition" level="system" file="anch-pos.mkiv"> + <cd:command name="doifposition" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -394,7 +394,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseposition" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelseposition" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -402,7 +402,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifpositionelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -410,7 +410,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositiononpage" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelsepositiononpage" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -419,7 +419,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositiononpageelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifpositiononpageelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -461,13 +461,13 @@ </cd:command> - <cd:command name="tracepositions" file="anch-pos.mkiv"/> + <cd:command name="tracepositions" level="system" file="anch-pos.mkiv"/> <cd:command name="enableparpositions" level="system" file="anch-pos.mkiv"/> <cd:command name="disableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="doifelseoverlapping" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelseoverlapping" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoverlappingelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifoverlappingelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsonsamepage" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonsamepage" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -493,7 +493,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionsonsamepageelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonsamepageelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -501,7 +501,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsonthispage" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonthispage" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -509,7 +509,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifpositionsonthispageelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonthispageelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -517,18 +517,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsused" level="system" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsused" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifpositionsusedelse" level="system" file="anch-pos.mkiv"> + <cd:command name="doifpositionsusedelse" level="system" category="conditional" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positionbar.xml b/tex/context/interface/mkiv/i-positionbar.xml index 6777227b0..286466bef 100644 --- a/tex/context/interface/mkiv/i-positionbar.xml +++ b/tex/context/interface/mkiv/i-positionbar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuppositionbar" level="style" file="pack-bar.mkiv"> + <cd:command name="setuppositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="horizontalpositionbar" file="pack-bar.mkiv"> + <cd:command name="horizontalpositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="verticalpositionbar" file="pack-bar.mkiv"> + <cd:command name="verticalpositionbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="horizontalgrowingbar" file="pack-bar.mkiv"> + <cd:command name="horizontalgrowingbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="verticalgrowingbar" file="pack-bar.mkiv"> + <cd:command name="verticalgrowingbar" level="style" category="graphics" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setuppositionbar"/> @@ -70,4 +70,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-positioning.xml b/tex/context/interface/mkiv/i-positioning.xml index 9a91eecd5..9d873fd46 100644 --- a/tex/context/interface/mkiv/i-positioning.xml +++ b/tex/context/interface/mkiv/i-positioning.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepositioning" level="style" file="pack-pos.mkiv"> + <cd:command name="definepositioning" level="style" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppositioning" level="style" file="pack-pos.mkiv"> + <cd:command name="setuppositioning" level="style" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -76,7 +76,7 @@ </cd:arguments> </cd:command> - <cd:command name="positioning" type="environment" level="document" file="pack-pos.mkiv"> + <cd:command name="positioning" type="environment" level="document" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -85,7 +85,7 @@ </cd:arguments> </cd:command> - <cd:command name="position" level="document" file="pack-pos.mkiv"> + <cd:command name="position" level="document" category="graphics" file="pack-pos.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> @@ -95,4 +95,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-postponing.xml b/tex/context/interface/mkiv/i-postponing.xml index 477359626..0d4c98d7a 100644 --- a/tex/context/interface/mkiv/i-postponing.xml +++ b/tex/context/interface/mkiv/i-postponing.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="postponing" type="environment" level="document" file="page-pst.mkiv"> + <cd:command name="postponing" type="environment" level="document" category="structure" file="page-pst.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number" prefix="cd:sign" method="none"/> @@ -12,4 +12,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml index 8dc9a28c4..7e23c6631 100644 --- a/tex/context/interface/mkiv/i-processor.xml +++ b/tex/context/interface/mkiv/i-processor.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineprocessor" level="style" file="typo-prc.mkvi"> + <cd:command name="defineprocessor" level="style" category="fonts colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupprocessor" level="style" file="typo-prc.mkvi"> + <cd:command name="setupprocessor" level="style" category="fonts colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,11 +41,11 @@ </cd:arguments> </cd:command> - <cd:command name="applyprocessor" level="system" file="typo-prc.mkvi"> + <cd:command name="applyprocessor" level="system" category="fonts colors" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-profile.xml b/tex/context/interface/mkiv/i-profile.xml index 90027ffd3..acc486cb7 100644 --- a/tex/context/interface/mkiv/i-profile.xml +++ b/tex/context/interface/mkiv/i-profile.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineprofile" level="style" file="spac-prf.mkvi"> + <cd:command name="defineprofile" level="style" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupprofile" level="style" file="spac-prf.mkvi"> + <cd:command name="setupprofile" level="style" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="setprofile" file="spac-prf.mkvi"> + <cd:command name="setprofile" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="none"/> @@ -56,15 +56,15 @@ </cd:arguments> </cd:command> - <cd:command name="resetprofile" file="spac-prf.mkvi"/> + <cd:command name="resetprofile" level="system" category="pdf" file="spac-prf.mkvi"/> - <cd:command name="useprofileparameter" level="system" file="spac-prf.mkvi"> + <cd:command name="useprofileparameter" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="profiledbox" level="system" file="spac-prf.mkvi"> + <cd:command name="profiledbox" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="none"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="profilegivenbox" level="system" file="spac-prf.mkvi"> + <cd:command name="profilegivenbox" level="system" category="pdf" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> @@ -97,4 +97,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml index b8f322625..b6280047a 100644 --- a/tex/context/interface/mkiv/i-publication.xml +++ b/tex/context/interface/mkiv/i-publication.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="btxrenderingdefinitions" type="environment" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxrenderingdefinitions" type="environment" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxdefinitionfile" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="loadbtxdefinitionfile" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxreplacementfile" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="loadbtxreplacementfile" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definebtx" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="definebtx" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtx" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="setupbtx" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -117,19 +117,19 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtx" variant="name" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="setupbtx" variant="name" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usingbtxspecification" type="environment" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="usingbtxspecification" type="environment" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="definebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -139,7 +139,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="setupbtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -150,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxregister" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="definebtxregister" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -160,7 +160,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxregister" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="setupbtxregister" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -197,7 +197,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxrendering" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="definebtxrendering" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -207,7 +207,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxrendering" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="setupbtxrendering" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -299,7 +299,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="usebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file"/> @@ -311,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="publication" type="environment" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="publication" type="environment" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -331,7 +331,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxlist" category="bibliography" level="style" file="publ-ini.mkiv"> + <cd:command name="setupbtxlist" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -340,7 +340,7 @@ </cd:arguments> </cd:command> - <cd:command name="completebtxrendering" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="completebtxrendering" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -349,7 +349,7 @@ </cd:arguments> </cd:command> - <cd:command name="placebtxrendering" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="placebtxrendering" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -358,7 +358,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofpublications" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="completelistofpublications" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -367,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofpublications" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="placelistofpublications" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -376,331 +376,331 @@ </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" variant="direct" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="direct" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxtextcitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="userdata" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="btxalwayscitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="alternative" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="bthiddencitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxhiddencitation" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcite" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcite" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="listcite" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="textcitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcite" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="textcite" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="textcite" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="alwayscitation" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" variant="userdata" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="alwayscite" variant="alternative" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="hiddencitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="hiddencitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="hiddencite" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="hiddencite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="citation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="userdata" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="citation" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="alternative" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="citation" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="citation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="cite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="userdata" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="cite" variant="userdata" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="assignment-citedata-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="alternative" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="cite" variant="alternative" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-btxalternative-optional"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="cite" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="nocitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="nocitation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="usecitation" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="usecitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="usecitation" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="usecitation" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="nocite" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> + <cd:command name="nocite" variant="direct" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="savebtxdataset" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="savebtxdataset" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file-optional"/> @@ -735,67 +735,67 @@ </cd:arguments> </cd:command> - <cd:command name="placecitation" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="placecitation" level="document" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="usebtxdefinitions" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="usebtxdefinitions" level="style" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxfield" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfield" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdetail" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdetail" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxflush" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflush" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdirect" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdirect" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldname" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfieldname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldtype" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfieldtype" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundname" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfoundname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundtype" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfoundtype" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxauthorfield" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxauthorfield" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -807,7 +807,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelse" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -815,27 +815,27 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoif" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoif" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifnot" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifnot" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxsetup" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxsetup" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameaspreviouschecked" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameaspreviouschecked" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -847,7 +847,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameasprevious" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameasprevious" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -855,7 +855,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsecombiinlist" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsecombiinlist" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -864,7 +864,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouscheckedelse" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouscheckedelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -876,7 +876,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouselse" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouselse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -884,7 +884,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifcombiinlistelse" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifcombiinlistelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -893,13 +893,13 @@ </cd:arguments> </cd:command> - <cd:command name="currentbtxuservariable" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="currentbtxuservariable" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelseuservariable" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifelseuservariable" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -907,7 +907,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifuservariableelse" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxdoifuservariableelse" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -915,14 +915,14 @@ </cd:arguments> </cd:command> - <cd:command name="btxremapauthor" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxremapauthor" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthor" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthor" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -935,39 +935,39 @@ </cd:arguments> </cd:command> - <cd:command name="btxflushsuffix" category="bibliography" file="publ-ini.mkiv"/> + <cd:command name="btxflushsuffix" level="system" category="bibliography" file="publ-ini.mkiv"/> - <cd:command name="btxflushauthorname" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorname" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormal" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormalshort" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormalshort" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinverted" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinverted" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinvertedshort" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinvertedshort" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxsingularplural" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxsingularplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -979,7 +979,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxsingularorplural" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxsingularorplural" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -991,7 +991,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxoneorrange" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxoneorrange" level="system" category="bibliography conditional" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -1002,7 +1002,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxfirstofrange" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxfirstofrange" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -1011,38 +1011,38 @@ </cd:arguments> </cd:command> - <cd:command name="btxloadjournalist" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxloadjournalist" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxsavejournalist" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxsavejournalist" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxaddjournal" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxaddjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="btxexpandedjournal" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxexpandedjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxabbreviatedjournal" category="bibliography" file="publ-ini.mkiv"> + <cd:command name="btxabbreviatedjournal" level="system" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1058,13 +1058,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" variant="argument" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1080,13 +1080,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" variant="argument" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1102,19 +1102,19 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" variant="argument" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxhashedauthors" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxhashedauthors" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxfields" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -1127,16 +1127,16 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxfields" variant="argument" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" variant="argument" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxtables" category="bibliography" file="publ-tra.mkiv"> + <cd:command name="showbtxtables" level="document" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml index ad842c138..a1a17f669 100644 --- a/tex/context/interface/mkiv/i-random.xml +++ b/tex/context/interface/mkiv/i-random.xml @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="setrandomseed" file="supp-ran.mkiv"> + <cd:command name="setrandomseed" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -52,13 +52,13 @@ <cd:command name="reuserandomseed" level="system" file="supp-ran.mkiv"/> - <cd:command name="randomnumber" file="supp-ran.mkiv"> + <cd:command name="randomnumber" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="mprandomnumber" file="supp-ran.mkiv"/> + <cd:command name="mprandomnumber" level="system" file="supp-ran.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 8550ad0ae..a98b91a6b 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/interface/mkiv/i-references.xml b/tex/context/interface/mkiv/i-references.xml index 423106115..1e3e3466d 100644 --- a/tex/context/interface/mkiv/i-references.xml +++ b/tex/context/interface/mkiv/i-references.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupreferencing" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="setupreferencing" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -53,40 +53,40 @@ </cd:arguments> </cd:command> - <cd:command name="textreference" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="textreference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pagereference" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="pagereference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="reference" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="reference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setreference" category="references" file="strc-ref.mkvi"> + <cd:command name="setreference" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="usereferenceparameter" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="usereferenceparameter" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="boxreference" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="boxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:csname/> @@ -94,21 +94,21 @@ </cd:arguments> </cd:command> - <cd:command name="hboxreference" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="hboxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vboxreference" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="vboxreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="contentreference" category="references" file="strc-ref.mkvi"> + <cd:command name="contentreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:assignments list="yes" optional="yes"> @@ -118,27 +118,27 @@ </cd:arguments> </cd:command> - <cd:command name="definereference" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="definereference" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="resetreference" category="references" file="strc-ref.mkvi"> + <cd:command name="resetreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setpagereference" category="references" file="strc-ref.mkvi"> + <cd:command name="setpagereference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsereferencefound" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doifelsereferencefound" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -146,7 +146,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifreferencefoundelse" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doifreferencefoundelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -154,7 +154,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupreferenceprefix" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="setupreferenceprefix" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referenceprefix"/> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupglobalreferenceprefix" category="references" file="strc-ref.mkvi"> + <cd:command name="setupglobalreferenceprefix" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referenceprefix"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" type="environment" begin="push" end="pop" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="push" end="pop" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referenceprefix"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" type="environment" begin="globalpush" end="globalpop" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="globalpush" end="globalpop" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referenceprefix"/> @@ -186,9 +186,9 @@ </cd:arguments> </cd:command> - <cd:command name="referenceprefix" category="references" file="strc-ref.mkvi"/> + <cd:command name="referenceprefix" level="system" category="references" file="strc-ref.mkvi"/> - <cd:command name="in" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="in" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> @@ -196,7 +196,7 @@ </cd:arguments> </cd:command> - <cd:command name="at" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="at" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text-optional"/> <cd:resolve name="argument-text-optional"/> @@ -204,25 +204,25 @@ </cd:arguments> </cd:command> - <cd:command name="about" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="about" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="from" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="from" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="over" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="over" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="filterreference" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="filterreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referencetype"/> @@ -230,7 +230,7 @@ </cd:arguments> </cd:command> - <cd:command name="getreferenceentry" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="getreferenceentry" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-referencetype"/> @@ -238,7 +238,7 @@ </cd:arguments> </cd:command> - <cd:command name="getreference" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="getreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referencetype"/> @@ -247,7 +247,7 @@ </cd:arguments> </cd:command> - <cd:command name="ref" category="references" file="strc-ref.mkvi"> + <cd:command name="ref" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords> <cd:resolve name="value-referencetype"/> @@ -256,7 +256,7 @@ </cd:arguments> </cd:command> - <cd:command name="somewhere" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="somewhere" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -264,7 +264,7 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpagestate" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="docheckedpagestate" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-command"/> @@ -276,7 +276,7 @@ </cd:arguments> </cd:command> - <cd:command name="someplace" category="references" file="strc-ref.mkvi"> + <cd:command name="someplace" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -287,19 +287,19 @@ </cd:arguments> </cd:command> - <cd:command name="atpage" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="atpage" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="symbolreference" category="references" file="strc-ref.mkvi"> + <cd:command name="symbolreference" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definereferenceformat" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="definereferenceformat" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -309,7 +309,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupreferenceformat" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="setupreferenceformat" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -346,7 +346,7 @@ </cd:arguments> </cd:command> - <cd:command name="referenceformat" generated="yes" variant="example" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="referenceformat" generated="yes" variant="example" level="document" category="references" file="strc-ref.mkvi"> <cd:sequence> <cd:variable value="referenceformat"/> </cd:sequence> @@ -357,27 +357,27 @@ </cd:arguments> </cd:command> - <cd:command name="goto" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="goto" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="goto" type="environment" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="goto" type="environment" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="gotobox" category="references" file="strc-ref.mkvi"> + <cd:command name="gotobox" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="useurl" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="useurl" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-url"/> @@ -386,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="useURL" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="useURL" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-url"/> @@ -395,7 +395,7 @@ </cd:arguments> </cd:command> - <cd:command name="usefile" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="usefile" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -403,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="useexternaldocument" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="useexternaldocument" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -411,7 +411,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseurldefined" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doifelseurldefined" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -419,7 +419,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifurldefinedelse" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doifurldefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -427,7 +427,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsefiledefined" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doifelsefiledefined" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -435,7 +435,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffiledefinedelse" category="references" level="system" file="strc-ref.mkvi"> + <cd:command name="doiffiledefinedelse" level="system" category="references conditional" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -443,7 +443,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupurl" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="setupurl" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -456,13 +456,13 @@ </cd:arguments> </cd:command> - <cd:command name="url" category="references" level="document" file="strc-ref.mkvi"> + <cd:command name="url" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineprogram" category="references" file="strc-ref.mkvi"> + <cd:command name="defineprogram" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -470,7 +470,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupprograms" category="references" file="strc-ref.mkvi"> + <cd:command name="setupprograms" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -483,27 +483,27 @@ </cd:arguments> </cd:command> - <cd:command name="program" category="references" file="strc-ref.mkvi"> + <cd:command name="program" level="document" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definepage" category="references" file="strc-ref.mkvi"> + <cd:command name="definepage" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="gotopage" category="references" file="strc-ref.mkvi"> + <cd:command name="gotopage" level="system" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="setupreferencestructureprefix" category="references" level="style" file="strc-ref.mkvi"> + <cd:command name="setupreferencestructureprefix" level="style" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -563,4 +563,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-regime.xml b/tex/context/interface/mkiv/i-regime.xml index 7a05afd32..e126abb65 100644 --- a/tex/context/interface/mkiv/i-regime.xml +++ b/tex/context/interface/mkiv/i-regime.xml @@ -4,11 +4,11 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="currentregime" file="regi-ini.mkiv"/> + <cd:command name="currentregime" level="system" category="language" file="regi-ini.mkiv"/> - <cd:command name="disableregime" file="regi-ini.mkiv"/> + <cd:command name="disableregime" level="system" category="language" file="regi-ini.mkiv"/> - <cd:command name="enableregime" level="style" file="regi-ini.mkiv"> + <cd:command name="enableregime" level="style" category="language" file="regi-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="regime" type="environment" file="regi-ini.mkiv"> + <cd:command name="regime" type="environment" level="system" category="language" file="regi-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:inherit name="enableregime"/> @@ -85,4 +85,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index d41fe8ef7..4d8010559 100644 --- a/tex/context/interface/mkiv/i-register.xml +++ b/tex/context/interface/mkiv/i-register.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineregister" level="style" file="strc-reg.mkiv"> + <cd:command name="defineregister" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregister" variant="argument" level="style" file="strc-reg.mkiv"> + <cd:command name="setupregister" variant="argument" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregister" level="style" file="strc-reg.mkiv"> + <cd:command name="setupregister" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -345,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" variant="argument" level="style" file="strc-reg.mkiv"> + <cd:command name="setupregisters" variant="argument" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -355,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" level="style" file="strc-reg.mkiv"> + <cd:command name="setupregisters" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -367,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="register" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -383,7 +383,7 @@ </cd:instances> </cd:command> - <cd:command name="register" generated="yes" variant="instance:ownnumber" level="document" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance:ownnumber" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -400,7 +400,7 @@ </cd:instances> </cd:command> - <cd:command name="seeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> + <cd:command name="seeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -421,7 +421,7 @@ </cd:instances> </cd:command> - <cd:command name="placeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> + <cd:command name="placeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -436,7 +436,7 @@ </cd:instances> </cd:command> - <cd:command name="completeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> + <cd:command name="completeregister" generated="yes" variant="instance" level="document" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -451,7 +451,7 @@ </cd:instances> </cd:command> - <cd:command name="setupregister" generated="yes" variant="instance" level="style" file="strc-reg.mkiv"> + <cd:command name="setupregister" generated="yes" variant="instance" level="style" category="structure" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -469,7 +469,7 @@ <!-- - <cd:command name="index" file="strc-reg.mkiv"> + <cd:command name="index" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -479,7 +479,7 @@ </cd:arguments> </cd:command> - <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv"> + <cd:command name="index" variant="ownnumber" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -490,7 +490,7 @@ </cd:arguments> </cd:command> - <cd:command name="seeindex" file="strc-reg.mkiv"> + <cd:command name="seeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -504,7 +504,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeindex" file="strc-reg.mkiv"> + <cd:command name="placeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupregister"/> @@ -512,7 +512,7 @@ </cd:arguments> </cd:command> - <cd:command name="completeindex" file="strc-reg.mkiv"> + <cd:command name="completeindex" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupregister"/> @@ -520,7 +520,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupindex" file="strc-reg.mkiv"> + <cd:command name="setupindex" level="style" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-list-optional"/> <cd:assignments list="yes"> @@ -531,7 +531,7 @@ --> - <cd:command name="startregister" file="strc-reg.mkiv"> + <cd:command name="startregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -546,14 +546,14 @@ </cd:arguments> </cd:command> - <cd:command name="stopregister" file="strc-reg.mkiv"> + <cd:command name="stopregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setregisterentry" file="strc-reg.mkiv"> + <cd:command name="setregisterentry" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-registerdata-list"/> @@ -561,7 +561,7 @@ </cd:arguments> </cd:command> - <cd:command name="finishregisterentry" file="strc-reg.mkiv"> + <cd:command name="finishregisterentry" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -584,7 +584,7 @@ </cd:arguments> </cd:command> - <cd:command name="setstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="setstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-registerdata-list"/> @@ -592,7 +592,7 @@ </cd:arguments> </cd:command> - <cd:command name="startstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="startstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -601,14 +601,14 @@ </cd:arguments> </cd:command> - <cd:command name="stopstructurepageregister" file="strc-reg.mkiv"> + <cd:command name="stopstructurepageregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="determineregistercharacteristics" file="strc-reg.mkiv"> + <cd:command name="determineregistercharacteristics" level="system" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -638,9 +638,9 @@ </cd:arguments> </cd:command> - <cd:command name="utilityregisterlength" file="strc-reg.mkiv"/> + <cd:command name="utilityregisterlength" level="system" category="structure" file="strc-reg.mkiv"/> - <cd:command name="placeregister" file="strc-reg.mkiv"> + <cd:command name="placeregister" level="document" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -649,7 +649,7 @@ </cd:arguments> </cd:command> - <cd:command name="completeregister" file="strc-reg.mkiv"> + <cd:command name="completeregister" level="document" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -658,10 +658,10 @@ </cd:arguments> </cd:command> - <cd:command name="currentregisterpageuserdata" level="system" file="strc-reg.mkiv"> + <cd:command name="currentregisterpageuserdata" level="system" category="structure" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-renderingwindow.xml b/tex/context/interface/mkiv/i-renderingwindow.xml index c07bf4430..525415c70 100644 --- a/tex/context/interface/mkiv/i-renderingwindow.xml +++ b/tex/context/interface/mkiv/i-renderingwindow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="useexternalrendering" file="scrn-wid.mkvi"> + <cd:command name="useexternalrendering" level="system" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setinternalrendering" file="scrn-wid.mkvi"> + <cd:command name="setinternalrendering" level="system" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="definerenderingwindow" level="style" file="scrn-wid.mkvi"> + <cd:command name="definerenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuprenderingwindow" level="style" file="scrn-wid.mkvi"> + <cd:command name="setuprenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -52,11 +52,11 @@ </cd:arguments> </cd:command> - <cd:command name="placerenderingwindow" file="scrn-wid.mkvi"> + <cd:command name="placerenderingwindow" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml index 82e2532f6..1cee232db 100644 --- a/tex/context/interface/mkiv/i-replacement.xml +++ b/tex/context/interface/mkiv/i-replacement.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="replaceword" level="style" file="lang-rep.mkiv"> + <cd:command name="replaceword" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="setreplacement" level="style" file="lang-rep.mkiv"> + <cd:command name="setreplacement" level="style" category="language" file="lang-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -21,6 +21,6 @@ </cd:arguments> </cd:command> - <cd:command name="resetreplacement" file="lang-rep.mkiv"/> + <cd:command name="resetreplacement" level="style" category="language" file="lang-rep.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-rotatation.xml b/tex/context/interface/mkiv/i-rotatation.xml index ee151b0be..7bfb9b2de 100644 --- a/tex/context/interface/mkiv/i-rotatation.xml +++ b/tex/context/interface/mkiv/i-rotatation.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="mirror" level="document" file="grph-trf.mkiv"> + <cd:command name="mirror" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuprotate" level="style" file="grph-trf.mkiv"> + <cd:command name="setuprotate" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="rotate" level="document" file="grph-trf.mkiv"> + <cd:command name="rotate" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuprotate"/> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="dorotatebox" level="system" file="grph-trf.mkiv"> + <cd:command name="dorotatebox" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> @@ -51,4 +51,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml index 4684f780f..10bcff22e 100644 --- a/tex/context/interface/mkiv/i-ruby.xml +++ b/tex/context/interface/mkiv/i-ruby.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineruby" level="style" file="typo-rub.mkiv"> + <cd:command name="defineruby" level="style" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupruby" level="style" file="typo-rub.mkiv"> + <cd:command name="setupruby" level="style" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" level="document" file="typo-rub.mkiv"> + <cd:command name="ruby" level="document" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -67,10 +67,10 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" type="environment" level="document" file="typo-rub.mkiv"> + <cd:command name="ruby" type="environment" level="document" category="fonts" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml index df1cf37a6..3d26ed76f 100644 --- a/tex/context/interface/mkiv/i-scale.xml +++ b/tex/context/interface/mkiv/i-scale.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definescale" level="style" file="grph-trf.mkiv"> + <cd:command name="definescale" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupscale" level="style" file="grph-trf.mkiv"> + <cd:command name="setupscale" level="style" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -93,7 +93,7 @@ </cd:arguments> </cd:command> - <cd:command name="scale" level="document" file="grph-trf.mkiv"> + <cd:command name="scale" level="document" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -103,14 +103,14 @@ </cd:arguments> </cd:command> - <cd:command name="fastscale" file="grph-trf.mkiv"> + <cd:command name="fastscale" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fastsxsy" file="grph-trf.mkiv"> + <cd:command name="fastsxsy" level="system" category="graphics" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -118,4 +118,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-scite.xml b/tex/context/interface/mkiv/i-scite.xml index e62bc9067..f04e575e0 100644 --- a/tex/context/interface/mkiv/i-scite.xml +++ b/tex/context/interface/mkiv/i-scite.xml @@ -4,19 +4,26 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="scite" type="environment" file="m-scite.mkiv"> + <cd:command name="scite" type="environment" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-scite-optional"/> </cd:arguments> </cd:command> - <cd:command name="scitefile" file="m-scite.mkiv"> + <cd:command name="scitefile" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="scitebuffer" file="m-scite.mkiv"> + <cd:command name="scitebuffer" level="document" category="verbatim" file="m-scite.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-scite-optional"/> + <cd:resolve name="keyword-buffer"/> + </cd:arguments> + </cd:command> + + <cd:command name="sciteinlinebuffer" level="document" category="verbatim" file="m-scite.mkiv"> <cd:arguments> <cd:resolve name="keyword-scite-optional"/> <cd:resolve name="keyword-buffer"/> diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml index c60afad09..9af017492 100644 --- a/tex/context/interface/mkiv/i-script.xml +++ b/tex/context/interface/mkiv/i-script.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definescript" category="language" level="style" file="scrp-ini.mkvi"> + <cd:command name="definescript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupscript" category="language" level="style" file="scrp-ini.mkvi"> + <cd:command name="setupscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupscripts" category="language" level="style" file="scrp-ini.mkvi"> + <cd:command name="setupscripts" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="setscript" category="language" level="style" file="scrp-ini.mkvi"> + <cd:command name="setscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="resetscript" category="language" file="scrp-ini.mkvi"/> + <cd:command name="resetscript" level="system" category="language" file="scrp-ini.mkvi"/> <cd:command name="script" type="environment" category="language" file="scrp-ini.mkvi"> <cd:arguments> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="script" generated="yes" variant="instance" category="language" file="scrp-ini.mkvi"> + <cd:command name="script" generated="yes" variant="instance" level="document" category="language" file="scrp-ini.mkvi"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> @@ -86,20 +86,20 @@ <!-- - <cd:command name="hangul" file="scrp-ini.mkvi"/> + <cd:command name="hangul" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="hanzi" file="scrp-ini.mkvi"/> + <cd:command name="hanzi" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="nihongo" file="scrp-ini.mkvi"/> + <cd:command name="nihongo" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="ethiopic" file="scrp-ini.mkvi"/> + <cd:command name="ethiopic" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="thai" file="scrp-ini.mkvi"/> + <cd:command name="thai" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="latin" file="scrp-ini.mkvi"/> + <cd:command name="latin" level="document" category="language" file="scrp-ini.mkvi"/> - <cd:command name="test" file="scrp-ini.mkvi"/> + <cd:command name="test" level="document" category="language" file="scrp-ini.mkvi"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index 3130085a6..3f462db02 100644 --- a/tex/context/interface/mkiv/i-section.xml +++ b/tex/context/interface/mkiv/i-section.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definehead" level="style" file="strc-sec.mkiv"> + <cd:command name="definehead" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-section-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphead" level="style" file="strc-sec.mkiv"> + <cd:command name="setuphead" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -236,15 +236,20 @@ <cd:parameter name="deepnumbercommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> - <cd:parameter name="location"> + <cd:parameter name="location"> <!-- optional margin location --> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="criterium"> + <cd:constant type="strict"/> + <cd:constant type="positive"/> + <cd:constant type="all"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupheads" level="style" file="strc-sec.mkiv"> + <cd:command name="setupheads" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -253,7 +258,7 @@ </cd:arguments> </cd:command> - <cd:command name="section" generated="yes" variant="instance" level="document" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -266,7 +271,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:ownnumber" level="document" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:ownnumber" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -280,7 +285,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:assignment" level="document" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:assignment" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -292,7 +297,7 @@ </cd:instances> </cd:command> - <cd:command name="section" type="environment" generated="yes" variant="instance" level="document" file="strc-sec.mkiv"> + <cd:command name="section" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -307,182 +312,182 @@ <!-- - <cd:command name="part" file="strc-sec.mkiv"> + <cd:command name="part" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="chapter" file="strc-sec.mkiv"> + <cd:command name="chapter" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="section" file="strc-sec.mkiv"> + <cd:command name="section" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsection" file="strc-sec.mkiv"> + <cd:command name="subsection" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsection" file="strc-sec.mkiv"> + <cd:command name="subsubsection" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsection" file="strc-sec.mkiv"> + <cd:command name="subsubsubsection" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubsection" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubsection" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="title" file="strc-sec.mkiv"> + <cd:command name="title" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subject" file="strc-sec.mkiv"> + <cd:command name="subject" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubject" file="strc-sec.mkiv"> + <cd:command name="subsubject" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubject" file="strc-sec.mkiv"> + <cd:command name="subsubsubject" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubject" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubject" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubsubject" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubsubject" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="part" type="environment" file="strc-sec.mkiv"> + <cd:command name="part" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="chapter" type="environment" file="strc-sec.mkiv"> + <cd:command name="chapter" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="section" type="environment" file="strc-sec.mkiv"> + <cd:command name="section" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsubsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="title" type="environment" file="strc-sec.mkiv"> + <cd:command name="title" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subject" type="environment" file="strc-sec.mkiv"> + <cd:command name="subject" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubject" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubject" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubject" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsubject" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubject" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubject" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subsubsubsubsubject" type="environment" file="strc-sec.mkiv"> + <cd:command name="subsubsubsubsubject" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="assignment-sectiondata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> @@ -491,7 +496,7 @@ --> - <cd:command name="namedsection" type="environment" level="document" file="strc-sec.mkiv"> + <cd:command name="namedsection" type="environment" level="document" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -499,25 +504,25 @@ </cd:arguments> </cd:command> - <cd:command name="definesection" file="strc-sec.mkiv"> + <cd:command name="definesection" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placeheadtext" file="strc-sec.mkiv"> + <cd:command name="placeheadtext" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="placeheadnumber" file="strc-sec.mkiv"> + <cd:command name="placeheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="setupheadnumber" file="strc-sec.mkiv"> + <cd:command name="setupheadnumber" level="style" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords> @@ -526,21 +531,21 @@ </cd:arguments> </cd:command> - <cd:command name="determineheadnumber" file="strc-sec.mkiv"> + <cd:command name="determineheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> </cd:arguments> </cd:command> - <cd:command name="currentheadnumber" file="strc-sec.mkiv"/> + <cd:command name="currentheadnumber" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="namedheadnumber" file="strc-sec.mkiv"> + <cd:command name="namedheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> </cd:arguments> </cd:command> - <cd:command name="somenamedheadnumber" file="strc-sec.mkiv"> + <cd:command name="somenamedheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:keywords delimiters="braces"> @@ -553,7 +558,7 @@ </cd:arguments> </cd:command> - <cd:command name="headnumber" file="strc-sec.mkiv"> + <cd:command name="headnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords optional="yes"> @@ -566,7 +571,7 @@ </cd:arguments> </cd:command> - <cd:command name="someheadnumber" file="strc-sec.mkiv"> + <cd:command name="someheadnumber" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:keywords> @@ -579,50 +584,50 @@ </cd:arguments> </cd:command> - <cd:command name="namedstructureheadlocation" level="system" file="strc-sec.mkiv"> + <cd:command name="namedstructureheadlocation" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> </cd:arguments> </cd:command> - <cd:command name="structurenumber" file="strc-sec.mkiv"/> + <cd:command name="structurenumber" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="structuretitle" file="strc-sec.mkiv"/> + <cd:command name="structuretitle" level="system" category="structure" file="strc-sec.mkiv"/> - <cd:command name="structurevariable" file="strc-sec.mkiv"> + <cd:command name="structurevariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="structureuservariable" file="strc-sec.mkiv"> + <cd:command name="structureuservariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="namedstructurevariable" level="system" file="strc-sec.mkiv"> + <cd:command name="namedstructurevariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="namedstructureuservariable" level="system" file="strc-sec.mkiv"> + <cd:command name="namedstructureuservariable" level="system" category="structure" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="definesectionlevels" file="strc-lev.mkvi"> + <cd:command name="definesectionlevels" level="style" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-section-list"/> </cd:arguments> </cd:command> - <cd:command name="sectionlevel" type="environment" level="document" file="strc-lev.mkvi"> + <cd:command name="sectionlevel" type="environment" level="document" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -630,7 +635,7 @@ </cd:arguments> </cd:command> - <cd:command name="subjectlevel" type="environment" level="document" file="strc-lev.mkvi"> + <cd:command name="subjectlevel" type="environment" level="document" category="structure" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -638,7 +643,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineheadalternative" level="style" file="strc-ren.mkiv"> + <cd:command name="defineheadalternative" level="style" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -648,7 +653,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheadalternative" level="style" file="strc-ren.mkiv"> + <cd:command name="setupheadalternative" level="style" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -664,38 +669,38 @@ </cd:arguments> </cd:command> - <cd:command name="localheadsetup" type="environment" file="strc-ren.mkiv"/> + <cd:command name="localheadsetup" type="environment" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headhbox" level="system" file="strc-ren.mkiv"> + <cd:command name="headhbox" level="system" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headvbox" level="system" file="strc-ren.mkiv"> + <cd:command name="headvbox" level="system" category="structure" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headreferenceattributes" level="system" file="strc-ren.mkiv"/> + <cd:command name="headreferenceattributes" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumbercontent" file="strc-ren.mkiv"/> + <cd:command name="headnumbercontent" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextcontent" file="strc-ren.mkiv"/> + <cd:command name="headtextcontent" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headwidth" file="strc-ren.mkiv"/> + <cd:command name="headwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextwidth" file="strc-ren.mkiv"/> + <cd:command name="headtextwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumberwidth" file="strc-ren.mkiv"/> + <cd:command name="headnumberwidth" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headnumberdistance" file="strc-ren.mkiv"/> + <cd:command name="headnumberdistance" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headtextdistance" file="strc-ren.mkiv"/> + <cd:command name="headtextdistance" level="system" category="structure" file="strc-ren.mkiv"/> - <cd:command name="headsetupspacing" file="strc-ren.mkiv"/> + <cd:command name="headsetupspacing" level="system" category="structure" file="strc-ren.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml index fb59e16af..1cb2debde 100644 --- a/tex/context/interface/mkiv/i-sectionblock.xml +++ b/tex/context/interface/mkiv/i-sectionblock.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesectionblock" level="style" file="strc-sbe.mkiv"> + <cd:command name="definesectionblock" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsectionblock" level="style" file="strc-sbe.mkiv"> + <cd:command name="setupsectionblock" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -35,7 +35,7 @@ </cd:arguments> </cd:command> - <cd:command name="setsectionblock" file="strc-sbe.mkiv"> + <cd:command name="setsectionblock" level="system" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="sectionblock" type="environment" level="document" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -58,7 +58,7 @@ </cd:arguments> </cd:command> - <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" level="document" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" level="document" category="structure" file="strc-sbe.mkiv"> <cd:sequence> <cd:instance value="sectionblock"/> </cd:sequence> @@ -75,7 +75,7 @@ </cd:instances> </cd:command> - <cd:command name="sectionblockenvironment" type="environment" level="style" file="strc-sbe.mkiv"> + <cd:command name="sectionblockenvironment" type="environment" level="style" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -83,7 +83,7 @@ <!-- - <cd:command name="frontmatter" type="environment" file="strc-sbe.mkiv"> + <cd:command name="frontmatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="bookmark"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="bodymatter" type="environment" file="strc-sbe.mkiv"> + <cd:command name="bodymatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="bookmark"> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendices" type="environment" file="strc-sbe.mkiv"> + <cd:command name="appendices" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="bookmark"> @@ -116,7 +116,7 @@ </cd:arguments> </cd:command> - <cd:command name="backmatter" type="environment" file="strc-sbe.mkiv"> + <cd:command name="backmatter" type="environment" level="document" category="structure" file="strc-sbe.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="bookmark"> @@ -129,4 +129,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml index 6a68fb328..44970669b 100644 --- a/tex/context/interface/mkiv/i-selector.xml +++ b/tex/context/interface/mkiv/i-selector.xml @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="directselect" file="core-env.mkiv"> + <cd:command name="directselect" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content optional="yes"/> @@ -49,4 +49,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml index 4771230eb..a4420bfcf 100644 --- a/tex/context/interface/mkiv/i-setup.xml +++ b/tex/context/interface/mkiv/i-setup.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupsetup" file="x-setups-basics.mkiv"> + <cd:command name="setupsetup" level="style" file="x-setups-basics.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="criterium"> @@ -19,124 +19,149 @@ </cd:arguments> </cd:command> - <cd:command name="basicsetup" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="basicsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="basicsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="shortsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="shortsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" file="x-setups-basics.mkiv"> + <cd:command name="setup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="setup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="showsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="showsetup" variant="argument" level="system" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdinternal" file="x-setups-basics.mkiv"> + <cd:command name="placesetup" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="placeallsetups" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="placeeverysetup" level="document" file="x-setups-basics.mkiv"/> + + <cd:command name="showrootvalues" level="document" file="x-setups-basics.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="showinstancevalues" level="document" file="x-setups-basics.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-text"/> + <cd:resolve name="keyword-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="cmdinternal" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetup" variant="argument" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetup" variant="argument" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdbasicsetupinstance" file="x-setups-basics.mkiv"> + <cd:command name="cmdbasicsetupinstance" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdshortsetupinstance" file="x-setups-basics.mkiv"> + <cd:command name="cmdshortsetupinstance" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="cmdfullsetupinstance" file="x-setups-basics.mkiv"> + <cd:command name="cmdfullsetupinstance" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showdefinition" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="definition" file="x-setups-basics.mkiv"> + <cd:command name="showdefinition" variant="argument" level="document" file="x-setups-basics.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="definition" level="document" file="x-setups-basics.mkiv"> <cd:arguments> <cd:resolve name="keyword-text-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml index 5d3a7c9b1..df7281e74 100644 --- a/tex/context/interface/mkiv/i-setups.xml +++ b/tex/context/interface/mkiv/i-setups.xml @@ -4,67 +4,67 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setups" file="core-env.mkiv"> + <cd:command name="setups" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setups" variant="direct" file="core-env.mkiv"> + <cd:command name="setups" variant="direct" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setup" file="core-env.mkiv"> + <cd:command name="setup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setup" variant="direct" file="core-env.mkiv"> + <cd:command name="setup" variant="direct" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetup" file="core-env.mkiv"> + <cd:command name="directsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetup" file="core-env.mkiv"> + <cd:command name="fastsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texsetup" file="core-env.mkiv"> + <cd:command name="texsetup" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="luasetup" file="core-env.mkiv"> + <cd:command name="luasetup" level="style" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="systemsetups" file="core-env.mkiv"> + <cd:command name="systemsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsetups" file="core-env.mkiv"> + <cd:command name="resetsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showsetupsdefinition" file="core-env.mkiv"> + <cd:command name="showsetupsdefinition" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="autosetups" file="core-env.mkiv"> + <cd:command name="autosetups" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> @@ -116,7 +116,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesetups" level="system" file="core-env.mkiv"> + <cd:command name="doifelsesetups" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -124,7 +124,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetupselse" level="system" file="core-env.mkiv"> + <cd:command name="doifsetupselse" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -132,21 +132,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetups" level="system" file="core-env.mkiv"> + <cd:command name="doifsetups" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotsetups" level="system" file="core-env.mkiv"> + <cd:command name="doifnotsetups" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="luasetups" type="environment" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" level="system" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -155,13 +155,13 @@ </cd:arguments> </cd:command> - <cd:command name="luasetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="luasetups" type="environment" variant="string" level="system" category="lua" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" level="style" category="xml" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="xmlsetups" type="environment" variant="string" level="style" category="xml" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> @@ -191,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" level="style" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -200,13 +200,13 @@ </cd:arguments> </cd:command> - <cd:command name="localsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="localsetups" type="environment" variant="string" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" file="core-env.mkiv"> + <cd:command name="setups" type="environment" level="style" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -215,10 +215,10 @@ </cd:arguments> </cd:command> - <cd:command name="setups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="setups" type="environment" variant="string" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml index c9611e3bf..521317d1d 100644 --- a/tex/context/interface/mkiv/i-shift.xml +++ b/tex/context/interface/mkiv/i-shift.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineshift" level="style" file="node.rul.mkiv"> + <cd:command name="defineshift" level="style" category="layout" file="node.rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupshift" level="style" file="node-rul.mkiv"> + <cd:command name="setupshift" level="style" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="shift" generated="yes" variant="instance" level="document" file="node-rul.mkiv"> + <cd:command name="shift" generated="yes" variant="instance" level="document" category="layout" file="node-rul.mkiv"> <cd:sequence> <cd:instance value="shift"/> </cd:sequence> @@ -67,7 +67,7 @@ </cd:instances> </cd:command> - <cd:command name="shift" type="environment" level="document" file="node-rul.mkiv"> + <cd:command name="shift" type="environment" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -75,13 +75,13 @@ <!-- - <cd:command name="shiftup" file="node-rul.mkiv"> + <cd:command name="shiftup" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="shiftdown" file="node-rul.mkiv"> + <cd:command name="shiftdown" level="document" category="layout" file="node-rul.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -89,4 +89,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sidebar.xml b/tex/context/interface/mkiv/i-sidebar.xml index 8926954e3..7518b5c61 100644 --- a/tex/context/interface/mkiv/i-sidebar.xml +++ b/tex/context/interface/mkiv/i-sidebar.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesidebar" level="style" file="anch-bar.mkiv"> + <cd:command name="definesidebar" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsidebar" level="style" file="anch-bar.mkiv"> + <cd:command name="setupsidebar" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -48,7 +48,7 @@ <!-- - <cd:command name="setupsidebars" file="anch-bar.mkiv"> + <cd:command name="setupsidebars" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -59,7 +59,7 @@ --> - <cd:command name="sidebar" type="environment" level="document" file="anch-bar.mkiv"> + <cd:command name="sidebar" type="environment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -68,7 +68,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginrule" level="style" file="anch-bar.mkiv"> + <cd:command name="setupmarginrule" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:assignments list="yes"> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarginrules" level="style" file="anch-bar.mkiv"> + <cd:command name="setupmarginrules" level="style" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:assignments list="yes"> @@ -86,13 +86,13 @@ </cd:arguments> </cd:command> - <cd:command name="marginrule" type="environment" level="document" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="marginrule" type="environment" variant="assignment" level="document" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" variant="assignment" level="document" category="rules" file="anch-bar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml index 74df570e2..9183c8a6b 100644 --- a/tex/context/interface/mkiv/i-smash.xml +++ b/tex/context/interface/mkiv/i-smash.xml @@ -79,4 +79,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml index b5e4e40f1..5a263ab97 100644 --- a/tex/context/interface/mkiv/i-sort.xml +++ b/tex/context/interface/mkiv/i-sort.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesorting" category="language" level="style" file="strc-syn.mkiv"> + <cd:command name="definesorting" level="style" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural"/> @@ -15,7 +15,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsorting" category="language" level="style" file="strc-syn.mkiv"> + <cd:command name="setupsorting" level="style" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="sorting" generated="yes" variant="instance" category="language" level="document" file="strc-syn.mkiv"> + <cd:command name="sorting" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="sorting"/> </cd:sequence> @@ -91,7 +91,7 @@ </cd:instances> </cd:command> - <cd:command name="definesort" category="language" file="strc-syn.mkiv"> + <cd:command name="definesort" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -103,7 +103,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofsorts" generated="yes" variant="instance" category="language" level="document" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="sorts"/> @@ -118,7 +118,7 @@ </cd:instances> </cd:command> - <cd:command name="completelistofsorts" generated="yes" variant="instance" category="language" level="document" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" generated="yes" variant="instance" level="document" category="language" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="sorts"/> @@ -133,27 +133,27 @@ </cd:instances> </cd:command> - <cd:command name="doifelsecurrentsortingused" category="language" level="system" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsortingused" level="system" category="language conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="resetusedsortings" category="language" file="strc-syn.mkiv"> + <cd:command name="resetusedsortings" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="registersort" category="language" file="strc-syn.mkiv"> + <cd:command name="registersort" level="system" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="placelistofsorts" category="language" level="document" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -162,7 +162,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofsorts" category="language" level="document" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -173,14 +173,14 @@ <!-- - <cd:command name="logo" file="strc-syn.mkiv"> + <cd:command name="logo" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="placelistoflogos" file="strc-syn.mkiv"> + <cd:command name="placelistoflogos" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsorting"/> @@ -188,7 +188,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistoflogos" file="strc-syn.mkiv"> + <cd:command name="completelistoflogos" level="document" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsorting"/> @@ -198,4 +198,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-soundtrack.xml b/tex/context/interface/mkiv/i-soundtrack.xml index 2351476b3..c374268bb 100644 --- a/tex/context/interface/mkiv/i-soundtrack.xml +++ b/tex/context/interface/mkiv/i-soundtrack.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupexternalsoundtracks" level="style" file="scrn-wid.mkvi"> + <cd:command name="setupexternalsoundtracks" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -14,17 +14,17 @@ </cd:arguments> </cd:command> - <cd:command name="useexternalsoundtrack" level="style" file="scrn-wid.mkvi"> + <cd:command name="useexternalsoundtrack" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="checksoundtrack" file="scrn-wid.mkvi"> + <cd:command name="checksoundtrack" level="style" category="pdf" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml index 7b328eea6..90a219fc8 100644 --- a/tex/context/interface/mkiv/i-spellchecking.xml +++ b/tex/context/interface/mkiv/i-spellchecking.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupspellchecking" category="language" level="style" file="lang-wrd.mkiv"> + <cd:command name="setupspellchecking" level="style" category="language" file="lang-wrd.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -23,11 +23,11 @@ </cd:arguments> </cd:command> - <cd:command name="loadspellchecklist" category="language" level="style" file="lang-wrd.mkiv"> + <cd:command name="loadspellchecklist" level="style" category="language" file="lang-wrd.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml index 51aad21f2..8181cfe2d 100644 --- a/tex/context/interface/mkiv/i-spreadsheet.xml +++ b/tex/context/interface/mkiv/i-spreadsheet.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definespreadsheet" level="style" file="m-spreadsheet.mkiv"> + <cd:command name="definespreadsheet" level="style" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupspreadsheet" level="style" file="m-spreadsheet.mkiv"> + <cd:command name="setupspreadsheet" level="style" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -32,31 +32,31 @@ </cd:arguments> </cd:command> - <cd:command name="resetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="resetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="spreadsheet" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="spreadsheet" type="environment" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="showspreadsheet" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="inspectspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="inspectspreadsheet" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="setspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -65,7 +65,7 @@ </cd:arguments> </cd:command> - <cd:command name="getspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="getspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsespreadsheetcell" level="system" file="m-spreadsheet.mkiv"> + <cd:command name="doifelsespreadsheetcell" level="system" category="tables conditional" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -84,7 +84,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifspreadsheetcellelse" level="system" file="m-spreadsheet.mkiv"> + <cd:command name="doifspreadsheetcellelse" level="system" category="tables conditional" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -94,31 +94,31 @@ </cd:arguments> </cd:command> - <cd:command name="TABLEsetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="TABLEsetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TABLEgetspreadsheet" file="m-spreadsheet.mkiv"> + <cd:command name="TABLEgetspreadsheet" level="system" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setspr" file="m-spreadsheet.mkiv"> + <cd:command name="setspr" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getspr" file="m-spreadsheet.mkiv"> + <cd:command name="getspr" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="spreadsheettable" type="environment" level="document" file="m-spreadsheet.mkiv"> + <cd:command name="spreadsheettable" type="environment" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -127,9 +127,9 @@ </cd:arguments> </cd:command> - <cd:command name="row" type="environment" level="document" file="m-spreadsheet.mkiv"/> + <cd:command name="row" type="environment" scope="spreadsheettable" level="document" category="tables" file="m-spreadsheet.mkiv"/> - <cd:command name="cell" type="environment" level="document" file="m-spreadsheet.mkiv"> + <cd:command name="cell" type="environment" scope="spreadsheettable" level="document" category="tables" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml index 08c5d2ba0..c7780488c 100644 --- a/tex/context/interface/mkiv/i-startstop.xml +++ b/tex/context/interface/mkiv/i-startstop.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definestartstop" level="style" file="core-sys.mkiv"> + <cd:command name="definestartstop" level="style" category="structure" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstartstop" level="style" file="core-sys.mkiv"> + <cd:command name="setupstartstop" level="style" category="structure" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -51,13 +51,13 @@ </cd:arguments> </cd:command> - <cd:command name="startstop" type="environment" generated="yes" variant="example" file="core-sys.mkiv"> + <cd:command name="startstop" type="environment" generated="yes" variant="example" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command name="startstop" type="environment" file="core-sys.mkiv"> + <cd:command name="startstop" type="environment" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:string value=""/><!-- value="zero width space --> </cd:sequence> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="startstop" generated="yes" variant="example" file="core-sys.mkiv"> + <cd:command name="startstop" generated="yes" variant="example" level="document" category="structure" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="startstop"/> </cd:sequence> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-steps.xml b/tex/context/interface/mkiv/i-steps.xml index e27fe5f16..c71bc2e2f 100644 --- a/tex/context/interface/mkiv/i-steps.xml +++ b/tex/context/interface/mkiv/i-steps.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="setupSTEPchart" file="m-steps.mkvi"> + <cd:command name="setupSTEPchart" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -29,7 +29,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPcharts" file="m-steps.mkvi"> + <cd:command name="setupSTEPcharts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -41,7 +41,7 @@ --> - <cd:command name="setupSTEPcharts" level="style" file="m-steps.mkvi"> + <cd:command name="setupSTEPcharts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -66,7 +66,7 @@ <!-- - <cd:command name="setupSTEPcell" file="m-steps.mkvi"> + <cd:command name="setupSTEPcell" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPcells" file="m-steps.mkvi"> + <cd:command name="setupSTEPcells" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -114,7 +114,7 @@ --> - <cd:command name="setupSTEPcells" level="style" file="m-steps.mkvi"> + <cd:command name="setupSTEPcells" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -152,7 +152,7 @@ <!-- - <cd:command name="setupSTEPtext" file="m-steps.mkvi"> + <cd:command name="setupSTEPtext" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -185,7 +185,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPtexts" file="m-steps.mkvi"> + <cd:command name="setupSTEPtexts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -197,7 +197,7 @@ --> - <cd:command name="setupSTEPtexts" level="style" file="m-steps.mkvi"> + <cd:command name="setupSTEPtexts" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -232,7 +232,7 @@ <!-- - <cd:command name="setupSTEPline" file="m-steps.mkvi"> + <cd:command name="setupSTEPline" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -259,7 +259,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupSTEPlines" file="m-steps.mkvi"> + <cd:command name="setupSTEPlines" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -271,7 +271,7 @@ --> - <cd:command name="setupSTEPlines" level="style" file="m-steps.mkvi"> + <cd:command name="setupSTEPlines" level="style" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -298,7 +298,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPchart" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPchart" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -307,7 +307,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPtable" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPtable" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -316,7 +316,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPaligntable" type="environment" file="m-steps.mkvi"> + <cd:command name="STEPaligntable" type="environment" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -325,7 +325,7 @@ </cd:arguments> </cd:command> - <cd:command name="STEPchart" file="m-steps.mkvi"> + <cd:command name="STEPchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -334,15 +334,15 @@ </cd:arguments> </cd:command> - <cd:command name="makeSTEPchart" file="m-steps.mkvi"> + <cd:command name="makeSTEPchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="STEPcell" type="environment" file="m-steps.mkvi"/> + <cd:command name="STEPcell" type="environment" level="document" category="graphics" file="m-steps.mkvi"/> - <cd:command name="cells" file="m-steps.mkvi"> + <cd:command name="cells" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -350,7 +350,7 @@ </cd:arguments> </cd:command> - <cd:command name="cells" variant="aligntable" file="m-steps.mkvi"> + <cd:command name="cells" variant="aligntable" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -359,7 +359,7 @@ </cd:arguments> </cd:command> - <cd:command name="texts" file="m-steps.mkvi"> + <cd:command name="texts" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -367,42 +367,42 @@ </cd:arguments> </cd:command> - <cd:command name="cell" file="m-steps.mkvi"> + <cd:command name="cell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="text" file="m-steps.mkvi"> + <cd:command name="text" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="toptext" file="m-steps.mkvi"> + <cd:command name="toptext" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="bottext" file="m-steps.mkvi"> + <cd:command name="bottext" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="topcell" file="m-steps.mkvi"> + <cd:command name="topcell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="botcell" file="m-steps.mkvi"> + <cd:command name="botcell" scope="stepchart" level="document" category="graphics" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml index b392fd001..7e769fdb6 100644 --- a/tex/context/interface/mkiv/i-stream.xml +++ b/tex/context/interface/mkiv/i-stream.xml @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml index 567881602..aba5429c5 100644 --- a/tex/context/interface/mkiv/i-string.xml +++ b/tex/context/interface/mkiv/i-string.xml @@ -66,4 +66,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml index 88047dd3d..ff200e4db 100644 --- a/tex/context/interface/mkiv/i-strut.xml +++ b/tex/context/interface/mkiv/i-strut.xml @@ -4,15 +4,15 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="strutdp" file="supp-box.mkiv"/> + <cd:command name="strutdp" level="system" file="supp-box.mkiv"/> - <cd:command name="strutht" file="supp-box.mkiv"/> + <cd:command name="strutht" level="system" file="supp-box.mkiv"/> - <cd:command name="strutwd" file="supp-box.mkiv"/> + <cd:command name="strutwd" level="system" file="supp-box.mkiv"/> - <cd:command name="struthtdp" file="supp-box.mkiv"/> + <cd:command name="struthtdp" level="system" file="supp-box.mkiv"/> - <cd:command name="setupstruts" file="spac-ver.mkiv"> + <cd:command name="setupstruts" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:resolve name="value-strut"/> @@ -28,12 +28,17 @@ </cd:arguments> </cd:command> - <cd:command name="strut" file="spac-ver.mkiv"/> - <cd:command name="halfstrut" file="spac-ver.mkiv"/> - <cd:command name="quarterstrut" file="spac-ver.mkiv"/> - <cd:command name="halflinestrut" file="spac-ver.mkiv"/> - <cd:command name="noheightstrut" file="spac-ver.mkiv"/> - <cd:command name="depthstrut" file="spac-ver.mkiv"/> + <cd:command name="strut" level="style" file="spac-ver.mkiv"/> + + <cd:command name="halfstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="quarterstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="halflinestrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="noheightstrut" level="system" file="spac-ver.mkiv"/> + + <cd:command name="depthstrut" level="system" file="spac-ver.mkiv"/> <cd:command name="setstrut" level="system" file="spac-ver.mkiv"/> @@ -49,10 +54,10 @@ <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="showstruts" file="spac-ver.mkiv"/> + <cd:command name="showstruts" level="document" file="spac-ver.mkiv"/> - <cd:command name="showcolorstruts" file="spac-ver.mkiv"/> + <cd:command name="showcolorstruts" level="document" file="spac-ver.mkiv"/> <cd:command name="strut" type="environment" begin="beg" end="end" level="system" file="spac-ver.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index d7e1e5926..123e98cbf 100644 --- a/tex/context/interface/mkiv/i-symbol.xml +++ b/tex/context/interface/mkiv/i-symbol.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesymbol" category="symbols" level="style" file="symb-ini.mkiv"> + <cd:command name="definesymbol" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinsymbolset" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifelseinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsymbolsetelse" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinsymbolset" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesymbolset" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifelsesymbolset" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -47,7 +47,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsymbolsetelse" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifsymbolsetelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -55,27 +55,27 @@ </cd:arguments> </cd:command> - <cd:command name="symbol" category="symbols" level="document" file="symb-ini.mkiv"> + <cd:command name="symbol" level="document" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="symbol" variant="direct" category="symbols" level="document" file="symb-ini.mkiv"> + <cd:command name="symbol" variant="direct" level="document" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsymbol" category="symbols" file="symb-ini.mkiv"> + <cd:command name="directsymbol" level="system" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definefiguresymbol" category="symbols" level="style" file="symb-ini.mkiv"> + <cd:command name="definefiguresymbol" level="style" category="symbols graphics" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="figuresymbol" category="symbols" level="document" file="symb-ini.mkiv"> + <cd:command name="figuresymbol" level="document" category="symbols graphics" file="symb-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesymboldefined" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifelsesymboldefined" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -108,7 +108,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsymboldefinedelse" category="symbols" level="system" file="symb-ini.mkiv"> + <cd:command name="doifsymboldefinedelse" level="system" category="symbols conditional" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -116,30 +116,30 @@ </cd:arguments> </cd:command> - <cd:command name="symbolset" type="environment" category="symbols" level="style" file="symb-ini.mkiv"> + <cd:command name="symbolset" type="environment" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupsymbolset" category="symbols" level="style" file="symb-ini.mkiv"> + <cd:command name="setupsymbolset" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsymbolset" category="symbols" file="symb-ini.mkiv"/> + <cd:command name="resetsymbolset" level="system" category="symbols" file="symb-ini.mkiv"/> - <cd:command name="usesymbols" category="symbols" level="style" file="symb-ini.mkiv"> + <cd:command name="usesymbols" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="showsymbolset" category="symbols" level="document" file="symb-run.mkiv"> + <cd:command name="showsymbolset" level="document" category="symbols" file="symb-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synctex.xml b/tex/context/interface/mkiv/i-synctex.xml new file mode 100644 index 000000000..21f49e3f6 --- /dev/null +++ b/tex/context/interface/mkiv/i-synctex.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="synctexsetfilename" level="system" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="synctexresetfilename" level="system" category="pdf" file="cont-run.mkiv"/> + + <cd:command name="synctexblockfilename" level="system" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="setupsynctex" level="style" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop" default="yes"/> + </cd:parameter> + <cd:parameter name="method"> + <cd:constant type="min"/> + <cd:constant type="max" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="blocksynctexfile" level="style" category="pdf" file="cont-run.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-file-list"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml index 75c623210..3e3e1c027 100644 --- a/tex/context/interface/mkiv/i-synonym.xml +++ b/tex/context/interface/mkiv/i-synonym.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definesynonyms" level="style" file="strc-syn.mkiv"> + <cd:command name="definesynonyms" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural"/> @@ -17,7 +17,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsynonyms" level="style" file="strc-syn.mkiv"> + <cd:command name="setupsynonyms" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="synonym" generated="yes" variant="instance" level="document" file="strc-syn.mkiv"> + <cd:command name="synonym" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -94,7 +94,7 @@ </cd:instances> </cd:command> - <cd:command name="definesynonym" level="style" file="strc-syn.mkiv"> + <cd:command name="definesynonym" level="style" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -107,7 +107,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofsynonyms" generated="yes" variant="instance" level="document" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="synonyms"/> @@ -122,7 +122,7 @@ </cd:instances> </cd:command> - <cd:command name="completelistofsynonyms" generated="yes" variant="instance" level="document" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" generated="yes" variant="instance" level="document" category="symbols" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -137,40 +137,40 @@ </cd:instances> </cd:command> - <cd:command name="registersynonym" file="strc-syn.mkiv"> + <cd:command name="registersynonym" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymused" level="system" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymused" level="system" category="symbols conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymshown" level="system" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymshown" level="system" category="symbols conditional" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="resetusedsynonyms" file="strc-syn.mkiv"> + <cd:command name="resetusedsynonyms" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="resetshownsynonyms" file="strc-syn.mkiv"> + <cd:command name="resetshownsynonyms" level="system" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="placelistofsynonyms" level="document" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -179,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofsynonyms" level="document" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> @@ -188,7 +188,7 @@ </cd:arguments> </cd:command> - <cd:command name="infull" level="document" file="strc-syn.mkiv"> + <cd:command name="infull" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -196,7 +196,7 @@ <!-- - <cd:command name="abbreviation" file="strc-syn.mkiv"> + <cd:command name="abbreviation" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -204,7 +204,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofabbreviations" file="strc-syn.mkiv"> + <cd:command name="placelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsynonyms"/> @@ -212,7 +212,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofabbreviations" file="strc-syn.mkiv"> + <cd:command name="completelistofabbreviations" level="document" category="symbols" file="strc-syn.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupsynonyms"/> @@ -222,4 +222,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-systemlog.xml b/tex/context/interface/mkiv/i-systemlog.xml index 93717af21..fc3243cfb 100644 --- a/tex/context/interface/mkiv/i-systemlog.xml +++ b/tex/context/interface/mkiv/i-systemlog.xml @@ -28,4 +28,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml index 177bc2eef..e59a9ca97 100644 --- a/tex/context/interface/mkiv/i-table.xml +++ b/tex/context/interface/mkiv/i-table.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="table" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:template/> <cd:assignments list="yes" optional="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="table" type="environment" variant="name" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" variant="name" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetabletemplate" category="tables" level="style" file="tabl-tab.mkiv"> + <cd:command name="definetabletemplate" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:template/> @@ -31,31 +31,31 @@ </cd:arguments> </cd:command> - <cd:command name="tables" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:template/> </cd:arguments> </cd:command> - <cd:command name="tables" type="environment" variant="name" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" variant="name" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tablehead" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="tablehead" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tabletail" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> + <cd:command name="tabletail" type="environment" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuptables" category="tables" file="tabl-tab.mkiv"> + <cd:command name="setuptables" level="style" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> @@ -126,34 +126,34 @@ <!-- - <cd:command name="ReFormat" scope="table" file="tabl-tab.mkiv"> + <cd:command name="ReFormat" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-template"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="enlarge" scope="table" file="tabl-tab.mkiv"> + <cd:command name="enlarge" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Enlarge" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Enlarge" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="use" scope="table" file="tabl-tab.mkiv"> + <cd:command name="use" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Use" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Use" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="keyword-template"/> @@ -161,19 +161,19 @@ </cd:arguments> </cd:command> - <cd:command name="JustLeft" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustLeft" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="JustCenter" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustCenter" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="JustRight" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="JustRight" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="Smash" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Smash" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="Raise" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Raise" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -182,14 +182,14 @@ </cd:arguments> </cd:command> - <cd:command name="Raise" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Raise" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="Lower" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Lower" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -198,14 +198,14 @@ </cd:arguments> </cd:command> - <cd:command name="Lower" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Lower" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="BackSpace" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="BackSpace" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -213,13 +213,13 @@ </cd:arguments> </cd:command> - <cd:command name="BackSpace" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="BackSpace" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="Vspace" variant="argument" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Vspace" variant="argument" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" optional="yes"> <cd:constant type="cd:dimension"/> @@ -227,48 +227,48 @@ </cd:arguments> </cd:command> - <cd:command name="Vspace" variant="string" scope="table" file="tabl-tab.mkiv"> + <cd:command name="Vspace" variant="string" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="string-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="OpenUp" scope="table" file="tabl-tab.mkiv"> + <cd:command name="OpenUp" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="TableLeft" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableLeft" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TableCenter" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableCenter" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="TableRight" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TableRight" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="SR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="SR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="MR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="MR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="LR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="LR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="AR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="AR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="VL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="VC" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -286,7 +286,7 @@ </cd:arguments> </cd:command> - <cd:command name="HL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="HL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="HC" scope="table" file="tabl-tab.mkiv"> + <cd:command name="HC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -304,7 +304,7 @@ </cd:arguments> </cd:command> - <cd:command name="VS" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VS" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -313,7 +313,7 @@ </cd:arguments> </cd:command> - <cd:command name="VD" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VD" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -322,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="VT" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VT" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -331,7 +331,7 @@ </cd:arguments> </cd:command> - <cd:command name="VN" scope="table" file="tabl-tab.mkiv"> + <cd:command name="VN" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords list="yes" optional="yes"> @@ -341,7 +341,7 @@ </cd:arguments> </cd:command> - <cd:command name="TB" scope="table" file="tabl-tab.mkiv"> + <cd:command name="TB" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="blank"/> @@ -349,7 +349,7 @@ </cd:arguments> </cd:command> - <cd:command name="NL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="NL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="blank"/> @@ -357,17 +357,17 @@ </cd:arguments> </cd:command> - <cd:command name="NR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="NR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="NC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="NC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="MC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="MC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="LC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="LC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DL" scope="table" file="tabl-tab.mkiv"> + <cd:command name="DL" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -376,29 +376,29 @@ </cd:arguments> </cd:command> - <cd:command name="DC" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DC" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DV" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DV" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="DR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="DR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="TWO" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="TWO" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="THREE" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="THREE" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FOUR" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FOUR" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="FIVE" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="FIVE" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="SIX" scope="table" file="tabl-tab.mkiv"/> + <cd:command name="SIX" scope="table" level="document" category="tables" file="tabl-tab.mkiv"/> - <cd:command name="SPAN" scope="table" file="tabl-tab.mkiv"> + <cd:command name="SPAN" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="REF" scope="table" file="tabl-tab.mkiv"> + <cd:command name="REF" scope="table" level="document" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-template"/> <cd:content/> @@ -407,4 +407,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml index 8a8eb8741..3efc34f42 100644 --- a/tex/context/interface/mkiv/i-tabulation.xml +++ b/tex/context/interface/mkiv/i-tabulation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetabulation" category="tables" level="style" file="tabl-tbl.mkiv"> + <cd:command name="definetabulation" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptabulation" category="tables" level="style" file="tabl-tbl.mkiv"> + <cd:command name="setuptabulation" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulation" type="environment" generated="yes" variant="example" category="tables" level="document" file="tabl-tbl.mkiv"> + <cd:command name="tabulation" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:sequence> <cd:variable value="tabulation"/> </cd:sequence> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetabulate" category="tables" level="style" file="tabl-tbl.mkiv"> + <cd:command name="definetabulate" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -119,7 +119,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptabulate" category="tables" level="style" file="tabl-tbl.mkiv"> + <cd:command name="setuptabulate" level="style" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name-optional"/> @@ -129,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulate" type="environment" category="tables" level="document" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:template optional="yes"/> <cd:assignments list="yes" optional="yes"> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="tabulate" type="environment" generated="yes" variant="instance" category="tables" level="document" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" generated="yes" variant="instance" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:sequence> <cd:instance value="tabulate"/> </cd:sequence> @@ -153,29 +153,29 @@ </cd:instances> </cd:command> - <cd:command name="tabulatehead" type="environment" category="tables" level="document" file="tabl-tbl.mkiv"> + <cd:command name="tabulatehead" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulatetail" type="environment" category="tables" level="document" file="tabl-tbl.mkiv"> + <cd:command name="tabulatetail" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulaterule" category="tables" level="document" file="tabl-tbl.mkiv"/> + <cd:command name="tabulaterule" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateline" category="tables" level="document" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateline" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautorule" category="tables" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautorule" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautoline" category="tables" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautoline" level="document" category="tables" file="tabl-tbl.mkiv"/> <!-- - <cd:command name="legend" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="legend" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -184,7 +184,7 @@ </cd:arguments> </cd:command> - <cd:command name="fact" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="fact" type="environment" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -193,7 +193,7 @@ </cd:arguments> </cd:command> - <cd:command name="VL" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="VL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -202,78 +202,78 @@ </cd:arguments> </cd:command> - <cd:command name="NC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NI" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NI" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="RC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="RC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HC" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="EQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="EQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="RQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="RQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HQ" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HQ" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NG" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NG" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NN" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NN" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="ND" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="ND" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="NB" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="NB" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="CC" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CC" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CL" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CM" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CM" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="CR" scope="tabulate" file="tabl-tbl.mkiv"> + <cd:command name="CR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-color-optional"/> </cd:arguments> </cd:command> - <cd:command name="SR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="SR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="FR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="FR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="MR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="MR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="LR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="LR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="AR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="AR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="FL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="FL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="ML" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="ML" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="LL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="LL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="TL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="TL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="BL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="BL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HL" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HL" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="HR" scope="tabulate" file="tabl-tbl.mkiv"/> + <cd:command name="HR" scope="tabulate" level="document" category="tables" file="tabl-tbl.mkiv"/> --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index 1c666cf25..3e0d49d80 100644 --- a/tex/context/interface/mkiv/i-tagging.xml +++ b/tex/context/interface/mkiv/i-tagging.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptagging" level="style" file="strc-tag.mkiv"> + <cd:command name="setuptagging" level="style" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -18,21 +18,21 @@ </cd:arguments> </cd:command> - <cd:command name="tagged" type="environment" begin="dostart" end="dostop" level="system" file="strc-tag.mkiv"> + <cd:command name="tagged" type="environment" begin="dostart" end="dostop" level="system" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="element" type="environment" file="strc-tag.mkiv"> + <cd:command name="element" type="environment" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinelement" level="system" file="strc-tag.mkiv"> + <cd:command name="doifelseinelement" level="system" category="xml conditional" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -40,7 +40,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinelementelse" level="system" file="strc-tag.mkiv"> + <cd:command name="doifinelementelse" level="system" category="xml conditional" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="taggedlabeltexts" level="system" file="strc-tag.mkiv"> + <cd:command name="taggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="namedtaggedlabeltexts" level="system" file="strc-tag.mkiv"> + <cd:command name="namedtaggedlabeltexts" level="system" category="xml language" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -66,10 +66,10 @@ </cd:arguments> </cd:command> - <cd:command name="settaggedmetadata" file="strc-tag.mkiv"> + <cd:command name="settaggedmetadata" level="document" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textbackground.xml b/tex/context/interface/mkiv/i-textbackground.xml index 6cd045a91..6104b1d9a 100644 --- a/tex/context/interface/mkiv/i-textbackground.xml +++ b/tex/context/interface/mkiv/i-textbackground.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetextbackground" level="style" file="anch-bck.mkiv"> + <cd:command name="definetextbackground" level="style" category="background" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptextbackground" level="style" file="anch-bck.mkiv"> + <cd:command name="setuptextbackground" level="style" category="background" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -117,7 +117,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" level="document" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" level="document" category="background" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -126,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" generated="yes" variant="example" level="document" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" generated="yes" variant="example" level="document" category="background" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -137,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" generated="yes" variant="example" level="document" file="anch-bck.mkiv"> + <cd:command name="textbackground" generated="yes" variant="example" level="document" category="background" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -146,6 +146,6 @@ </cd:arguments> </cd:command> - <cd:command name="textbackgroundmanual" type="environment" level="system" file="anch-bck.mkiv"/> + <cd:command name="textbackgroundmanual" type="environment" level="system" category="background" file="anch-bck.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml index 8fbc377fd..9c9ea2190 100644 --- a/tex/context/interface/mkiv/i-textflow.xml +++ b/tex/context/interface/mkiv/i-textflow.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetextflow" level="style" file="page-flw.mkiv"> + <cd:command name="definetextflow" level="style" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptextflow" level="style" file="page-flw.mkiv"> + <cd:command name="setuptextflow" level="style" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -31,13 +31,13 @@ </cd:arguments> </cd:command> - <cd:command name="textflowcollector" file="page-flw.mkiv"> + <cd:command name="textflowcollector" level="system" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsetextflowcollector" level="system" file="page-flw.mkiv"> + <cd:command name="doifelsetextflowcollector" level="system" category="structure conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextflowcollectorelse" level="system" file="page-flw.mkiv"> + <cd:command name="doiftextflowcollectorelse" level="system" category="structure conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -53,7 +53,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetextflow" level="system" file="page-flw.mkiv"> + <cd:command name="doifelsetextflow" level="system" category="structure conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -61,7 +61,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftextflowelse" level="system" file="page-flw.mkiv"> + <cd:command name="doiftextflowelse" level="system" category="structure conditional" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -69,16 +69,16 @@ </cd:arguments> </cd:command> - <cd:command name="textflow" type="environment" file="page-flw.mkiv"> + <cd:command name="textflow" type="environment" level="document" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushtextflow" file="page-flw.mkiv"> + <cd:command name="flushtextflow" level="document" category="structure" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-textrule.xml b/tex/context/interface/mkiv/i-textrule.xml index 11b4a27c3..b71df66a6 100644 --- a/tex/context/interface/mkiv/i-textrule.xml +++ b/tex/context/interface/mkiv/i-textrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptextrules" level="style" file="pack-mrl.mkiv"> + <cd:command name="setuptextrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="textrule" level="document" file="pack-mrl.mkiv"> + <cd:command name="textrule" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -63,10 +63,10 @@ </cd:arguments> </cd:command> - <cd:command name="textrule" type="environment" level="document" file="pack-mrl.mkiv"> + <cd:command name="textrule" type="environment" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index b36980fe4..bd1b128b3 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -6,7 +6,7 @@ <!-- - <cd:command name="definelayoutelement" file="page-txt.mkvi"> + <cd:command name="definelayoutelement" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayoutelement" file="page-txt.mkvi"> + <cd:command name="setuplayoutelement" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplayouttext" file="page-txt.mkvi"> + <cd:command name="setuplayouttext" level="system" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -96,7 +96,7 @@ --> - <cd:command name="setuplayouttext" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setuplayouttext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -165,7 +165,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptop" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheader" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -191,7 +191,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptext" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -204,7 +204,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfooter" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -217,7 +217,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbottom" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -230,7 +230,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayouttextline" category="layout" level="system" file="page-txt.mkvi"> + <cd:command name="doifelselayouttextline" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -238,7 +238,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayouttextlineelse" category="layout" level="system" file="page-txt.mkvi"> + <cd:command name="doiflayouttextlineelse" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -246,7 +246,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutsomeline" category="layout" level="system" file="page-txt.mkvi"> + <cd:command name="doifelselayoutsomeline" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -254,7 +254,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflayoutsomelineelse" category="layout" level="system" file="page-txt.mkvi"> + <cd:command name="doiflayoutsomelineelse" level="system" category="layout conditional" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -262,11 +262,11 @@ </cd:arguments> </cd:command> - <cd:command name="noheaderandfooterlines" category="layout" file="page-txt.mkvi"/> + <cd:command name="noheaderandfooterlines" level="style" category="layout" file="page-txt.mkvi"/> - <cd:command name="notopandbottomlines" category="layout" file="page-txt.mkvi"/> + <cd:command name="notopandbottomlines" level="style" category="layout" file="page-txt.mkvi"/> - <cd:command name="setuptoptexts" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setuptoptexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -280,7 +280,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheadertexts" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupheadertexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -294,7 +294,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptexttexts" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setuptexttexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -308,7 +308,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfootertexts" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupfootertexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -322,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbottomtexts" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="setupbottomtexts" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text" default="yes"/> @@ -336,7 +336,7 @@ </cd:arguments> </cd:command> - <cd:command name="settextcontent" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="settextcontent" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetext" category="layout" level="style" file="page-txt.mkvi"> + <cd:command name="definetext" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -382,4 +382,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-thinrule.xml b/tex/context/interface/mkiv/i-thinrule.xml index 758b6fea2..372f9a238 100644 --- a/tex/context/interface/mkiv/i-thinrule.xml +++ b/tex/context/interface/mkiv/i-thinrule.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupthinrules" level="style" file="pack-mrl.mkiv"> + <cd:command name="setupthinrules" level="style" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="height"> @@ -59,11 +59,11 @@ </cd:arguments> </cd:command> - <cd:command name="thinrule" level="document" file="pack-mrl.mkiv"/> + <cd:command name="thinrule" level="document" category="rules" file="pack-mrl.mkiv"/> - <cd:command name="hairline" level="document" file="pack-mrl.mkiv"/> + <cd:command name="hairline" level="document" category="rules" file="pack-mrl.mkiv"/> - <cd:command name="thinrules" level="document" file="pack-mrl.mkiv"> + <cd:command name="thinrules" level="document" category="rules" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> @@ -71,4 +71,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml index a0b3eb916..129f472ba 100644 --- a/tex/context/interface/mkiv/i-token.xml +++ b/tex/context/interface/mkiv/i-token.xml @@ -28,4 +28,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tolerance.xml b/tex/context/interface/mkiv/i-tolerance.xml index 4a369541b..3d0010edf 100644 --- a/tex/context/interface/mkiv/i-tolerance.xml +++ b/tex/context/interface/mkiv/i-tolerance.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setuptolerance" level="style" file="spac-hor.mkiv"> + <cd:command name="setuptolerance" level="style" category="whitespace" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> @@ -19,4 +19,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml index 8010900e4..df43ff9ce 100644 --- a/tex/context/interface/mkiv/i-tooltip.xml +++ b/tex/context/interface/mkiv/i-tooltip.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetooltip" level="style" file="scrn-fld.mkvi"> + <cd:command name="definetooltip" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptooltip" level="style" file="scrn-fld.mkvi"> + <cd:command name="setuptooltip" level="style" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="tooltip" generated="yes" variant="instance" file="scrn-fld.mkvi"> + <cd:command name="tooltip" generated="yes" variant="instance" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -44,7 +44,7 @@ </cd:instances> </cd:command> - <cd:command name="tooltip" generated="yes" variant="instance:argument" file="scrn-fld.mkvi"> + <cd:command name="tooltip" generated="yes" variant="instance:argument" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:sequence> <cd:instance value="tooltip"/> </cd:sequence> @@ -64,7 +64,7 @@ <!-- - <cd:command name="tooltip" file="scrn-fld.mkvi"> + <cd:command name="tooltip" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptooltip"/> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="tooltip" variant="argument" file="scrn-fld.mkvi"> + <cd:command name="tooltip" variant="argument" level="document" category="pdf" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -88,4 +88,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml index 26384f11c..3db36addc 100644 --- a/tex/context/interface/mkiv/i-tracker.xml +++ b/tex/context/interface/mkiv/i-tracker.xml @@ -32,9 +32,9 @@ </cd:arguments> </cd:command> - <cd:command name="resettrackers" file="trac-deb.mkiv"/> + <cd:command name="resettrackers" level="system" file="trac-deb.mkiv"/> - <cd:command name="showtrackers" file="trac-deb.mkiv"/> + <cd:command name="showtrackers" level="document" file="trac-deb.mkiv"/> <cd:command name="enabledirectives" level="style" file="trac-deb.mkiv"> <cd:arguments> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="showdirectives" file="trac-deb.mkiv"/> + <cd:command name="showdirectives" level="document" file="trac-deb.mkiv"/> <cd:command name="enableexperiments" level="style" file="trac-deb.mkiv"> <cd:arguments> @@ -62,14 +62,14 @@ </cd:arguments> </cd:command> - <cd:command name="showexperiments" file="trac-deb.mkiv"/> + <cd:command name="showexperiments" level="document" file="trac-deb.mkiv"/> - <cd:command name="showedebuginfo" file="trac-deb.mkiv"/> + <cd:command name="showedebuginfo" level="system" file="trac-deb.mkiv"/> - <cd:command name="overloaderror" file="trac-deb.mkiv"/> + <cd:command name="overloaderror" level="system" file="trac-deb.mkiv"/> - <cd:command name="showlogcategories" file="trac-deb.mkiv"/> + <cd:command name="showlogcategories" level="system" file="trac-deb.mkiv"/> - <cd:command name="showjustification" file="trac-jus.mkiv"/> + <cd:command name="showjustification" level="system" file="trac-jus.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-translate.xml b/tex/context/interface/mkiv/i-translate.xml index 6a033e0dc..4dc5d93e9 100644 --- a/tex/context/interface/mkiv/i-translate.xml +++ b/tex/context/interface/mkiv/i-translate.xml @@ -4,20 +4,20 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="translateinput" category="language" level="style" file="m-translate.mkiv"> + <cd:command name="translateinput" level="style" category="language" file="m-translate.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="resetinputtranslation" category="language" file="m-translate.mkiv"/> + <cd:command name="resetinputtranslation" level="system" category="language" file="m-translate.mkiv"/> - <cd:command name="enableinputtranslation" category="language" level="style" file="m-translate.mkiv"/> + <cd:command name="enableinputtranslation" level="style" category="language" level="style" file="m-translate.mkiv"/> - <cd:command name="disableinputtranslation" category="language" level="style" file="m-translate.mkiv"/> + <cd:command name="disableinputtranslation" level="style" category="language" level="style" file="m-translate.mkiv"/> - <cd:command name="readtranslatedfile" category="language" file="m-translate.mkiv"> + <cd:command name="readtranslatedfile" level="document" category="language" file="m-translate.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-translation.xml b/tex/context/interface/mkiv/i-translation.xml index b0b052a0f..f4f03037e 100644 --- a/tex/context/interface/mkiv/i-translation.xml +++ b/tex/context/interface/mkiv/i-translation.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="translate" category="language" file="lang-lab.mkiv"> + <cd:command name="translate" level="document" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:language"> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="assigntranslation" category="language" file="lang-lab.mkiv"> + <cd:command name="assigntranslation" level="style" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> @@ -26,4 +26,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml index 63783d040..992735693 100644 --- a/tex/context/interface/mkiv/i-twopassdata.xml +++ b/tex/context/interface/mkiv/i-twopassdata.xml @@ -121,4 +121,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-typography.xml b/tex/context/interface/mkiv/i-typography.xml index 6c2aa7389..c5f06fa13 100644 --- a/tex/context/interface/mkiv/i-typography.xml +++ b/tex/context/interface/mkiv/i-typography.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="normalizetextwidth" file="typo-txt.mkvi"> + <cd:command name="normalizetextwidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextheight" file="typo-txt.mkvi"> + <cd:command name="normalizetextheight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextdepth" file="typo-txt.mkvi"> + <cd:command name="normalizetextdepth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizetextline" file="typo-txt.mkvi"> + <cd:command name="normalizetextline" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontwidth" file="typo-txt.mkvi"> + <cd:command name="normalizefontwidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontheight" file="typo-txt.mkvi"> + <cd:command name="normalizefontheight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -54,7 +54,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontdepth" file="typo-txt.mkvi"> + <cd:command name="normalizefontdepth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="normalizefontline" file="typo-txt.mkvi"> + <cd:command name="normalizefontline" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="widthspanningtext" file="typo-txt.mkvi"> + <cd:command name="widthspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -80,7 +80,7 @@ </cd:arguments> </cd:command> - <cd:command name="heightspanningtext" file="typo-txt.mkvi"> + <cd:command name="heightspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="depthspanningtext" file="typo-txt.mkvi"> + <cd:command name="depthspanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -96,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="linespanningtext" file="typo-txt.mkvi"> + <cd:command name="linespanningtext" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -104,9 +104,9 @@ </cd:arguments> </cd:command> - <cd:command name="normalizedfontsize" file="typo-txt.mkvi"/> + <cd:command name="normalizedfontsize" level="system" category="fonts" file="typo-txt.mkvi"/> - <cd:command name="NormalizeTextWidth" file="typo-txt.mkvi"> + <cd:command name="NormalizeTextWidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -114,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeTextHeight" file="typo-txt.mkvi"> + <cd:command name="NormalizeTextHeight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-dimension"/> @@ -122,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeFontWidth" file="typo-txt.mkvi"> + <cd:command name="NormalizeFontWidth" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -131,7 +131,7 @@ </cd:arguments> </cd:command> - <cd:command name="NormalizeFontHeight" file="typo-txt.mkvi"> + <cd:command name="NormalizeFontHeight" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="WidthSpanningText" file="typo-txt.mkvi"> + <cd:command name="WidthSpanningText" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -148,9 +148,9 @@ </cd:arguments> </cd:command> - <cd:command name="TheNormalizedFontSize" file="typo-txt.mkvi"/> + <cd:command name="TheNormalizedFontSize" level="system" category="fonts" file="typo-txt.mkvi"/> - <cd:command name="nicelyfilledbox" type="environment" file="typo-txt.mkvi"> + <cd:command name="nicelyfilledbox" type="environment" level="system" category="fonts" file="typo-txt.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="width"> @@ -170,4 +170,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml index 031e3c575..9efa452eb 100644 --- a/tex/context/interface/mkiv/i-unit.xml +++ b/tex/context/interface/mkiv/i-unit.xml @@ -4,19 +4,19 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="digits" level="document" file="phys-dim.mkiv"> + <cd:command name="digits" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="digits" variant="string" level="document" file="phys-dim.mkiv"> + <cd:command name="digits" variant="string" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="defineunit" level="style" file="phys-dim.mkiv"> + <cd:command name="defineunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupunit" level="style" file="phys-dim.mkiv"> + <cd:command name="setupunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="unit" generated="yes" variant="instance" level="document" file="phys-dim.mkiv"> + <cd:command name="unit" generated="yes" variant="instance" level="document" category="symbols" file="phys-dim.mkiv"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> @@ -89,7 +89,7 @@ <!-- - <cd:command name="unit" file="phys-dim.mkiv"> + <cd:command name="unit" level="document" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> @@ -97,21 +97,21 @@ --> - <cd:command name="installunitsseparator" level="system" file="phys-dim.mkiv"> + <cd:command name="installunitsseparator" level="system" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installunitsspace" level="system" file="phys-dim.mkiv"> + <cd:command name="installunitsspace" level="system" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="registerunit" level="style" file="phys-dim.mkiv"> + <cd:command name="registerunit" level="style" category="symbols" file="phys-dim.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> @@ -125,4 +125,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml index 388fd3eed..7c295f9ad 100644 --- a/tex/context/interface/mkiv/i-variables.xml +++ b/tex/context/interface/mkiv/i-variables.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setvariables" file="core-env.mkiv"> + <cd:command name="setvariables" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="setevariables" file="core-env.mkiv"> + <cd:command name="setevariables" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -38,7 +38,7 @@ </cd:arguments> </cd:command> - <cd:command name="setgvariables" file="core-env.mkiv"> + <cd:command name="setgvariables" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -55,7 +55,7 @@ </cd:arguments> </cd:command> - <cd:command name="setxvariables" file="core-env.mkiv"> + <cd:command name="setxvariables" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkvariables" file="core-env.mkiv"> + <cd:command name="checkvariables" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -89,7 +89,7 @@ </cd:arguments> </cd:command> - <cd:command name="setvariable" file="core-env.mkiv"> + <cd:command name="setvariable" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="setevariable" file="core-env.mkiv"> + <cd:command name="setevariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="setgvariable" file="core-env.mkiv"> + <cd:command name="setgvariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="setxvariable" file="core-env.mkiv"> + <cd:command name="setxvariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -121,21 +121,21 @@ </cd:arguments> </cd:command> - <cd:command name="getvariable" file="core-env.mkiv"> + <cd:command name="getvariable" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="showvariable" file="core-env.mkiv"> + <cd:command name="showvariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevariable" level="system" file="core-env.mkiv"> + <cd:command name="doifelsevariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -144,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvariableelse" level="system" file="core-env.mkiv"> + <cd:command name="doifvariableelse" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -153,7 +153,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvariable" level="system" file="core-env.mkiv"> + <cd:command name="doifvariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -161,7 +161,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotvariable" level="system" file="core-env.mkiv"> + <cd:command name="doifnotvariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -169,7 +169,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseemptyvariable" level="system" file="core-env.mkiv"> + <cd:command name="doifelseemptyvariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -178,7 +178,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvariableelse" level="system" file="core-env.mkiv"> + <cd:command name="doifemptyvariableelse" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -187,7 +187,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvariable" level="system" file="core-env.mkiv"> + <cd:command name="doifemptyvariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -195,7 +195,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotemptyvariable" level="system" file="core-env.mkiv"> + <cd:command name="doifnotemptyvariable" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -211,7 +211,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupenv" file="core-env.mkiv"> + <cd:command name="setupenv" level="system" file="core-env.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="set"> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseenv" level="system" file="core-env.mkiv"> + <cd:command name="doifelseenv" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -235,7 +235,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifenvelse" level="system" file="core-env.mkiv"> + <cd:command name="doifenvelse" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -243,27 +243,27 @@ </cd:arguments> </cd:command> - <cd:command name="doifenv" level="system" file="core-env.mkiv"> + <cd:command name="doifenv" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotenv" level="system" file="core-env.mkiv"> + <cd:command name="doifnotenv" level="system" category="conditional" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="env" file="core-env.mkiv"> + <cd:command name="env" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="envvar" file="core-env.mkiv"> + <cd:command name="envvar" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> @@ -291,26 +291,26 @@ </cd:arguments> </cd:command> - <cd:command name="getdocumentfilename" file="luat-ini.mkiv"> + <cd:command name="getdocumentfilename" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargument" file="luat-ini.mkiv"> + <cd:command name="getdocumentargument" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getdocumentargumentdefault" file="luat-ini.mkiv"> + <cd:command name="getdocumentargumentdefault" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentargument" level="system" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -318,7 +318,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentargumentelse" level="system" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargumentelse" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -326,21 +326,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentargument" level="system" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentargument" level="system" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentargument" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentfilename" level="system" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -348,7 +348,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentfilenameelse" level="system" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilenameelse" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -356,18 +356,18 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentfilename" level="system" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentfilename" level="system" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentfilename" level="system" category="conditional" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml index de3295669..e8abc1f66 100644 --- a/tex/context/interface/mkiv/i-verbatim.xml +++ b/tex/context/interface/mkiv/i-verbatim.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definetype" category="verbatim" level="style" file="buff-ver.mkiv"> + <cd:command name="definetype" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,20 +14,12 @@ </cd:arguments> </cd:command> - <cd:command name="setuptype" category="verbatim" level="style" file="buff-ver.mkiv"> + <cd:command name="setuptype" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="option"> - <cd:constant type="mp"/> - <cd:constant type="lua"/> - <cd:constant type="xml"/> - <cd:constant type="parsed-xml"/> - <cd:constant type="nested"/> - <cd:constant type="tex"/> - <cd:constant type="context"/> - <cd:constant type="none"/> - <cd:constant type="cd:name"/> + <cd:resolve name="value-verbatim"/> </cd:parameter> <cd:parameter name="command"> <cd:constant type="cd:csname"/> @@ -77,7 +69,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="type" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -86,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" variant="angles" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="type" variant="angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -95,7 +87,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="typ" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -104,7 +96,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" variant="angles" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="typ" variant="angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -113,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -125,7 +117,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example:angles" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example:angles" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -137,7 +129,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetyping" category="verbatim" level="style" file="buff-ver.mkiv"> + <cd:command name="definetyping" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -147,7 +139,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptyping" category="verbatim" level="style" file="buff-ver.mkiv"> + <cd:command name="setuptyping" level="style" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -161,15 +153,7 @@ <cd:resolve name="value-leftskip"/> </cd:parameter> <cd:parameter name="option"> - <cd:constant type="mp"/> - <cd:constant type="lua"/> - <cd:constant type="xml"/> - <cd:constant type="parsed-xml"/> - <cd:constant type="nested"/> - <cd:constant type="tex"/> - <cd:constant type="context"/> - <cd:constant type="none" default="yes"/> - <cd:constant type="cd:name"/> + <cd:resolve name="value-verbatim"/> </cd:parameter> <cd:parameter name="style"> <cd:resolve name="value-style"/> @@ -251,7 +235,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -265,7 +249,7 @@ </cd:instances> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -279,55 +263,55 @@ </cd:instances> </cd:command> - <cd:command name="tex" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="tex" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="arg" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="arg" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mat" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="mat" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="dis" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="dis" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="astype" category="verbatim" file="buff-ver.mkiv"> + <cd:command name="astype" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="asciistr" category="verbatim" file="buff-ver.mkiv"> + <cd:command name="asciistr" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="verbatim" category="verbatim" file="buff-ver.mkiv"> + <cd:command name="verbatim" level="system" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filename" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="filename" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="typefile" category="verbatim" level="document" file="buff-ver.mkiv"> + <cd:command name="typefile" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -337,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetypingfile" category="verbatim" level="system" file="buff-ver.mkiv"> + <cd:command name="doifelsetypingfile" category="verbatim" level="system conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -345,7 +329,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftypingfileelse" category="verbatim" level="system" file="buff-ver.mkiv"> + <cd:command name="doiftypingfileelse" category="verbatim" level="system conditional" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -355,7 +339,7 @@ <!-- - <cd:command name="typing" type="environment" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -363,7 +347,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="continue"/> @@ -371,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="LUA" type="environment" file="buff-ver.mkiv"> + <cd:command name="LUA" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -379,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="LUA" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="LUA" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="lua"/> </cd:sequence> @@ -390,7 +374,7 @@ </cd:arguments> </cd:command> - <cd:command name="MP" type="environment" file="buff-ver.mkiv"> + <cd:command name="MP" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -398,7 +382,7 @@ </cd:arguments> </cd:command> - <cd:command name="MP" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="MP" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="continue"/> @@ -406,7 +390,7 @@ </cd:arguments> </cd:command> - <cd:command name="XML" type="environment" file="buff-ver.mkiv"> + <cd:command name="XML" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -414,7 +398,7 @@ </cd:arguments> </cd:command> - <cd:command name="XML" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="XML" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="continue"/> @@ -422,7 +406,7 @@ </cd:arguments> </cd:command> - <cd:command name="PARSEDXML" type="environment" file="buff-ver.mkiv"> + <cd:command name="PARSEDXML" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -430,7 +414,7 @@ </cd:arguments> </cd:command> - <cd:command name="PARSEDXML" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="PARSEDXML" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="continue"/> @@ -438,7 +422,7 @@ </cd:arguments> </cd:command> - <cd:command name="TEX" type="environment" file="buff-ver.mkiv"> + <cd:command name="TEX" type="environment" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptyping"/> @@ -446,7 +430,7 @@ </cd:arguments> </cd:command> - <cd:command name="TEX" type="environment" variant="argument" file="buff-ver.mkiv"> + <cd:command name="TEX" type="environment" variant="argument" level="document" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="continue"/> @@ -456,4 +440,4 @@ --> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml index ff33ee341..22a3846d9 100644 --- a/tex/context/interface/mkiv/i-version.xml +++ b/tex/context/interface/mkiv/i-version.xml @@ -28,20 +28,20 @@ </cd:arguments> </cd:command> - <cd:command name="installversioninfo" file="page-inf.mkiv"> + <cd:command name="installversioninfo" level="system" file="page-inf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="includeversioninfo" file="page-inf.mkiv"> + <cd:command name="includeversioninfo" level="system" file="page-inf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseolderversion" level="system" file="file-mod.mkvi"> + <cd:command name="doifelseolderversion" level="system" category="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifolderversionelse" level="system" file="file-mod.mkvi"> + <cd:command name="doifolderversionelse" level="system" category="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -59,7 +59,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseoldercontext" level="system" file="file-mod.mkvi"> + <cd:command name="doifelseoldercontext" level="system" category="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifoldercontextelse" level="system" file="file-mod.mkvi"> + <cd:command name="doifoldercontextelse" level="system" category="conditional" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -75,4 +75,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-viewerlayer.xml b/tex/context/interface/mkiv/i-viewerlayer.xml index 4fd25e0ef..fde846e4d 100644 --- a/tex/context/interface/mkiv/i-viewerlayer.xml +++ b/tex/context/interface/mkiv/i-viewerlayer.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineviewerlayer" level="style" file="attr-lay.mkiv"> + <cd:command name="defineviewerlayer" level="style" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupviewerlayer" level="style" file="attr-lay.mkiv"> + <cd:command name="setupviewerlayer" level="style" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -44,25 +44,25 @@ </cd:arguments> </cd:command> - <cd:command name="viewerlayer" type="environment" level="document" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" level="document" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="viewerlayer" type="environment" generated="yes" variant="example" level="document" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" generated="yes" variant="example" level="document" category="pdf" file="attr-lay.mkiv"> <cd:sequence> <cd:variable value="viewerlayer"/> </cd:sequence> </cd:command> - <cd:command name="viewerlayer" level="document" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" level="document" category="pdf" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="showlayoutcomponents" file="attr-lay.mkiv"/> + <cd:command name="showlayoutcomponents" level="document" category="pdf" file="attr-lay.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml index 3e44b2740..7849ab90b 100644 --- a/tex/context/interface/mkiv/i-visual.xml +++ b/tex/context/interface/mkiv/i-visual.xml @@ -4,20 +4,20 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="fakerule" file="m-visual.mkiv"> + <cd:command name="fakerule" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="dorandomrecurse" file="m-visual.mkiv"> + <cd:command name="dorandomrecurse" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fakelines" file="m-visual.mkiv"> + <cd:command name="fakelines" level="document" file="m-visual.mkiv"> <cd:arguments> <cd:keywords name="keywords" delimiters="braces"> <cd:constant type="cd:number"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakewords" file="m-visual.mkiv"> + <cd:command name="fakewords" level="document" file="m-visual.mkiv"> <cd:arguments> <cd:keywords name="keywords" delimiters="braces"> <cd:constant type="cd:number"/> @@ -43,7 +43,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakenwords" file="m-visual.mkiv"> + <cd:command name="fakenwords" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:keywords name="keywords" delimiters="braces"> @@ -53,19 +53,19 @@ </cd:arguments> </cd:command> - <cd:command name="showfakewords" file="m-visual.mkiv"/> + <cd:command name="showfakewords" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeword" file="m-visual.mkiv"/> + <cd:command name="fakeword" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeparindent" file="m-visual.mkiv"/> + <cd:command name="fakeparindent" level="system" file="m-visual.mkiv"/> - <cd:command name="fakeddroppedcaps" file="m-visual.mkiv"> + <cd:command name="fakeddroppedcaps" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="fakefigure" file="m-visual.mkiv"> + <cd:command name="fakefigure" level="document" file="m-visual.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="placefloat"/> @@ -78,7 +78,7 @@ </cd:arguments> </cd:command> - <cd:command name="fakeimage" file="m-visual.mkiv"> + <cd:command name="fakeimage" level="document" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -87,11 +87,11 @@ </cd:arguments> </cd:command> - <cd:command name="fakeformula" file="m-visual.mkiv"/> + <cd:command name="fakeformula" level="document" file="m-visual.mkiv"/> - <cd:command name="fakespacingformula" file="m-visual.mkiv"/> + <cd:command name="fakespacingformula" level="document" file="m-visual.mkiv"/> - <cd:command name="smashedgrid" file="m-visual.mkiv"> + <cd:command name="smashedgrid" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -99,17 +99,17 @@ </cd:arguments> </cd:command> - <cd:command name="bodyfontgrid" file="m-visual.mkiv"/> + <cd:command name="bodyfontgrid" level="system" file="m-visual.mkiv"/> - <cd:command name="emexgrid" file="m-visual.mkiv"/> + <cd:command name="emexgrid" level="system" file="m-visual.mkiv"/> - <cd:command name="simplethesis" file="m-visual.mkiv"/> + <cd:command name="simplethesis" level="system" file="m-visual.mkiv"/> - <cd:command name="showbaselines" file="m-visual.mkiv"/> + <cd:command name="showbaselines" level="system" file="m-visual.mkiv"/> - <cd:command name="showpagebuilder" file="m-visual.mkiv"/> + <cd:command name="showpagebuilder" level="system" file="m-visual.mkiv"/> - <cd:command name="tagbox" file="m-visual.mkiv"> + <cd:command name="tagbox" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:keywords optional="yes"> diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml index 0e037c9e5..daaad28cd 100644 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ b/tex/context/interface/mkiv/i-visualizer.xml @@ -108,12 +108,13 @@ </cd:arguments> </cd:command> - <cd:command name="showmakeup" file="trc-vis.mkiv"> + <cd:command name="showmakeup" level="document" file="trc-vis.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="makeup" default="yes"/> <cd:constant type="all"/> <cd:constant type="boxes"/> + <cd:constant type="line"/> <cd:constant type="glyph"/> <cd:constant type="fontkern"/> <cd:constant type="hbox"/> @@ -137,22 +138,22 @@ </cd:arguments> </cd:command> - <cd:command name="showallmakeup" file="trc-vis.mkiv"/> + <cd:command name="showallmakeup" level="document" file="trc-vis.mkiv"/> - <cd:command name="showboxes" file="trc-vis.mkiv"/> + <cd:command name="showboxes" level="document" file="trc-vis.mkiv"/> - <cd:command name="showglyphs" file="trc-vis.mkiv"/> + <cd:command name="showglyphs" level="document" file="trc-vis.mkiv"/> - <cd:command name="showfontkerns" file="trc-vis.mkiv"/> + <cd:command name="showfontkerns" level="document" file="trc-vis.mkiv"/> - <cd:command name="showfontitalics" file="trc-vis.mkiv"/> + <cd:command name="showfontitalics" level="document" file="trc-vis.mkiv"/> - <cd:command name="setvisualizerfont" file="trc-vis.mkiv"> + <cd:command name="setvisualizerfont" level="system" file="trc-vis.mkiv"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="resetvisualizers" file="trc-vis.mkiv"/> + <cd:command name="resetvisualizers" level="system" file="trc-vis.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index a8777d02a..9e1836dbc 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definevspacingamount" file="spac-ver.mkiv"> + <cd:command name="definevspacingamount" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-dimension-optional"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="definevspacing" file="spac-ver.mkiv"> + <cd:command name="definevspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="vspacing" file="spac-ver.mkiv"> + <cd:command name="vspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="preference"/> @@ -73,7 +73,7 @@ </cd:arguments> </cd:command> - <cd:command name="directvspacing" file="spac-ver.mkiv"> + <cd:command name="directvspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:inherit name="vspacing"/> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupvspacing" file="spac-ver.mkiv"> + <cd:command name="setupvspacing" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> @@ -89,33 +89,97 @@ </cd:arguments> </cd:command> - <cd:command name="setupblank" level="style" file="spac-ver.mkiv"> + <!-- + + <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="vspacing"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="vspacing"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupblank" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:inherit name="blank"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="blank" level="document" file="spac-ver.mkiv"> + <cd:command name="blank" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> - <cd:inherit name="vspacing"/> + <cd:constant type="preference"/> + <cd:constant type="samepage"/> + <cd:constant type="max"/> + <cd:constant type="force"/> + <cd:constant type="enable"/> + <cd:constant type="disable"/> + <cd:constant type="nowhite"/> + <cd:constant type="back"/> + <cd:constant type="overlay"/> + <cd:constant type="always"/> + <cd:constant type="weak"/> + <cd:constant type="strong"/> + <cd:constant type="default"/> + <cd:constant type="before"/> + <cd:constant type="inbetween"/> + <cd:constant type="after"/> + <cd:constant type="fixed"/> + <cd:constant type="flexible"/> + <cd:constant type="none"/> + <cd:constant type="small"/> + <cd:constant type="medium"/> + <cd:constant type="big"/> + <cd:constant type="line"/> + <cd:constant type="halfline"/> + <cd:constant type="quarterline"/> + <cd:constant type="formula"/> + <cd:constant type="white"/> + <cd:constant type="height"/> + <cd:constant type="depth"/> + <cd:constant type="standard"/> + <cd:constant type="small" prefix="cd:number" method="factor"/> + <cd:constant type="medium" prefix="cd:number" method="factor"/> + <cd:constant type="big" prefix="cd:number" method="factor"/> + <cd:constant type="line" prefix="cd:number" method="factor"/> + <cd:constant type="halfline" prefix="cd:number" method="factor"/> + <cd:constant type="quarterline" prefix="cd:number" method="factor"/> + <cd:constant type="formula" prefix="cd:number" method="factor"/> + <cd:constant type="white" prefix="cd:number" method="factor"/> + <cd:constant type="height" prefix="cd:number" method="factor"/> + <cd:constant type="depth" prefix="cd:number" method="factor"/> + <cd:constant type="cd:number" prefix="category" method="range"/> + <cd:constant type="cd:number" prefix="order" method="range"/> + <cd:constant type="cd:number" prefix="penalty" method="range"/> + <cd:constant type="cd:dimension"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="useblankparameter" level="system" file="spac-ver.mkiv"> + <cd:command name="useblankparameter" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="inhibitblank" file="spac-ver.mkiv"/> + <cd:command name="inhibitblank" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="synchronizeblank" level="system" file="spac-ver.mkiv"/> + <cd:command name="synchronizeblank" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="definevspace" level="style" file="spac-ver.mkiv"> + <cd:command name="definevspace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -123,29 +187,29 @@ </cd:arguments> </cd:command> - <cd:command name="vspace" level="document" file="spac-ver.mkiv"> + <cd:command name="vspace" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="godown" level="document" file="spac-ver.mkiv"> + <cd:command name="godown" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="vglue" file="spac-ver.mkiv"> + <cd:command name="vglue" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="string-dimension"/> </cd:arguments> </cd:command> - <cd:command name="smallskip" file="spac-ver.mkiv"/> + <cd:command name="smallskip" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="medskip" file="spac-ver.mkiv"/> + <cd:command name="medskip" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="bigskip" file="spac-ver.mkiv"/> + <cd:command name="bigskip" level="system" category="whitespace" file="spac-ver.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index 68040a8dd..f1a8ce84e 100644 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ b/tex/context/interface/mkiv/i-whitespace.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupwhitespace" level="style" file="spac-ver.mkiv"> + <cd:command name="setupwhitespace" level="style" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="fix"/> @@ -23,15 +23,15 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizewhitespace" level="system" file="spac-ver.mkiv"/> + <cd:command name="synchronizewhitespace" level="system" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="correctwhitespace" level="system" file="spac-ver.mkiv"> + <cd:command name="correctwhitespace" level="system" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="packed" type="environment" level="document" file="spac-ver.mkiv"> + <cd:command name="packed" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> @@ -39,9 +39,9 @@ </cd:arguments> </cd:command> - <cd:command name="unpacked" type="environment" file="spac-ver.mkiv"/> + <cd:command name="unpacked" type="environment" category="whitespace" file="spac-ver.mkiv"/> - <cd:command name="linecorrection" type="environment" level="document" file="spac-ver.mkiv"> + <cd:command name="linecorrection" type="environment" level="document" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -50,7 +50,7 @@ </cd:arguments> </cd:command> - <cd:command name="locallinecorrection" type="environment" file="spac-ver.mkiv"> + <cd:command name="locallinecorrection" type="environment" category="whitespace" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -59,4 +59,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml index d287c0b74..9acd4038c 100644 --- a/tex/context/interface/mkiv/i-xml.xml +++ b/tex/context/interface/mkiv/i-xml.xml @@ -6,147 +6,147 @@ <!-- the definitions themselves --> - <cd:command name="xmlmain" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlmain" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlflush" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflush" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlpure" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlpure" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushtext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushtext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushpure" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushpure" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnonspace" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlnonspace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushspacewise" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushspacewise" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushlinewise" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushlinewise" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlall" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlall" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmllastmatch" category="xml" file="lxml-ini.mkiv"/> + <cd:command name="xmllastmatch" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlfirst" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlfirst" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmllast" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmllast" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlcontext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlcontext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushcontext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushcontext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlshow" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlshow" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinfo" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinfo" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlfilter" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlfilter" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstrip" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlstrip" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstripped" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlstripped" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstripnolines" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlstripnolines" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlstrippednolines" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlstrippednolines" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> </cd:arguments> </cd:command> - <cd:command name="xmlposition" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlposition" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -154,27 +154,27 @@ </cd:arguments> </cd:command> - <cd:command name="xmlelement" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlelement" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="xmlpos" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlpos" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlsnippet" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsnippet" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="xmlconcat" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlconcat" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -182,7 +182,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlconcatrange" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlconcatrange" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlcommand" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlcommand" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -200,44 +200,73 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinlineverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" type="environment" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinlineverbatim" type="environment" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldisplayverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" type="environment" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldisplayverbatim" type="environment" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlverbatim" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlverbatim" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlprettyprint" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprettyprint" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> - <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlprettyprinttext" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlinlineprettyprint" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="xmlinlineprettyprinttext" level="style" category="xml" file="lxml-ini.mkiv"> + <cd:arguments> + <cd:resolve name="argument-node"/> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-verbatim"/> + </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadfile" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlloadfile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -245,7 +274,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadbuffer" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlloadbuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -253,7 +282,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddata" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlloaddata" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -261,7 +290,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadonly" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlloadonly" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -269,7 +298,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessfile" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprocessfile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -277,7 +306,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessbuffer" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprocessbuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -285,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessdata" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprocessdata" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -293,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinclude" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinclude" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -301,44 +330,44 @@ </cd:arguments> </cd:command> - <cd:command name="xmlname" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlname" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlpath" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlpath" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnamespace" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlnamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltag" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltag" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlcount" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlcount" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlatt" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlatt" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlattdef" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlattdef" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -346,16 +375,16 @@ </cd:arguments> </cd:command> - <cd:command name="xmlrefatt" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlrefatt" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmllastatt" category="xml" file="lxml-ini.mkiv"/> + <cd:command name="xmllastatt" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlattribute" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlattribute" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -363,7 +392,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlattributedef" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlattributedef" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -372,14 +401,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchainatt" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlchainatt" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlchainattdef" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlchainattdef" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -387,39 +416,39 @@ </cd:arguments> </cd:command> - <cd:command name="xmldirectives" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldirectives" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesbefore" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldirectivesbefore" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesafter" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldirectivesafter" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinstalldirective" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinstalldirective" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-csname"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsetsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-lpath"/> @@ -427,79 +456,79 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremovesetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlremovesetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlremovedocumentsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlremovedocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushdocumentsetups" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlflushdocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlresetsetups" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlresetsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlresetdocumentsetups" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlresetdocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlprependsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprependsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlappendsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlappendsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlbeforesetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlbeforesetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlaftersetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlaftersetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlprependdocumentsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlprependdocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlappenddocumentsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlappenddocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlbeforedocumentsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlbeforedocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -507,7 +536,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlafterdocumentsetup" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlafterdocumentsetup" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -515,16 +544,16 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisteredsetups" category="xml" file="lxml-ini.mkiv"/> + <cd:command name="xmlregisteredsetups" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlregistereddocumentsetups" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlregistereddocumentsetups" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlsetfunction" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsetfunction" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -534,7 +563,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoif" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoif" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -542,7 +571,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnot" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifnot" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -550,7 +579,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelse" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifelse" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -559,7 +588,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoiftext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoiftext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -567,7 +596,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnottext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifnottext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -575,7 +604,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsetext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifelsetext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -584,21 +613,21 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifselfempty" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="xmldoifnotselfempty" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifnotselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseselfempty" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifelseselfempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> @@ -606,7 +635,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelseempty" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifelseempty" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -615,7 +644,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -624,14 +653,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlremapname" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlremapname" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -640,7 +669,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremapnamespace" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlremapnamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -648,14 +677,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchecknamespace" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlchecknamespace" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlmapvalue" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlmapvalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -663,7 +692,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlvalue" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlvalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -671,7 +700,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsevalue" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldoifelsevalue" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -680,20 +709,20 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddirectives" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlloaddirectives" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="xmlsave" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsave" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="xmltofile" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltofile" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -701,7 +730,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobuffer" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltobuffer" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -709,7 +738,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobufferverbose" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltobufferverbose" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -729,55 +758,55 @@ --> - <cd:command name="xmladdindex" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmladdindex" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusion" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinclusion" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusions" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinclusions" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlbadinclusions" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlbadinclusions" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlraw" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw" type="environment" category="xml" file="lxml-ini.mkiv"/> + <cd:command name="xmlraw" type="environment" level="style" category="xml" file="lxml-ini.mkiv"/> <!-- injectors --> - <cd:command name="xmlresetinjectors" category="xml" file="lxml-ini.mkiv"/> + <cd:command name="xmlresetinjectors" level="style" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlsetinjectors" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsetinjectors" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="xmlinjector" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlinjector" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlapplyselectors" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlapplyselectors" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> @@ -785,14 +814,14 @@ <!-- entities --> - <cd:command name="xmlsetentity" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmlsetentity" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="xmltexentity" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmltexentity" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -801,7 +830,7 @@ <!-- general setup --> - <cd:command name="setupxml" category="xml" level="style" file="lxml-ini.mkiv"> + <cd:command name="setupxml" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -817,10 +846,10 @@ </cd:arguments> </cd:command> - <cd:command name="xmldefaulttotext" category="xml" file="lxml-ini.mkiv"> + <cd:command name="xmldefaulttotext" level="style" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index 4db0882f1..c921e1a8d 100644 --- a/tex/context/interface/mkiv/i-xtable.xml +++ b/tex/context/interface/mkiv/i-xtable.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definextable" category="tables" level="style" file="tabl-xtb.mkvi"> + <cd:command name="definextable" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupxtable" category="tables" level="style" file="tabl-xtb.mkvi"> + <cd:command name="setupxtable" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -90,13 +90,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -104,13 +104,13 @@ </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" variant="name" category="tables" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" variant="name" level="style" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtable" type="environment" generated="yes" variant="example" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" generated="yes" variant="example" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -121,13 +121,13 @@ </cd:arguments> </cd:command> - <cd:command name="processxtablebuffer" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="processxtablebuffer" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xrow" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xrow" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -136,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="xcell" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xcell" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -165,13 +165,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablehead" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -179,13 +179,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -193,13 +193,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> @@ -207,13 +207,13 @@ </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" variant="name" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xgroup" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -222,7 +222,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrowgroup" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xrowgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -231,7 +231,7 @@ </cd:arguments> </cd:command> - <cd:command name="xcellgroup" type="environment" category="tables" level="document" file="tabl-xtb.mkvi"> + <cd:command name="xcellgroup" type="environment" level="document" category="tables" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -240,8 +240,8 @@ </cd:arguments> </cd:command> - <cd:command name="currentxtablerow" category="tables" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablerow" level="system" category="tables" file="tabl-xtb.mkvi"/> - <cd:command name="currentxtablecolumn" category="tables" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablecolumn" level="system" category="tables" file="tabl-xtb.mkvi"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/modules/mkiv/m-barcodes.mkiv b/tex/context/modules/mkiv/m-barcodes.mkiv index e4c43b376..84f093c56 100644 --- a/tex/context/modules/mkiv/m-barcodes.mkiv +++ b/tex/context/modules/mkiv/m-barcodes.mkiv @@ -13,6 +13,15 @@ \writestatus{barcodes}{the 'zint' module is a better choice} +\usemodule[zint] + +\let\normalbarcode\barcode + +\unexpanded\def\barcode[#1]% + {\normalbarcode[\c!text=\dummyparameter\c!code,\c!alternative=\dummyparameter\c!type,#1]} + +\iffalse + % \startTEXpage % \startPSTRICKS % \pspicture(-4mm,-1mm)(38mm,26mm) @@ -112,6 +121,8 @@ end \directsetup{barcode:\getvariable{barcode}{type}}% \egroup} +\fi + \continueifinputfile{m-barcodes.mkiv} \starttext diff --git a/tex/context/modules/mkiv/m-chart.lua b/tex/context/modules/mkiv/m-chart.lua index 92ee0d969..bcf80bdfc 100644 --- a/tex/context/modules/mkiv/m-chart.lua +++ b/tex/context/modules/mkiv/m-chart.lua @@ -400,7 +400,7 @@ implement { implement { name = "flow_set_include", - arguments = { "string", "dimension", "dimension", "string" }, + arguments = { "string", "integer", "integer", "string" }, actions = function(name,x,y,settings) data[#data+1] = { include = name, diff --git a/tex/context/modules/mkiv/m-chart.mkvi b/tex/context/modules/mkiv/m-chart.mkvi index 37b48f6eb..0463e4acd 100644 --- a/tex/context/modules/mkiv/m-chart.mkvi +++ b/tex/context/modules/mkiv/m-chart.mkvi @@ -304,8 +304,8 @@ \unexpanded\def\module_charts_FLOW_include [#name][#settings]{% \begingroup - \getparameters[FLOWi][\c!x=1,\c!y=1,#settings]% - \clf_flow_set_include{#name}\numexpr\FLOWix\relax\numexpr\FLOWiy\relax{\detokenize{#settings}}% + \getdummyparameters[\c!x=1,\c!y=1,#settings]% + \clf_flow_set_include{#name}\numexpr\dummyparameter\c!x\relax\numexpr\dummyparameter\c!y\relax{\detokenize{#settings}}% \endgroup \ignorespaces } diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 8137842b5..014b110ab 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 10/24/17 10:30:41 +-- merge date : 10/29/17 15:44:10 do -- begin closure to overcome local limits and interference @@ -11,14 +11,15 @@ if not modules then modules={} end modules ['l-lua']={ copyright="PRAGMA ADE / ConTeXt Development Team", license="see context related readme files" } -_MAJORVERSION,_MINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") -_MAJORVERSION=tonumber(_MAJORVERSION) or 5 -_MINORVERSION=tonumber(_MINORVERSION) or 1 -_LUAVERSION=_MAJORVERSION+_MINORVERSION/10 -if _LUAVERSION<5.2 and jit then - _MINORVERSION=2 - _LUAVERSION=5.2 -end +LUAMAJORVERSION,LUAMINORVERSION=string.match(_VERSION,"^[^%d]+(%d+)%.(%d+).*$") +LUAMAJORVERSION=tonumber(LUAMAJORVERSION) or 5 +LUAMINORVERSION=tonumber(LUAMINORVERSION) or 1 +LUAVERSION=LUAMAJORVERSION+LUAMINORVERSION/10 +if LUAVERSION<5.2 and jit then + MINORVERSION=2 + LUAVERSION=5.2 +end +_LUAVERSION=LUAVERSION if not lpeg then lpeg=require("lpeg") end @@ -2097,6 +2098,24 @@ function table.filtered(t,pattern,sort,cmp) return nothing end end +if not table.move then + function table.move(a1,f,e,t,a2) + if a2 and a1~=a2 then + for i=f,e do + a2[t]=a1[i] + t=t+1 + end + return a2 + else + t=t+e-f + for i=e,f,-1 do + a1[t]=a1[i] + t=t-1 + end + return a1 + end + end +end end -- closure @@ -2113,16 +2132,15 @@ local io=io local open,flush,write,read=io.open,io.flush,io.write,io.read local byte,find,gsub,format=string.byte,string.find,string.gsub,string.format local concat=table.concat -local floor=math.floor local type=type if string.find(os.getenv("PATH"),";",1,true) then io.fileseparator,io.pathseparator="\\",";" else io.fileseparator,io.pathseparator="/",":" end -local large=2^24 -local medium=large/16 -local small=medium/8 +local large=0x01000000 +local medium=0x00100000 +local small=0x00020000 local function readall(f) local size=f:seek("end") if size>0 then @@ -2963,37 +2981,43 @@ if not unicode then unicode={ utf=utf } end if not utf.char then - local floor,char=math.floor,string.char - function utf.char(n) - if n<0x80 then - return char(n) - elseif n<0x800 then - return char( - 0xC0+floor(n/0x40), - 0x80+(n%0x40) - ) - elseif n<0x10000 then - return char( - 0xE0+floor(n/0x1000), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - elseif n<0x200000 then - return char( - 0xF0+floor(n/0x40000), - 0x80+(floor(n/0x1000)%0x40), - 0x80+(floor(n/0x40)%0x40), - 0x80+(n%0x40) - ) - else - return "" + utf.char=string.utfcharacter or (utf8 and utf8.char) + if not utf.char then + local floor,char=math.floor,string.char + function utf.char(n) + if n<0x80 then + return char(n) + elseif n<0x800 then + return char( + 0xC0+floor(n/0x40), + 0x80+(n%0x40) + ) + elseif n<0x10000 then + return char( + 0xE0+floor(n/0x1000), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + elseif n<0x200000 then + return char( + 0xF0+floor(n/0x40000), + 0x80+(floor(n/0x1000)%0x40), + 0x80+(floor(n/0x40)%0x40), + 0x80+(n%0x40) + ) + else + return "" + end end end end if not utf.byte then - local utf8byte=patterns.utf8byte - function utf.byte(c) - return lpegmatch(utf8byte,c) + utf.byte=string.utfvalue or (utf8 and utf8.codepoint) + if not utf.byte then + local utf8byte=patterns.utf8byte + function utf.byte(c) + return lpegmatch(utf8byte,c) + end end end local utfchar,utfbyte=utf.char,utf.byte @@ -3044,19 +3068,22 @@ function utf.is_valid(str) return type(str)=="string" and lpegmatch(validatedutf,str) or false end if not utf.len then - local n,f=0,1 - local utfcharcounter=patterns.utfbom^-1*Cmt ( - Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, - function(_,t,d) - n=n+(t-f)/d - f=t - return true + utf.len=string.utflength or (utf8 and utf8.len) + if not utf.len then + local n,f=0,1 + local utfcharcounter=patterns.utfbom^-1*Cmt ( + Cc(1)*patterns.utf8one^1+Cc(2)*patterns.utf8two^1+Cc(3)*patterns.utf8three^1+Cc(4)*patterns.utf8four^1, + function(_,t,d) + n=n+(t-f)/d + f=t + return true + end + )^0 + function utf.len(str) + n,f=0,1 + lpegmatch(utfcharcounter,str or "") + return n end - )^0 - function utf.len(str) - n,f=0,1 - lpegmatch(utfcharcounter,str or "") - return n end end utf.length=utf.len @@ -3578,7 +3605,7 @@ local P,V,C,S,R,Ct,Cs,Cp,Carg,Cc=lpeg.P,lpeg.V,lpeg.C,lpeg.S,lpeg.R,lpeg.Ct,lpeg local patterns,lpegmatch=lpeg.patterns,lpeg.match local utfchar,utfbyte=utf.char,utf.byte local loadstripped=nil -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then loadstripped=function(str,shortcuts) return load(str) end @@ -3839,7 +3866,7 @@ local template=[[ return function(%s) return %s end ]] local preamble,environment="",{} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then preamble=[[ local lpeg=lpeg local type=type @@ -4240,7 +4267,7 @@ local function use(t,fmt,...) return t[fmt](...) end strings.formatters={} -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then function strings.formatters.new(noconcat) local t={ _type_="formatter",_connector_=noconcat and "," or "..",_extensions_={},_preamble_=preamble,_environment_={} } setmetatable(t,{ __index=make,__call=use }) @@ -4277,7 +4304,7 @@ patterns.xmlescape=Cs((P("<")/"<"+P(">")/">"+P("&")/"&"+P('"')/"" patterns.texescape=Cs((C(S("#$%\\{}"))/"\\%1"+P(1))^0) patterns.luaescape=Cs(((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0) patterns.luaquoted=Cs(Cc('"')*((1-S('"\n'))^1+P('"')/'\\"'+P('\n')/'\\n"')^0*Cc('"')) -if _LUAVERSION<5.2 then +if LUAVERSION<5.2 then add(formatters,"xml",[[lpegmatch(xmlescape,%s)]],"local xmlescape = lpeg.patterns.xmlescape") add(formatters,"tex",[[lpegmatch(texescape,%s)]],"local texescape = lpeg.patterns.texescape") add(formatters,"lua",[[lpegmatch(luaescape,%s)]],"local luaescape = lpeg.patterns.luaescape") @@ -7621,6 +7648,7 @@ local sort,insert,concat=table.sort,table.insert,table.concat local sortedkeys,sortedhash,serialize,fastcopy=table.sortedkeys,table.sortedhash,table.serialize,table.fastcopy local derivetable=table.derive local ioflush=io.flush +local round=math.round local trace_defining=false trackers.register("fonts.defining",function(v) trace_defining=v end) local trace_scaling=false trackers.register("fonts.scaling",function(v) trace_scaling=v end) local report_defining=logs.reporter("fonts","defining") @@ -8419,13 +8447,15 @@ function constructors.hashinstance(specification,force) specification.hash=hash end if size<1000 and designsizes[hash] then - size=math.round(constructors.scaled(size,designsizes[hash])) - specification.size=size + size=round(constructors.scaled(size,designsizes[hash])) + else + size=round(size) end + specification.size=size if fallbacks then - return hash..' @ '..tostring(size)..' @ '..fallbacks + return hash..' @ '..size..' @ '..fallbacks else - return hash..' @ '..tostring(size) + return hash..' @ '..size end end function constructors.setname(tfmdata,specification) @@ -9139,7 +9169,7 @@ local function tounicode16sequence(unicodes) end return concat(t) end -local function tounicode(unicode,name) +local function tounicode(unicode) if type(unicode)=="table" then local t={} for l=1,#unicode do @@ -28363,8 +28393,8 @@ local setmetatableindex=table.setmetatableindex local formatters=string.formatters local tounicode=fonts.mappings.tounicode local otf=fonts.handlers.otf -local f_color=formatters["%f %f %f rg"] -local f_gray=formatters["%f g"] +local f_color=formatters["%.3f %.3f %.3f rg"] +local f_gray=formatters["%.3f g"] if context then local startactualtext=nil local stopactualtext=nil @@ -31898,7 +31928,7 @@ function definers.read(specification,size,id) local properties=tfmdata.properties or {} local parameters=tfmdata.parameters or {} report_defining("using %a font with id %a, name %a, size %a, bytes %a, encoding %a, fullname %a, filename %a", - properties.format or "unknown",id,properties.name,parameters.size,properties.encodingbytes, + properties.format or "unknown",id or "-",properties.name,parameters.size,properties.encodingbytes, properties.encodingname,properties.fullname,basename(properties.filename)) end statistics.stoptiming(fonts) |