diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-05-25 13:21:58 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-05-25 13:21:58 +0200 |
| commit | 82aed3e7e8af29f359ebef4f93684d20e98107e6 (patch) | |
| tree | 2b92c44d14566481aad5635f479b1b106d4e2347 /tex | |
| parent | aceba29d651766f5621b9812d4c40e28029bc4ea (diff) | |
| download | context-82aed3e7e8af29f359ebef4f93684d20e98107e6.tar.gz | |
2017-05-25 12:56:00
Diffstat (limited to 'tex')
271 files changed, 14063 insertions, 8572 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 847856cb9..148c8d7c3 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.05.12 22:40} +\newcontextversion{2017.05.25 12:50} %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 725f87c00..8c265aa46 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.05.12 22:40} +\edef\contextversion{2017.05.25 12:50} %D For those who want to use this: diff --git a/tex/context/base/mkiv/char-fio.lua b/tex/context/base/mkiv/char-fio.lua index fa69d9356..9939bf041 100644 --- a/tex/context/base/mkiv/char-fio.lua +++ b/tex/context/base/mkiv/char-fio.lua @@ -29,10 +29,10 @@ disableaction(textfileactions, "characters.filters.utf.reorder") appendaction (textlineactions,"system","characters.filters.utf.reorder") disableaction(textlineactions, "characters.filters.utf.reorder") -appendaction (textfileactions,"system","characters.filters.utf.collapse") +appendaction (textfileactions,"system","characters.filters.utf.collapse") -- not per line disableaction(textfileactions, "characters.filters.utf.collapse") -appendaction (textfileactions,"system","characters.filters.utf.decompose") +appendaction (textfileactions,"system","characters.filters.utf.decompose") -- not per line disableaction(textfileactions, "characters.filters.utf.decompose") local report = logs.reporter("unicode filter") @@ -65,12 +65,14 @@ function utffilters.enable() end local function configure(what,v) - if v == "line" then + if v == "" then + report("%a unset",what) + elseif v == "line" then disableaction(textfileactions,what) enableaction (textlineactions,what) elseif not toboolean(v) then if reporting ~= "never" then - report("%a disabled",k) + report("%a disabled",what) reporting = "yes" end enforced[what] = false @@ -82,6 +84,10 @@ local function configure(what,v) end end +-- first line: +-- +-- % directives="filters.utf.collapse=true" + directives.register("filters.utf.reorder", function(v) configure("characters.filters.utf.reorder", v) end) directives.register("filters.utf.collapse", function(v) configure("characters.filters.utf.collapse", v) end) directives.register("filters.utf.decompose", function(v) configure("characters.filters.utf.decompose",v) end) diff --git a/tex/context/base/mkiv/char-utf.lua b/tex/context/base/mkiv/char-utf.lua index 5702f2087..5b677dbac 100644 --- a/tex/context/base/mkiv/char-utf.lua +++ b/tex/context/base/mkiv/char-utf.lua @@ -183,7 +183,8 @@ local p_collapse = nil -- so we can reset if needed local function prepare() local tree = utfchartabletopattern(collapsed) - p_collapse = Cs((tree/collapsed + p_utf8character)^0 * P(-1)) -- the P(1) is needed in order to accept non utf + -- p_collapse = Cs((tree/collapsed + p_utf8character)^0 * P(-1)) + p_collapse = Cs((tree/collapsed + p_utf8character)^0) end function utffilters.collapse(str,filename) diff --git a/tex/context/base/mkiv/cont-log.mkiv b/tex/context/base/mkiv/cont-log.mkiv index 11cdfb9b8..8b4660f3a 100644 --- a/tex/context/base/mkiv/cont-log.mkiv +++ b/tex/context/base/mkiv/cont-log.mkiv @@ -22,23 +22,26 @@ \unexpanded\def\TeX {\dontleavehmode \begingroup - \setbox\scratchbox\hbox{M}% T% + \setbox\scratchbox\hbox{M}% \kern-.1667\wd\scratchbox \lower.5\exheight\hbox{E}% \kern-.125\wd\scratchbox X% \endgroup} +\unexpanded\def\TeXsuffix{\wordboundary\TeX} +\unexpanded\def\TeXprefix{\TeX\wordboundary} + \unexpanded\def\ConTeXt {\dontleavehmode \begingroup Con% + \wordboundary \setbox\scratchboxone\hbox{T\kern\zeropoint e}% \setbox\scratchboxtwo\hbox{Te}% \discretionary{-}{}{\kern\dimexpr\wd\scratchboxtwo-\wd\scratchboxone\relax}% - \TeX - t% + \TeX t% \endgroup} \unexpanded\def\PPCHTeX{ppch\TeX} @@ -196,12 +199,12 @@ %D Some placeholders: \unexpanded\def\eTeX {\mathematics{\varepsilon}-\TeX} -\unexpanded\def\pdfTeX {pdf\TeX} -\unexpanded\def\pdfeTeX {pdfe-\TeX} -\unexpanded\def\luaTeX {lua\TeX} +\unexpanded\def\pdfTeX {pdf\wordboundary\TeX} +\unexpanded\def\pdfeTeX {pdfe-\wordboundary\TeX} +\unexpanded\def\luaTeX {lua\wordboundary\TeX} \unexpanded\def\Lua {Lua} -\unexpanded\def\luajitTeX{luajit\TeX} -\unexpanded\def\metaTeX {meta\TeX} +\unexpanded\def\luajitTeX{luajit\wordboundary\TeX} +\unexpanded\def\metaTeX {meta\wordboundary\TeX} \unexpanded\def\XeTeX {X\lower.5\exheight\hbox{\kern-.15\emwidth\mirror{E}}\kern-.1667\emwidth\TeX} % Adapted from a patch by Mojca: @@ -320,8 +323,11 @@ \def\MetaFont {MetaFont}% \def\MetaFun {MetaFun}% \def\TeX {TeX}% + \def\TeXsuffix{TeX}% + \def\TeXprefix{TeX}% \def\LuaTeX {LuaTeX}% \def\LuajitTeX{LuajitTeX}% + \let\wordboundary\empty \to \everysimplifycommands \protect \endinput diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 3aacc978c..a80d41e5e 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.05.12 22:40} +\newcontextversion{2017.05.25 12:50} %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.mkiv b/tex/context/base/mkiv/cont-run.mkiv index 490c6bee2..68b2f635f 100644 --- a/tex/context/base/mkiv/cont-run.mkiv +++ b/tex/context/base/mkiv/cont-run.mkiv @@ -13,9 +13,27 @@ \writestatus{loading}{ConTeXt Core Macros / Runner} -\unprotect - \registerctxluafile{node-syn}{1.001} \registerctxluafile{cont-run}{1.001} +% \enabletrackers[system.synctex.visualize] +% \enabletrackers[system.synctex.xml] +% \enabledirectives[system.synctex.details] +% \setupsynctex[state=start] + +\unprotect + +\let\synctexsetfilename \clf_synctexsetfilename +\let\synctexresetfilename\clf_synctexresetfilename +\let\synctexblockfilename\clf_synctexblockfilename + +\unexpanded\def\setupsynctex[#1]% + {\begingroup + \getdummyparameters[\c!state=,#1]% + \doifelse{\dummyparameter\c!state}\v!start\clf_synctexenable\clf_synctexdisable + \endgroup} + +\unexpanded\def\blocksynctexfile[#1]% + {\processcommacommand{#1}\synctexblockfilename} + \protect \endinput diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 6d946e0bc..e7037678d 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.05.12 22:40} +\edef\contextversion{2017.05.25 12:50} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/data-lst.lua b/tex/context/base/mkiv/data-lst.lua index e4621a6e1..f061393e5 100644 --- a/tex/context/base/mkiv/data-lst.lua +++ b/tex/context/base/mkiv/data-lst.lua @@ -8,18 +8,17 @@ if not modules then modules = { } end modules ['data-lst'] = { -- used in mtxrun, can be loaded later .. todo -local rawget, type, next = rawget, type, next +local type = type +local concat, sortedhash = table.concat,table.sortedhash -local find, concat, upper = string.find, table.concat, string.upper -local fastcopy, sortedpairs = table.fastcopy, table.sortedpairs +local resolvers = resolvers +local listers = resolvers.listers or { } +resolvers.listers = listers -local resolvers = resolvers -local listers = resolvers.listers or { } -resolvers.listers = listers +local resolveprefix = resolvers.resolve -local resolveprefix = resolvers.resolve - -local report_lists = logs.reporter("resolvers","lists") +local report_lists = logs.reporter("resolvers","lists") +local report_resolved = logs.reporter("system","resolved") local function tabstr(str) if type(str) == 'table' then @@ -30,41 +29,18 @@ local function tabstr(str) end function listers.variables(pattern) - local instance = resolvers.instance - local environment = instance.environment - local variables = instance.variables - local expansions = instance.expansions - local pattern = upper(pattern or "") - local configured = { } - local order = instance.order - for i=1,#order do - for k, v in next, order[i] do - if v ~= nil and configured[k] == nil then - configured[k] = v - end - end + local result = resolvers.knownvariables(pattern) + for key, value in sortedhash(result) do + report_lists(key) + report_lists(" env: %s",tabstr(value.environment or "unset")) + report_lists(" var: %s",tabstr(value.variable or "unset")) + report_lists(" exp: %s",tabstr(value.expansion or "unset")) + report_lists(" res: %s",tabstr(value.resolved or "unset")) end - local env = fastcopy(environment) - local var = fastcopy(variables) - local exp = fastcopy(expansions) - for key, value in sortedpairs(configured) do - if key ~= "" and (pattern == "" or find(upper(key),pattern)) then - report_lists(key) - report_lists(" env: %s",tabstr(rawget(environment,key)) or "unset") - report_lists(" var: %s",tabstr(configured[key]) or "unset") - report_lists(" exp: %s",tabstr(expansions[key]) or "unset") - report_lists(" res: %s",tabstr(resolveprefix(expansions[key])) or "unset") - end - end - instance.environment = fastcopy(env) - instance.variables = fastcopy(var) - instance.expansions = fastcopy(exp) end -local report_resolved = logs.reporter("system","resolved") - function listers.configurations() - local configurations = resolvers.instance.specification + local configurations = resolvers.configurationfiles() for i=1,#configurations do report_resolved("file : %s",resolveprefix(configurations[i])) end diff --git a/tex/context/base/mkiv/data-res.lua b/tex/context/base/mkiv/data-res.lua index 4f171c445..d826d0987 100644 --- a/tex/context/base/mkiv/data-res.lua +++ b/tex/context/base/mkiv/data-res.lua @@ -6,15 +6,6 @@ if not modules then modules = { } end modules ['data-res'] = { license = "see context related readme files", } --- In practice we will work within one tds tree, but i want to keep --- the option open to build tools that look at multiple trees, which is --- why we keep the tree specific data in a table. We used to pass the --- instance but for practical purposes we now avoid this and use a --- instance variable. We always have one instance active (sort of global). - --- I will reimplement this module ... way too fuzzy now and we can work --- with some sensible constraints as it is only is used for context. - -- todo: cache:/// home:/// selfautoparent:/// (sometime end 2012) local gsub, find, lower, upper, match, gmatch = string.gsub, string.find, string.lower, string.upper, string.match, string.gmatch @@ -154,8 +145,7 @@ local suffixmap = resolvers.suffixmap resolvers.defaultsuffixes = { "tex" } -- "mkiv", "cld" -- too tricky -resolvers.instance = resolvers.instance or nil -- the current one (slow access) -local instance = resolvers.instance or nil -- the current one (fast access) +local instance = nil -- the current one (fast access) -- An instance has an environment (coming from the outside, kept raw), variables -- (coming from the configuration file), and expansions (variables with nested @@ -218,7 +208,7 @@ local function expandedvariable(var) return lpegmatch(variableexpander,var) or var end -function resolvers.newinstance() -- todo: all vars will become lowercase and alphanum only +function resolvers.reset() -- normally we only need one instance but for special cases we can (re)load one so -- we stick to this model. @@ -227,24 +217,27 @@ function resolvers.newinstance() -- todo: all vars will become lowercase and alp report_resolving("creating instance") end - local environment, variables, expansions, order = allocate(), allocate(), allocate(), allocate() + local environment = { } + local variables = { } + local expansions = { } + local order = { } - local newinstance = { + instance = { environment = environment, variables = variables, expansions = expansions, order = order, - files = allocate(), - setups = allocate(), - found = allocate(), - foundintrees = allocate(), - hashes = allocate(), - hashed = allocate(), + files = { }, + setups = { }, + found = { }, + foundintrees = { }, + hashes = { }, + hashed = { }, pathlists = false,-- delayed - specification = allocate(), - lists = allocate(), - data = allocate(), -- only for loading - fakepaths = allocate(), + specification = { }, + lists = { }, + data = { }, -- only for loading + fakepaths = { }, remember = true, diskcache = true, renewcache = false, @@ -295,18 +288,10 @@ function resolvers.newinstance() -- todo: all vars will become lowercase and alp return v end) - return newinstance - -end - -function resolvers.setinstance(someinstance) -- only one instance is active - instance = someinstance - resolvers.instance = someinstance - return someinstance end -function resolvers.reset() - return resolvers.setinstance(resolvers.newinstance()) +function resolvers.initialized() + return instance ~= nil end local function reset_hashes() @@ -501,10 +486,15 @@ local function load_configuration_files() end end +function resolvers.configurationfiles() + return instance.specification or { } +end + -- scheme magic ... database loading local function load_file_databases() - instance.loaderror, instance.files = false, allocate() + instance.loaderror = false + instance.files = { } if not instance.renewcache then local hashes = instance.hashes for k=1,#hashes do @@ -693,13 +683,13 @@ function resolvers.datastate() end function resolvers.variable(name) - local name = name and lpegmatch(dollarstripper,name) + local name = name and lpegmatch(dollarstripper,name) local result = name and instance.variables[name] return result ~= nil and result or "" end function resolvers.expansion(name) - local name = name and lpegmatch(dollarstripper,name) + local name = name and lpegmatch(dollarstripper,name) local result = name and instance.expansions[name] return result ~= nil and result or "" end @@ -745,7 +735,7 @@ end local done = { } -function resolvers.resetextrapath() +function resolvers.resetextrapaths() local ep = instance.extra_paths if not ep then done = { } @@ -756,6 +746,10 @@ function resolvers.resetextrapath() end end +function resolvers.getextrapaths() + return instance.extra_paths or { } +end + function resolvers.registerextrapath(paths,subpaths) if not subpaths or subpaths == "" then if not paths or path == "" then @@ -932,11 +926,7 @@ function resolvers.cleanedpathlist(v) -- can be cached if needed end function resolvers.expandbraces(str) -- output variable and brace expansion of STRING --- local ori = resolvers.variable(str) --- if ori == "" then - local ori = str --- end - local pth = expandedpathfromlist(resolvers.splitpath(ori)) + local pth = expandedpathfromlist(resolvers.splitpath(str)) return joinpath(pth) end @@ -951,6 +941,20 @@ function resolvers.registerfilehash(name,content,someerror) end end +function resolvers.getfilehashes() + return instance and instance.files or { } +end + +function resolvers.gethashes() + return instance and instance.hashes or { } +end + +function resolvers.renewcache() + if instance then + instance.renewcache = true + end +end + local function isreadable(name) local readable = isfile(name) -- not file.is_readable(name) asit can be a dir if trace_detail then @@ -1029,18 +1033,29 @@ function resolvers.registerintrees(filename,format,filetype,usedmethod,foundname if usedmethod == "direct" and filename == foundname and fit[foundname] then -- just an extra lookup after a test on presence else + local collapsed = collapsepath(foundname,true) local t = { filename = filename, - format = format ~= "" and format or nil, + format = format ~= "" and format or nil, filetype = filetype ~= "" and filetype or nil, usedmethod = usedmethod, foundname = foundname, + fullname = collapsed, } fit[foundname] = t foundintrees[#foundintrees+1] = t end end +function resolvers.foundintrees() + return instance.foundintrees or { } +end + +function resolvers.foundintree(fullname) + local f = fit[fullname] + return f and f.usedmethod == "database" +end + -- split the next one up for readability (but this module needs a cleanup anyway) local function can_be_dir(name) -- can become local @@ -1062,15 +1077,17 @@ local preparetreepattern = Cs((P(".")/"%%." + P("-")/"%%-" + P(1))^0 * Cc("$")) local collect_instance_files local function find_analyze(filename,askedformat,allresults) - local filetype, wantedfiles, ext = '', { }, suffixonly(filename) + local filetype = '' + local filesuffix = suffixonly(filename) + local wantedfiles = { } -- too tricky as filename can be bla.1.2.3: -- - -- if not suffixmap[ext] then + -- if not suffixmap[filesuffix] then -- wantedfiles[#wantedfiles+1] = filename -- end wantedfiles[#wantedfiles+1] = filename if askedformat == "" then - if ext == "" or not suffixmap[ext] then + if filesuffix == "" or not suffixmap[filesuffix] then local defaultsuffixes = resolvers.defaultsuffixes local formatofsuffix = resolvers.formatofsuffix for i=1,#defaultsuffixes do @@ -1088,7 +1105,7 @@ local function find_analyze(filename,askedformat,allresults) end end else - if ext == "" or not suffixmap[ext] then + if filesuffix == "" or not suffixmap[filesuffix] then local format_suffixes = suffixes[askedformat] if format_suffixes then for i=1,#format_suffixes do @@ -1160,11 +1177,10 @@ local function find_qualified(filename,allresults,askedformat,alsostripped) -- t if alsostripped and suffix and suffix ~= "" then -- try to find in tree (no suffix manipulation), here we search for the -- matching last part of the name - local basename = filebasename(filename) - local pattern = lpegmatch(preparetreepattern,filename) - -- messy .. to be sorted out + local basename = filebasename(filename) + local pattern = lpegmatch(preparetreepattern,filename) local savedformat = askedformat - local format = savedformat or "" + local format = savedformat or "" if format == "" then askedformat = resolvers.formatofsuffix(suffix) end @@ -1269,7 +1285,7 @@ end local function find_intree(filename,filetype,wantedfiles,allresults) local pathlists = instance.pathlists if not pathlists then - pathlists = setmetatableindex(allocate(),makepathlist) + pathlists = setmetatableindex({ },makepathlist) instance.pathlists = pathlists end local pathlist = pathlists[filetype] @@ -1588,9 +1604,9 @@ function resolvers.findpath(filename,filetype) end local function findgivenfiles(filename,allresults) - local base = filebasename(filename) - local result = { } - local hashes = instance.hashes + local base = filebasename(filename) + local result = { } + local hashes = instance.hashes -- local function okay(hash,path,name) local found = methodhandler('concatinators',hash.type,hash.name,path,name) @@ -1645,12 +1661,12 @@ end -- why bother local function findwildcardfiles(filename,allresults,result) - local result = result or { } - local base = filebasename(filename) - local dirn = filedirname(filename) - local path = lower(lpegmatch(makewildcard,dirn) or dirn) - local name = lower(lpegmatch(makewildcard,base) or base) - local files = instance.files + local result = result or { } + local base = filebasename(filename) + local dirn = filedirname(filename) + local path = lower(lpegmatch(makewildcard,dirn) or dirn) + local name = lower(lpegmatch(makewildcard,base) or base) + local files = instance.files -- if find(name,"*",1,true) then local hashes = instance.hashes @@ -1736,15 +1752,23 @@ function resolvers.automount() -- implemented later end -function resolvers.load(option) +function resolvers.starttiming() statistics.starttiming(instance) +end + +function resolvers.stoptiming() + statistics.stoptiming(instance) +end + +function resolvers.load(option) + resolvers.starttiming() identify_configuration_files() load_configuration_files() if option ~= "nofiles" then load_databases() resolvers.automount() end - statistics.stoptiming(instance) + resolvers.stoptiming() local files = instance.files return files and next(files) and true end @@ -1851,7 +1875,6 @@ function resolvers.booleanvariable(str,default) end function resolvers.dowithfilesintree(pattern,handle,before,after) -- will move, can be a nice iterator instead - local instance = resolvers.instance local hashes = instance.hashes for i=1,#hashes do local hash = hashes[i] @@ -1891,3 +1914,31 @@ resolvers.obsolete = obsolete resolvers.find_file = resolvers.findfile obsolete.find_file = resolvers.findfile resolvers.find_files = resolvers.findfiles obsolete.find_files = resolvers.findfiles + +-- moved here + +function resolvers.knownvariables(pattern) + if instance then + local environment = instance.environment + local variables = instance.variables + local expansions = instance.expansions + local order = instance.order + local pattern = upper(pattern or "") + local result = { } + for i=1,#order do + for key in next, order[i] do + if result[key] == nil and key ~= "" and (pattern == "" or find(upper(key),pattern)) then + result[key] = { + environment = rawget(environment,key), + variable = key, + expansion = expansions[key], + resolved = resolveprefix(expansions[key]), + } + end + end + end + return result + else + return { } + end +end diff --git a/tex/context/base/mkiv/data-tmp.lua b/tex/context/base/mkiv/data-tmp.lua index eabfce96e..e1903fd82 100644 --- a/tex/context/base/mkiv/data-tmp.lua +++ b/tex/context/base/mkiv/data-tmp.lua @@ -190,7 +190,7 @@ function caches.usedpaths(separator) end function caches.configfiles() - return concat(resolvers.instance.specification,";") + return concat(resolvers.configurationfiles(),";") end function caches.hashed(tree) diff --git a/tex/context/base/mkiv/data-use.lua b/tex/context/base/mkiv/data-use.lua index 930c5739f..65fcc5dc3 100644 --- a/tex/context/base/mkiv/data-use.lua +++ b/tex/context/base/mkiv/data-use.lua @@ -24,7 +24,7 @@ function resolvers.automount(usecache) mountpaths = caches.getreadablepaths("mount") end if mountpaths and #mountpaths > 0 then - statistics.starttiming(resolvers.instance) + resolvers.starttiming() for k=1,#mountpaths do local root = mountpaths[k] local f = io.open(root.."/url.tmi") @@ -45,7 +45,7 @@ function resolvers.automount(usecache) f:close() end end - statistics.stoptiming(resolvers.instance) + resolvers.stoptiming() end end diff --git a/tex/context/base/mkiv/data-zip.lua b/tex/context/base/mkiv/data-zip.lua index 2be88e0fc..32666bef2 100644 --- a/tex/context/base/mkiv/data-zip.lua +++ b/tex/context/base/mkiv/data-zip.lua @@ -203,17 +203,16 @@ function resolvers.usezipfile(archive) if archive and not registeredfiles[archive] then local z = zip.openarchive(archive) if z then - local instance = resolvers.instance local tree = url.query(specification.query).tree or "" if trace_locating then report_zip("registering: archive %a",archive) end - statistics.starttiming(instance) + resolvers.starttiming() resolvers.prependhash('zip',archive) resolvers.extendtexmfvariable(archive) -- resets hashes too registeredfiles[archive] = z - instance.files[archive] = resolvers.registerzipfile(z,tree) - statistics.stoptiming(instance) + resolvers.registerfilehash(archive,resolvers.registerzipfile(z,tree)) + resolvers.stoptiming() elseif trace_locating then report_zip("registering: unknown archive %a",archive) end diff --git a/tex/context/base/mkiv/file-job.lua b/tex/context/base/mkiv/file-job.lua index c7c36a03f..81f0753a0 100644 --- a/tex/context/base/mkiv/file-job.lua +++ b/tex/context/base/mkiv/file-job.lua @@ -55,7 +55,8 @@ local hasscheme = url.hasscheme local jobresolvers = resolvers.jobs local registerextrapath = resolvers.registerextrapath -local resetextrapath = resolvers.resetextrapath +local resetextrapaths = resolvers.resetextrapaths +local getextrapaths = resolvers.getextrapath local pushextrapath = resolvers.pushextrapath local popextrapath = resolvers.popextrapath @@ -147,14 +148,14 @@ implement { name = "resetpath", actions = function() report_jobfiles("resetting path") - resetextrapath() + resetextrapaths() end } implement { name = "allinputpaths", actions = function() - context(concat(resolvers.instance.extra_paths or { },",")) + context(concat(getextrapaths(),",")) end } @@ -1100,7 +1101,7 @@ local report_file = logs.reporter("used file") local report_option = logs.reporter("used option") luatex.registerstopactions(function() - local foundintrees = resolvers.instance.foundintrees + local foundintrees = resolvers.foundintrees() if #foundintrees > 0 then logspushtarget("logfile") logsnewline() diff --git a/tex/context/base/mkiv/file-res.lua b/tex/context/base/mkiv/file-res.lua index 44117ed46..531d365da 100644 --- a/tex/context/base/mkiv/file-res.lua +++ b/tex/context/base/mkiv/file-res.lua @@ -78,7 +78,7 @@ local function readfilename(specification,backtrack,treetoo) end end if not fnd then - local paths = resolvers.instance.extra_paths + local paths = resolvers.getextrapaths() if paths then for i=1,#paths do for i=1,#names do diff --git a/tex/context/base/mkiv/font-col.mkvi b/tex/context/base/mkiv/font-col.mkvi index 88a3ff941..b13047e50 100644 --- a/tex/context/base/mkiv/font-col.mkvi +++ b/tex/context/base/mkiv/font-col.mkvi @@ -100,7 +100,7 @@ {\doifelsenothing{#3}% {\definedfont[#2 at #4sp]}% {\definedfont[#2*#3\space at #4\scaledpoint]}% - \ctxlua{mathematics.registerfallbackid(#1,\fontid\font)}} + \clf_registerfontfallbackid#1\space\fontid\font\space{#2}} % \def\font_fallbacks_finish_math % {\ctxlua{mathematics.finishfallbacks()}} diff --git a/tex/context/base/mkiv/font-def.lua b/tex/context/base/mkiv/font-def.lua index c8394badf..a362d8967 100644 --- a/tex/context/base/mkiv/font-def.lua +++ b/tex/context/base/mkiv/font-def.lua @@ -21,7 +21,6 @@ local trace_defining = false trackers .register("fonts.defining", function local directive_embedall = false directives.register("fonts.embedall", function(v) directive_embedall = v end) trackers.register("fonts.loading", "fonts.defining", "otf.loading", "afm.loading", "tfm.loading") -trackers.register("fonts.all", "fonts.*", "otf.*", "afm.*", "tfm.*") local report_defining = logs.reporter("fonts","defining") diff --git a/tex/context/base/mkiv/font-ext.lua b/tex/context/base/mkiv/font-ext.lua index 6edfe7025..965b6e6dc 100644 --- a/tex/context/base/mkiv/font-ext.lua +++ b/tex/context/base/mkiv/font-ext.lua @@ -1296,3 +1296,52 @@ do -- another hack for a crappy font } end + +do + + local tounicode = fonts.mappings.tounicode + + local function check(tfmdata,key,value) + if value == "ligatures" then + local private = fonts.constructors and fonts.constructors.privateoffset or 0xF0000 + local collected = fonts.handlers.otf.readers.getcomponents(tfmdata.shared.rawdata) + if collected and next(collected)then + for unicode, char in next, tfmdata.characters do + if true then -- if unicode >= private or (unicode >= 0xE000 and unicode <= 0xF8FF) then + local u = collected[unicode] + if u then + local n = #u + for i=1,n do + if u[i] > private then + n = 0 + break + end + end + if n > 0 then + if n == 1 then + u = u[1] + end + char.unicode = u + char.tounicode = tounicode(u) + end + end + end + end + end + end + end + + -- forceunicodes=ligatures : aggressive lig resolving (e.g. for emoji) + -- + -- kind of like: \enabletrackers[fonts.mapping.forceligatures] + + registerotffeature { + name = "forceunicodes", + description = "forceunicodes", + manipulators = { + base = check, + node = check, + } + } + +end diff --git a/tex/context/base/mkiv/font-gbn.lua b/tex/context/base/mkiv/font-gbn.lua index 1f8df642c..6742f90fb 100644 --- a/tex/context/base/mkiv/font-gbn.lua +++ b/tex/context/base/mkiv/font-gbn.lua @@ -71,7 +71,8 @@ function nodes.handlers.setbasemodepass(v) basemodepass = v end -function nodes.handlers.nodepass(head) +-------- nodes.handlers.nodepass(head) +function nodes.handlers.nodepass(head,groupcode,size,packtype,direction) local fontdata = fonts.hashes.identifiers if fontdata then local nuthead = tonut(head) @@ -81,6 +82,7 @@ function nodes.handlers.nodepass(head) local basefont = nil local variants = nil local redundant = nil + local nofused = 0 for n in traverse_id(glyph_code,nuthead) do local font = getfont(n) if font ~= prevfont then @@ -97,6 +99,7 @@ function nodes.handlers.nodepass(head) local processors = shared.processes if processors and #processors > 0 then usedfonts[font] = processors + nofused = nofused + 1 elseif basemodepass then basefont = { n, nil } basefonts[#basefonts+1] = basefont @@ -178,6 +181,7 @@ function nodes.handlers.nodepass(head) local processors = shared.processes if processors and #processors > 0 then usedfonts[font] = processors + nofused = nofused + 1 end end end @@ -189,7 +193,7 @@ function nodes.handlers.nodepass(head) if next(usedfonts) then for font, processors in next, usedfonts do for i=1,#processors do - head = processors[i](head,font,0) or head + head = processors[i](head,font,0,direction,nofused) or head end end end @@ -241,9 +245,9 @@ local basepass = nodes.handlers.basepass local injectpass = nodes.injections.handler local protectpass = nodes.handlers.protectglyphs -function nodes.simple_font_handler(head) +function nodes.simple_font_handler(head,groupcode,size,packtype,direction) if head then - head = nodepass(head) + head = nodepass(head,groupcode,size,packtype,direction) head = injectpass(head) if not basemodepass then head = basepass(head) diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index cf369708c..706c5b709 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -19,9 +19,9 @@ local trace_mapping = false trackers.register("fonts.mapping", function(v) trac local report_fonts = logs.reporter("fonts","loading") -- not otf only --- force_ligatures is true per 2017-04-20 so that these emoji's with bad names work too +-- force_ligatures was true for a while so that these emoji's with bad names work too -local force_ligatures = true directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) +local force_ligatures = false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) local fonts = fonts or { } local mappings = fonts.mappings or { } @@ -279,6 +279,9 @@ do ffl = { name = "f_f_l", unicode = { 0x66, 0x66, 0x6C }, mess = 0xFB04 }, fj = { name = "f_j", unicode = { 0x66, 0x6A } }, fk = { name = "f_k", unicode = { 0x66, 0x6B } }, + + -- endash = { name = "endash", unicode = 0x2013, mess = 0x2013 }, + -- emdash = { name = "emdash", unicode = 0x2014, mess = 0x2014 }, } local o = { } @@ -299,7 +302,7 @@ do end -function mappings.addtounicode(data,filename,checklookups) +function mappings.addtounicode(data,filename,checklookups,forceligatures) local resources = data.resources local unicodes = resources.unicodes if not unicodes then @@ -517,22 +520,26 @@ function mappings.addtounicode(data,filename,checklookups) if not collected then -- move on - elseif force_ligatures then + elseif forceligatures or force_ligatures then for i=1,#dlist do local du = dlist[i] - local u = collected[du] -- always tables - if u then - resolve(descriptions[du],u) + if du >= private or (du >= 0xE000 and du <= 0xF8FF) then + local u = collected[du] -- always tables + if u then + resolve(descriptions[du],u) + end end end else for i=1,#dlist do - local du = dlist[i] - local glyph = descriptions[du] - if glyph.class == "ligature" and not glyph.unicode then - local u = collected[du] -- always tables - if u then - resolve(glyph,u) + local du = dlist[i] + if du >= private or (du >= 0xE000 and du <= 0xF8FF) then + local glyph = descriptions[du] + if glyph.class == "ligature" and not glyph.unicode then + local u = collected[du] -- always tables + if u then + resolve(glyph,u) + end end end end diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua index c166f5ce4..2ecf1ba42 100644 --- a/tex/context/base/mkiv/font-ocl.lua +++ b/tex/context/base/mkiv/font-ocl.lua @@ -40,7 +40,7 @@ else function otf.getactualtext(s) return - "/Span << /ActualText <feff" .. n .. "> >> BDC", + "/Span << /ActualText <feff" .. s .. "> >> BDC", "EMC" end diff --git a/tex/context/base/mkiv/font-otc.lua b/tex/context/base/mkiv/font-otc.lua index 5d879ec1d..034cba613 100644 --- a/tex/context/base/mkiv/font-otc.lua +++ b/tex/context/base/mkiv/font-otc.lua @@ -29,6 +29,7 @@ local normalized = { multiple = "multiple", kern = "kern", pair = "pair", + single = "single", chainsubstitution = "chainsubstitution", chainposition = "chainposition", } @@ -40,6 +41,7 @@ local types = { multiple = "gsub_multiple", kern = "gpos_pair", pair = "gpos_pair", + single = "gpos_single", chainsubstitution = "gsub_contextchain", chainposition = "gpos_contextchain", } @@ -403,6 +405,8 @@ local function addfeature(data,feature,specifications) return coverage end + local prepare_single = prepare_pair + local function prepare_chain(list,featuretype,sublookups) -- todo: coveractions local rules = list.rules @@ -627,6 +631,9 @@ local function addfeature(data,feature,specifications) elseif featuretype == "pair" then format = "pair" coverage = prepare_pair(list,featuretype) + elseif featuretype == "single" then + format = "single" + coverage = prepare_single(list,featuretype) end if coverage and next(coverage) then nofsteps = nofsteps + 1 @@ -666,6 +673,10 @@ local function addfeature(data,feature,specifications) category = "gpos" format = "pair" coverage = prepare_pair(list,featuretype) + elseif featuretype == "single" then + category = "gpos" + format = "single" + coverage = prepare_single(list,featuretype) elseif featuretype == "chainsubstitution" then category = "gsub" coverage = prepare_chain(list,featuretype,sublookups) diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua index 634f8a83c..2c79500e7 100644 --- a/tex/context/base/mkiv/font-otj.lua +++ b/tex/context/base/mkiv/font-otj.lua @@ -1434,6 +1434,35 @@ function injections.isspace(n,threshold,id) end end +-- We have a plugin so that Kai can use the next in plain. Such a plugin is rather application +-- specific. +-- +-- local getboth = nodes.direct.getboth +-- local getid = nodes.direct.getid +-- local getprev = nodes.direct.getprev +-- local getnext = nodes.direct.getnext +-- +-- local whatsit_code = nodes.nodecodes.whatsit +-- local glyph_code = nodes.nodecodes.glyph +-- +-- local function getspaceboth(n) -- fragile: what it prev/next has no width field +-- local prev, next = getboth(n) +-- while prev and (getid(prev) == whatsit_code or (getwidth(prev) == 0 and getid(prev) ~= glyph_code)) do +-- prev = getprev(prev) +-- end +-- while next and (getid(next) == whatsit_code or (getwidth(next) == 0 and getid(next) ~= glyph_code)) do +-- next = getnext(next) +-- end +-- end +-- +-- injections.installgetspaceboth(getspaceboth) + +local getspaceboth = getboth + +function injections.installgetspaceboth(gb) + getspaceboth = gb or getboth +end + local function injectspaces(head) if not triggers then @@ -1458,9 +1487,9 @@ local function injectspaces(head) end for n in traverse_id(glue_code,tonut(head)) do - local prev, next = getboth(n) - local prevchar = ischar(prev) - local nextchar = ischar(next) + local prev, next = getspaceboth(n) + local prevchar = prev and ischar(prev) + local nextchar = next and ischar(next) if nextchar then local font = getfont(next) local trig = triggers[font] diff --git a/tex/context/base/mkiv/font-otl.lua b/tex/context/base/mkiv/font-otl.lua index 9400096a0..bbe05304c 100644 --- a/tex/context/base/mkiv/font-otl.lua +++ b/tex/context/base/mkiv/font-otl.lua @@ -768,6 +768,7 @@ otf.coverup = { multiple = justset, kern = justset, pair = justset, + single = justset, ligature = function(coverage,unicode,ligature) local first = ligature[1] local tree = coverage[first] diff --git a/tex/context/base/mkiv/font-otn.lua b/tex/context/base/mkiv/font-otn.lua index ace7bf12b..d48021347 100644 --- a/tex/context/base/mkiv/font-otn.lua +++ b/tex/context/base/mkiv/font-otn.lua @@ -194,15 +194,13 @@ local report_process = logs.reporter("fonts","otf process") local report_prepare = logs.reporter("fonts","otf prepare") local report_run = logs.reporter("fonts","otf run") -registertracker("otf.verbose_chain", function(v) otf.setcontextchain(v and "verbose") end) -registertracker("otf.normal_chain", function(v) otf.setcontextchain(v and "normal") end) +registertracker("otf.substitutions", "otf.singles","otf.multiples","otf.alternatives","otf.ligatures") +registertracker("otf.positions", "otf.marks","otf.kerns","otf.cursive") +registertracker("otf.actions", "otf.substitutions","otf.positions") +registertracker("otf.sample", "otf.steps","otf.substitutions","otf.positions","otf.analyzing") -registertracker("otf.replacements", "otf.singles,otf.multiples,otf.alternatives,otf.ligatures") -registertracker("otf.positions","otf.marks,otf.kerns,otf.cursive") -registertracker("otf.actions","otf.replacements,otf.positions") -registertracker("otf.injections","nodes.injections") - -registertracker("*otf.sample","otf.steps,otf.actions,otf.analyzing") +registertracker("otf.chain.verbose", function(v) otf.setcontextchain(v and "verbose") end) +registertracker("otf.chain.normal", function(v) otf.setcontextchain(v and "normal") end) local nuts = nodes.nuts local tonode = nuts.tonode diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua index 3addf3324..4f93c5579 100644 --- a/tex/context/base/mkiv/font-otr.lua +++ b/tex/context/base/mkiv/font-otr.lua @@ -1130,9 +1130,10 @@ readers.hmtx = function(f,fontdata,specification) if width ~= 0 then glyph.width = width end - -- if leftsidebearing ~= 0 then - -- glyph.lsb = leftsidebearing - -- end +-- for now +-- if leftsidebearing ~= 0 then +-- glyph.lsb = leftsidebearing +-- end end -- The next can happen in for instance a monospace font or in a cjk font -- with fixed widths. diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua index 16c2ce735..1230475b3 100644 --- a/tex/context/base/mkiv/font-ots.lua +++ b/tex/context/base/mkiv/font-ots.lua @@ -155,11 +155,10 @@ local report_process = logs.reporter("fonts","otf process") local report_warning = logs.reporter("fonts","otf warning") local report_run = logs.reporter("fonts","otf run") -registertracker("otf.replacements", "otf.singles,otf.multiples,otf.alternatives,otf.ligatures") -registertracker("otf.positions","otf.marks,otf.kerns,otf.cursive") -registertracker("otf.actions","otf.replacements,otf.positions") -registertracker("otf.injections","nodes.injections") -registertracker("otf.sample","otf.steps,otf.actions,otf.analyzing") +registertracker("otf.substitutions", "otf.singles","otf.multiples","otf.alternatives","otf.ligatures") +registertracker("otf.positions", "otf.marks","otf.kerns","otf.cursive") +registertracker("otf.actions", "otf.substitutions","otf.positions") +registertracker("otf.sample", "otf.steps","otf.substitutions","otf.positions","otf.analyzing") local nuts = nodes.nuts local tonode = nuts.tonode @@ -192,6 +191,7 @@ local getdir = nuts.getdir local getwidth = nuts.getwidth local ischar = nuts.is_char +local usesfont = nuts.uses_font local insert_node_after = nuts.insert_after local copy_node = nuts.copy @@ -932,7 +932,8 @@ end function handlers.gpos_single(head,start,dataset,sequence,kerns,rlmode,step,i,injection) local startchar = getchar(start) - if step.format == "pair" then +-- if step.format == "pair" then + if step.format == "pair" or type(kerns) == "table" then local dx, dy, w, h = setpair(start,factor,rlmode,sequence.flags[4],kerns,injection) if trace_kerns then logprocess("%s: shifting single %s by (%p,%p) and correction (%p,%p)",pref(dataset,sequence),gref(startchar),dx,dy,w,h) @@ -3830,132 +3831,213 @@ otf.helpers.pardirstate = pardirstate -- optimizations the principles of processing the features hasn't changed much since -- the beginning. -local function featuresprocessor(head,font,attr,direction) +do - local sequences = sequencelists[font] -- temp hack + -- experimental speedup (only with hyphenated text and multiple fonts per processing) + -- + -- at some point this might become true by default - if not sequencelists then - return head, false - end + local fastdisc = false directives.register("otf.fastdisc",function(v) fastdisc = v end) - nesting = nesting + 1 + function otf.featuresprocessor(head,font,attr,direction,n) - if nesting == 1 then - currentfont = font - tfmdata = fontdata[font] - descriptions = tfmdata.descriptions -- only needed in gref so we could pass node there instead - characters = tfmdata.characters -- but this branch is not entered that often anyway - local resources = tfmdata.resources - marks = resources.marks - classes = resources.classes - threshold, - factor = getthreshold(font) - checkmarks = tfmdata.properties.checkmarks + local sequences = sequencelists[font] -- temp hack - elseif currentfont ~= font then + if not sequencelists then + return head, false + end - report_warning("nested call with a different font, level %s, quitting",nesting) - nesting = nesting - 1 - return head, false + nesting = nesting + 1 - end + if nesting == 1 then + currentfont = font + tfmdata = fontdata[font] + descriptions = tfmdata.descriptions -- only needed in gref so we could pass node there instead + characters = tfmdata.characters -- but this branch is not entered that often anyway + local resources = tfmdata.resources + marks = resources.marks + classes = resources.classes + threshold, + factor = getthreshold(font) + checkmarks = tfmdata.properties.checkmarks - -- some 10% faster when no dynamics but hardly measureable on real runs .. but: it only - -- works when we have no other dynamics as otherwise the zero run will be applied to the - -- whole stream for which we then need to pass another variable which we won't + elseif currentfont ~= font then - -- if attr == 0 then - -- attr = false - -- end + report_warning("nested call with a different font, level %s, quitting",nesting) + nesting = nesting - 1 + return head, false - head = tonut(head) + end - if trace_steps then - checkstep(head) - end + -- some 10% faster when no dynamics but hardly measureable on real runs .. but: it only + -- works when we have no other dynamics as otherwise the zero run will be applied to the + -- whole stream for which we then need to pass another variable which we won't - local initialrl = direction == "TRT" and -1 or 0 + -- if attr == 0 then + -- attr = false + -- end - local done = false - local datasets = otf.dataset(tfmdata,font,attr) - local dirstack = { } -- could move outside function but we can have local runs - sweephead = { } - - -- Keeping track of the headnode is needed for devanagari. (I generalized it a bit - -- so that multiple cases are also covered.) We could prepend a temp node. - - -- We don't goto the next node when a disc node is created so that we can then treat - -- the pre, post and replace. It's a bit of a hack but works out ok for most cases. - - for s=1,#datasets do - local dataset = datasets[s] - ----- featurevalue = dataset[1] -- todo: pass to function instead of using a global - local attribute = dataset[2] - local sequence = dataset[3] -- sequences[s] -- also dataset[5] - local rlparmode = initialrl - local topstack = 0 - local typ = sequence.type - local gpossing = typ == "gpos_single" or typ == "gpos_pair" -- store in dataset - local handler = handlers[typ] - local steps = sequence.steps - local nofsteps = sequence.nofsteps - if not steps then - -- this permits injection, watch the different arguments - local h, d, ok = handler(head,head,dataset,sequence,nil,nil,nil,0,font,attr) - if ok then - done = true - if h then - head = h - end - end - elseif typ == "gsub_reversecontextchain" then - -- this is a limited case, no special treatments like 'init' etc - local start = find_node_tail(head) - local rlmode = 0 -- how important is this .. do we need to check for dir? - while start do - local char = ischar(start,font) - if char then - local a -- happens often so no assignment is faster - if attr then - a = getattr(start,0) + head = tonut(head) + + if trace_steps then + checkstep(head) + end + + local initialrl = direction == "TRT" and -1 or 0 + + local done = false + local datasets = otf.dataset(tfmdata,font,attr) + local dirstack = { } -- could move outside function but we can have local runs + sweephead = { } + + -- Keeping track of the headnode is needed for devanagari. (I generalized it a bit + -- so that multiple cases are also covered.) We could prepend a temp node. + + -- We don't goto the next node when a disc node is created so that we can then treat + -- the pre, post and replace. It's a bit of a hack but works out ok for most cases. + + local discs = fastdisc and n and n > 1 and setmetatableindex(function(t,k) + local v = usesfont(k,font) + t[k] = v + return v + end) + + for s=1,#datasets do + local dataset = datasets[s] + ----- featurevalue = dataset[1] -- todo: pass to function instead of using a global + local attribute = dataset[2] + local sequence = dataset[3] -- sequences[s] -- also dataset[5] + local rlparmode = initialrl + local topstack = 0 + local typ = sequence.type + local gpossing = typ == "gpos_single" or typ == "gpos_pair" -- store in dataset + local handler = handlers[typ] + local steps = sequence.steps + local nofsteps = sequence.nofsteps + if not steps then + -- this permits injection, watch the different arguments + local h, d, ok = handler(head,head,dataset,sequence,nil,nil,nil,0,font,attr) + if ok then + done = true + if h then + head = h end - if not a or (a == attr) then - for i=1,nofsteps do - local step = steps[i] - local lookupcache = step.coverage - if lookupcache then - local lookupmatch = lookupcache[char] - if lookupmatch then - -- todo: disc? - local ok - head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) - if ok then - done = true - break + end + elseif typ == "gsub_reversecontextchain" then + -- this is a limited case, no special treatments like 'init' etc + local start = find_node_tail(head) + local rlmode = 0 -- how important is this .. do we need to check for dir? + while start do + local char = ischar(start,font) + if char then + local a -- happens often so no assignment is faster + if attr then + a = getattr(start,0) + end + if not a or (a == attr) then + for i=1,nofsteps do + local step = steps[i] + local lookupcache = step.coverage + if lookupcache then + local lookupmatch = lookupcache[char] + if lookupmatch then + -- todo: disc? + local ok + head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) + if ok then + done = true + break + end end + else + report_missing_coverage(dataset,sequence) end - else - report_missing_coverage(dataset,sequence) end - end - if start then + if start then + start = getprev(start) + end + else start = getprev(start) end else start = getprev(start) end - else - start = getprev(start) end - end - else - local start = head - local rlmode = initialrl - if nofsteps == 1 then -- happens often - local step = steps[1] - local lookupcache = step.coverage - if not lookupcache then - report_missing_coverage(dataset,sequence) + else + local start = head + local rlmode = initialrl + if nofsteps == 1 then -- happens often + local step = steps[1] + local lookupcache = step.coverage + if not lookupcache then + report_missing_coverage(dataset,sequence) + else + while start do + local char, id = ischar(start,font) + if char then + -- local a = attr and getattr(start,0) + -- if a then + -- a = (a == attr) and (not attribute or getprop(start,a_state) == attribute) + -- else + -- a = not attribute or getprop(start,a_state) == attribute + -- end + local a -- happens often so no assignment is faster + if attr then + if getattr(start,0) == attr and (not attribute or getprop(start,a_state) == attribute) then + a = true + end + elseif not attribute or getprop(start,a_state) == attribute then + a = true + end + if a then + local lookupmatch = lookupcache[char] + if lookupmatch then + local ok + head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,1) + if ok then + done = true + end + end + if start then + start = getnext(start) + end + else + start = getnext(start) + end + elseif char == false then + -- whatever glyph + start = getnext(start) + elseif id == glue_code then + -- happens often + start = getnext(start) + elseif id == disc_code then + if not discs or discs[start] == true then + local ok + if gpossing then + start, ok = kernrun(start,k_run_single, font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + elseif typ == "gsub_ligature" then + start, ok = testrun(start,t_run_single,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + else + start, ok = comprun(start,c_run_single, font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + end + if ok then + done = true + end + else + start = getnext(start) + end + elseif id == math_code then + start = getnext(end_of_math(start)) + elseif id == dir_code then + start, topstack, rlmode = txtdirstate(start,dirstack,topstack,rlparmode) + elseif id == localpar_code then + start, rlparmode, rlmode = pardirstate(start) + else + start = getnext(start) + end + end + end + else while start do local char, id = ischar(start,font) @@ -3975,37 +4057,54 @@ local function featuresprocessor(head,font,attr,direction) a = true end if a then - local lookupmatch = lookupcache[char] - if lookupmatch then - local ok - head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,1) - if ok then - done = true + for i=1,nofsteps do + local step = steps[i] + local lookupcache = step.coverage + if lookupcache then + local lookupmatch = lookupcache[char] + if lookupmatch then + -- we could move all code inline but that makes things even more unreadable + local ok + head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) + if ok then + done = true + break + elseif not start then + -- don't ask why ... shouldn't happen + break + end + end + else + report_missing_coverage(dataset,sequence) end end if start then start = getnext(start) end else - start = getnext(start) + start = getnext(start) end elseif char == false then -- whatever glyph - start = getnext(start) + start = getnext(start) elseif id == glue_code then -- happens often - start = getnext(start) + start = getnext(start) elseif id == disc_code then - local ok - if gpossing then - start, ok = kernrun(start,k_run_single, font,attr,lookupcache,step,dataset,sequence,rlmode,handler) - elseif typ == "gsub_ligature" then - start, ok = testrun(start,t_run_single,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + if not discs or discs[start] == true then + local ok + if gpossing then + start, ok = kernrun(start,k_run_multiple, font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + elseif typ == "gsub_ligature" then + start, ok = testrun(start,t_run_multiple,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + else + start, ok = comprun(start,c_run_multiple, font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + end + if ok then + done = true + end else - start, ok = comprun(start,c_run_single, font,attr,lookupcache,step,dataset,sequence,rlmode,handler) - end - if ok then - done = true + start = getnext(start) end elseif id == math_code then start = getnext(end_of_math(start)) @@ -4018,94 +4117,20 @@ local function featuresprocessor(head,font,attr,direction) end end end + end - else - while start do - local char, id = ischar(start,font) - if char then - -- local a = attr and getattr(start,0) - -- if a then - -- a = (a == attr) and (not attribute or getprop(start,a_state) == attribute) - -- else - -- a = not attribute or getprop(start,a_state) == attribute - -- end - local a -- happens often so no assignment is faster - if attr then - if getattr(start,0) == attr and (not attribute or getprop(start,a_state) == attribute) then - a = true - end - elseif not attribute or getprop(start,a_state) == attribute then - a = true - end - if a then - for i=1,nofsteps do - local step = steps[i] - local lookupcache = step.coverage - if lookupcache then - local lookupmatch = lookupcache[char] - if lookupmatch then - -- we could move all code inline but that makes things even more unreadable - local ok - head, start, ok = handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) - if ok then - done = true - break - elseif not start then - -- don't ask why ... shouldn't happen - break - end - end - else - report_missing_coverage(dataset,sequence) - end - end - if start then - start = getnext(start) - end - else - start = getnext(start) - end - elseif char == false then - -- whatever glyph - start = getnext(start) - elseif id == glue_code then - -- happens often - start = getnext(start) - elseif id == disc_code then - local ok - if gpossing then - start, ok = kernrun(start,k_run_multiple, font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - elseif typ == "gsub_ligature" then - start, ok = testrun(start,t_run_multiple,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - else - start, ok = comprun(start,c_run_multiple, font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - end - if ok then - done = true - end - elseif id == math_code then - start = getnext(end_of_math(start)) - elseif id == dir_code then - start, topstack, rlmode = txtdirstate(start,dirstack,topstack,rlparmode) - elseif id == localpar_code then - start, rlparmode, rlmode = pardirstate(start) - else - start = getnext(start) - end - end + if trace_steps then -- ? + registerstep(head) end - end - if trace_steps then -- ? - registerstep(head) end - end + nesting = nesting - 1 + head = tonode(head) - nesting = nesting - 1 - head = tonode(head) + return head, done + end - return head, done end -- so far @@ -4119,13 +4144,13 @@ function otf.registerplugin(name,f) end end -local function plugininitializer(tfmdata,value) +function otf.plugininitializer(tfmdata,value) if type(value) == "string" then tfmdata.shared.plugin = plugins[value] end end -local function pluginprocessor(head,font) +function otf.pluginprocessor(head,font) local s = fontdata[font].shared local p = s and s.plugin if p then @@ -4138,7 +4163,7 @@ local function pluginprocessor(head,font) end end -local function featuresinitializer(tfmdata,value) +function otf.featuresinitializer(tfmdata,value) -- nothing done here any more end @@ -4148,18 +4173,15 @@ registerotffeature { default = true, initializers = { position = 1, - node = featuresinitializer, - plug = plugininitializer, + node = otf.featuresinitializer, + plug = otf.plugininitializer, }, processors = { - node = featuresprocessor, - plug = pluginprocessor, + node = otf.featuresprocessor, + plug = otf.pluginprocessor, } } -otf.nodemodeinitializer = featuresinitializer -otf.featuresprocessor = featuresprocessor - -- This can be used for extra handlers, but should be used with care! otf.handlers = handlers -- used in devanagari @@ -4289,9 +4311,9 @@ local function spaceinitializer(tfmdata,value) -- attr if type(kern) ~= "table" then left[k] = kern elseif single then - left[k] = v[3] + left[k] = kern[3] else - local one = v[1] + local one = kern[1] if one then left[k] = one[3] end diff --git a/tex/context/base/mkiv/font-ttf.lua b/tex/context/base/mkiv/font-ttf.lua index 37b30f314..339764d4a 100644 --- a/tex/context/base/mkiv/font-ttf.lua +++ b/tex/context/base/mkiv/font-ttf.lua @@ -160,11 +160,12 @@ local function applyaxis(glyph,shape,deltas,dowidth) local points = shape.points if points then local nofpoints = #points - local h = nofpoints + 1 -- weird, the example font seems to have left first - ----- l = nofpoints + 2 + local h = nofpoints + 2 -- weird, the example font seems to have left first + local l = nofpoints + 1 ----- v = nofpoints + 3 ----- t = nofpoints + 4 - local width = dowidth and glyph.width -- what if hvar + local dw = 0 + local dl = 0 for i=1,#deltas do local deltaset = deltas[i] local xvalues = deltaset.xvalues @@ -190,10 +191,22 @@ local function applyaxis(glyph,shape,deltas,dowidth) p[2] = p[2] + factor * y end end - elseif width then -- and p == h then - local x = xvalues[d+1] - if x then - width = width + factor * x + elseif dowidth then + -- we've now ran into phantom points which is a bit fuzzy because: + -- are there gaps in there? + -- + -- todo: move this outside the loop (when we can be sure of all 4 being there) + if d == h then + -- we have a phantom point hadvance + local x = xvalues[i] + if x then + dw = dw + factor * x + end + elseif d == l then + local x = xvalues[i] + if x then + dl = dl + factor * x + end end end end @@ -213,10 +226,14 @@ local function applyaxis(glyph,shape,deltas,dowidth) end end end - if width then + if dowidth then local x = xvalues[h] if x then - width = width + factor * x + dw = dw + factor * x + end + local x = xvalues[l] + if x then + dl = dl + factor * x end end end @@ -226,8 +243,10 @@ local function applyaxis(glyph,shape,deltas,dowidth) -- p[1] = round(p[1]) -- p[2] = round(p[2]) -- end - if width then - glyph.width = width + if dowidth then + local width = glyph.width or 0 + -- local lsb = glyph.lsb or 0 + glyph.width = width + dw - dl end else report("no points for glyph %a",glyph.name) @@ -1066,7 +1085,7 @@ function readers.gvar(f,fontdata,specification,glyphdata,shapedata) local data = { } local tuples = { } local glyphdata = fontdata.glyphs - local dowidth = fontdata.variabledata.hvarwidths + local dowidth = not fontdata.variabledata.hvarwidths -- there is one more offset (so that one can calculate the size i suppose) -- so we could test for overflows but we simply assume sane font files if bittest(flags,0x0001) then diff --git a/tex/context/base/mkiv/lang-exc.lua b/tex/context/base/mkiv/lang-exc.lua new file mode 100644 index 000000000..bed328da8 --- /dev/null +++ b/tex/context/base/mkiv/lang-exc.lua @@ -0,0 +1,16 @@ +if not modules then modules = { } end modules ['lang-exc'] = { + version = 1.001, + comment = "companion to lang-ini.mkiv", + author = "Hans Hagen", + copyright = "ConTeXt Development Team", + license = "see context related readme files", + dataonly = true, +} + +-- Here we add common exceptions. This file can grow. For now we keep it +-- in the main base tree. We actually need a generic (shared) pattern or +-- exception file I guess. + +return { + "lua-jit", +} diff --git a/tex/context/base/mkiv/lang-ini.lua b/tex/context/base/mkiv/lang-ini.lua index 6de951998..e68938e35 100644 --- a/tex/context/base/mkiv/lang-ini.lua +++ b/tex/context/base/mkiv/lang-ini.lua @@ -270,6 +270,8 @@ local function unique(tag,requested,loaded) end end +local shared = false + local function loaddefinitions(tag,specification) statistics.starttiming(languages) local data, instance = resolve(tag) @@ -295,6 +297,19 @@ local function loaddefinitions(tag,specification) local ok = false local resources = data.resources or { } data.resources = resources + if not shared then + local found = resolvers.findfile("lang-exc.lua") + if found then + shared = dofile(found) + if type(shared) == "table" then + shared = concat(shared," ") + else + shared = true + end + else + shared = true + end + end for i=1,#definitions do local definition = definitions[i] if definition == "" then @@ -344,13 +359,18 @@ local function loaddefinitions(tag,specification) end end if #ploaded > 0 then + -- why not always clear instance:clear_patterns() instance:patterns(unique(tag,requested,ploaded)) end if #eloaded > 0 then + -- why not always clear instance:clear_hyphenation() instance:hyphenation(concat(eloaded," ")) end + if type(shared) == "string" then + instance:hyphenation(shared) + end return ok elseif trace_patterns then report_initialization("no definitions for language %a",tag) diff --git a/tex/context/base/mkiv/lang-wrd.lua b/tex/context/base/mkiv/lang-wrd.lua index 8b6e48401..666f39338 100644 --- a/tex/context/base/mkiv/lang-wrd.lua +++ b/tex/context/base/mkiv/lang-wrd.lua @@ -187,6 +187,10 @@ local function mark_words(head,whenfound) -- can be optimized and shared if n > 0 then local r = getfield(current,"replace") if r then + -- also disc itself + n = n + 1 + nds[n] = current + -- for current in traverse_ids(glyph_code,r) do local code = getchar(current) n = n + 1 @@ -195,7 +199,7 @@ local function mark_words(head,whenfound) -- can be optimized and shared str[s] = utfchar(code) end end - end + end elseif id == kern_code and getsubtype(current) == kerning_code and s > 0 then -- ok elseif s > 0 then diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 1b24269a6..635f365a9 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -543,6 +543,8 @@ function lpdf.escaped(str) return lpegmatch(escaped,str) or str end +local pdfnull, pdfboolean, pdfreference, pdfverbose + do local p_null = { } setmetatable(p_null, mt_z) diff --git a/tex/context/base/mkiv/luat-fio.lua b/tex/context/base/mkiv/luat-fio.lua index 302d17a66..a215d1b16 100644 --- a/tex/context/base/mkiv/luat-fio.lua +++ b/tex/context/base/mkiv/luat-fio.lua @@ -15,12 +15,10 @@ texconfig.shell_escape = 't' texconfig.max_print_line = 100000 texconfig.max_in_open = 1000 -if not resolvers.instance then +if not resolvers.initialized() then resolvers.reset() - resolvers.instance.validfile = resolvers.validctxfile - -- we now load the file database as we might need files other than -- tex and lua file on the given path @@ -128,7 +126,7 @@ statistics.register("resource resolver", function() scandata.n, scandata.time, scandata.shared, - #resolvers.instance.foundintrees, + #resolvers.foundintrees(), #scandata.paths > 0 and concat(scandata.paths," ") or "<none>" ) end) diff --git a/tex/context/base/mkiv/lxml-aux.lua b/tex/context/base/mkiv/lxml-aux.lua index ee0909cbf..3c0121448 100644 --- a/tex/context/base/mkiv/lxml-aux.lua +++ b/tex/context/base/mkiv/lxml-aux.lua @@ -412,7 +412,9 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) end local data = nil if name and name ~= "" then - data = loaddata(name) or "" + local d, n = loaddata(name) + data = d or "" + name = n or name if trace_inclusions then report_xml("including %s bytes from %a at level %s by pattern %a and attribute %a (%srecursing)",#data,name,level,pattern,attribute or "",recursive and "" or "not ") end @@ -423,6 +425,9 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) -- for the moment hard coded epdt[ek.ni] = xml.escaped(data) -- d[k] = xml.escaped(data) else +local settings = xmldata.settings +local savedresource = settings.currentresource +settings.currentresource = name local xi = xmlinheritedconvert(data,xmldata) if not xi then epdt[ek.ni] = "" -- xml.empty(d,k) @@ -433,6 +438,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) local child = xml.body(xi) -- xml.assign(d,k,xi) child.__p__ = ekrt child.__f__ = name -- handy for tracing +child.cf = name epdt[ek.ni] = child local settings = xmldata.settings local inclusions = settings and settings.inclusions @@ -453,6 +459,7 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) end end end +settings.currentresource = savedresource end end end diff --git a/tex/context/base/mkiv/lxml-tab.lua b/tex/context/base/mkiv/lxml-tab.lua index 02228c7c5..a4234ca6e 100644 --- a/tex/context/base/mkiv/lxml-tab.lua +++ b/tex/context/base/mkiv/lxml-tab.lua @@ -160,9 +160,20 @@ local entities, parameters local strip, utfize, resolve, cleanup, resolve_predefined, unify_predefined local dcache, hcache, acache local mt, dt, nt +local currentfilename, currentline, linenumbers + +local grammar_parsed_text_one +local grammar_parsed_text_two +local grammar_unparsed_text + +local handle_hex_entity +local handle_dec_entity +local handle_any_entity_dtd +local handle_any_entity_text local function preparexmlstate(settings) if settings then + linenumbers = settings.linenumbers stack = { } level = 0 top = { } @@ -179,6 +190,8 @@ local function preparexmlstate(settings) unify_predefined = settings.unify_predefined_entities -- & -> & cleanup = settings.text_cleanup entities = settings.entities or { } + currentfilename = settings.currentresource + currentline = 1 parameters = { } reported_at_errors = { } dcache = { } @@ -193,6 +206,7 @@ local function preparexmlstate(settings) resolve_predefined = true end else + linenumbers = false stack = nil level = nil top = nil @@ -214,6 +228,8 @@ local function preparexmlstate(settings) dcache = nil hcache = nil acache = nil + currentfilename = nil + currentline = 1 end end @@ -258,14 +274,24 @@ local function add_empty(spacing, namespace, tag) top = stack[level] dt = top.dt nt = #dt + 1 - local t = { + local t = linenumbers and { + ns = namespace or "", + rn = resolved, + tg = tag, + at = at, + dt = { }, + ni = nt, -- set slot, needed for css filtering + cf = currentfilename, + cl = currentline, + __p__ = top, + } or { ns = namespace or "", rn = resolved, tg = tag, at = at, dt = { }, ni = nt, -- set slot, needed for css filtering - __p__ = top + __p__ = top, } dt[nt] = t setmetatable(t, mt) @@ -281,18 +307,28 @@ local function add_begin(spacing, namespace, tag) dt[nt] = spacing end local resolved = namespace == "" and xmlns[#xmlns] or nsremap[namespace] or namespace - top = { + dt = { } + top = linenumbers and { ns = namespace or "", rn = resolved, tg = tag, at = at, - dt = { }, + dt = dt, + ni = nil, -- preset slot, needed for css filtering + cf = currentfilename, + cl = currentline, + __p__ = stack[level], + } or { + ns = namespace or "", + rn = resolved, + tg = tag, + at = at, + dt = dt, ni = nil, -- preset slot, needed for css filtering - __p__ = stack[level] + __p__ = stack[level], } setmetatable(top, mt) - dt = top.dt - nt = #dt + nt = 0 level = level + 1 stack[level] = top at = { } @@ -372,7 +408,15 @@ local function add_special(what, spacing, text) -- forget it else nt = nt + 1 - dt[nt] = { + dt[nt] = linenumbers and { + special = true, + ns = "", + tg = what, + ni = nil, -- preset slot + dt = { text }, + cf = currentfilename, + cl = currentline, + } or { special = true, ns = "", tg = what, @@ -406,14 +450,6 @@ end -- these will be set later -local grammar_parsed_text_one -local grammar_parsed_text_two - -local handle_hex_entity -local handle_dec_entity -local handle_any_entity_dtd -local handle_any_entity_text - -- in order to overcome lua limitations we wrap entity stuff in a -- closure @@ -880,7 +916,14 @@ local function handle_crap_error(chr) return chr end +local function handlenewline() + currentline = currentline + 1 +end + +local spacetab = S(' \t') local space = S(' \r\n\t') +local newline = lpegpatterns.newline / handlenewline +local anything = P(1) local open = P('<') local close = P('>') local squote = S("'") @@ -897,67 +940,9 @@ local name = name_yes + name_nop local utfbom = lpegpatterns.utfbom -- no capture local spacing = C(space^0) ------ entitycontent = (1-open-semicolon)^0 -local anyentitycontent = (1-open-semicolon-space-close-ampersand)^0 -local hexentitycontent = R("AF","af","09")^1 -local decentitycontent = R("09")^1 -local parsedentity = P("#")/"" * ( - P("x")/"" * (hexentitycontent/handle_hex_entity) + - (decentitycontent/handle_dec_entity) - ) + (anyentitycontent/handle_any_entity_dtd) -- can be Cc(true) -local parsedentity_text= P("#")/"" * ( - P("x")/"" * (hexentitycontent/handle_hex_entity) + - (decentitycontent/handle_dec_entity) - ) + (anyentitycontent/handle_any_entity_text) -- can be Cc(false) ------ entity = ampersand/"" * parsedentity * ( (semicolon/"") + #(P(1)/handle_end_entity)) -local entity = (ampersand/"") * parsedentity * (semicolon/"") - + ampersand * (anyentitycontent / handle_end_entity) -local entity_text = (ampersand/"") * parsedentity_text * (semicolon/"") - + ampersand * (anyentitycontent / handle_end_entity) - -local text_unparsed = C((1-open)^1) -local text_parsed = (Cs((1-open-ampersand)^1)/add_text + Cs(entity_text)/add_text)^1 - -local somespace = space^1 -local optionalspace = space^0 - ------ value = (squote * C((1 - squote)^0) * squote) + (dquote * C((1 - dquote)^0) * dquote) -- ampersand and < also invalid in value -local value = (squote * Cs((entity + (1 - squote))^0) * squote) + (dquote * Cs((entity + (1 - dquote))^0) * dquote) -- ampersand and < also invalid in value - -local endofattributes = slash * close + close -- recovery of flacky html -local whatever = space * name * optionalspace * equal ------ wrongvalue = C(P(1-whatever-close)^1 + P(1-close)^1) / attribute_value_error ------ wrongvalue = C(P(1-whatever-endofattributes)^1 + P(1-endofattributes)^1) / attribute_value_error ------ wrongvalue = C(P(1-space-endofattributes)^1) / attribute_value_error -local wrongvalue = Cs(P(entity + (1-space-endofattributes))^1) / attribute_value_error - -local attributevalue = value + wrongvalue - -local attribute = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute ------ attributes = (attribute)^0 - -local attributes = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0 - -local parsedtext = text_parsed -- / add_text -local unparsedtext = text_unparsed / add_text -local balanced = P { "[" * ((1 - S"[]") + V(1))^0 * "]" } -- taken from lpeg manual, () example - -local emptyelement = (spacing * open * name * attributes * optionalspace * slash * close) / add_empty -local beginelement = (spacing * open * name * attributes * optionalspace * close) / add_begin -local endelement = (spacing * open * slash * name * optionalspace * close) / add_end - --- todo: combine the opens in: - -local begincomment = open * P("!--") -local endcomment = P("--") * close -local begininstruction = open * P("?") -local endinstruction = P("?") * close -local begincdata = open * P("![CDATA[") -local endcdata = P("]]") * close - -local someinstruction = C((1 - endinstruction)^0) -local somecomment = C((1 - endcomment )^0) -local somecdata = C((1 - endcdata )^0) +local space_nl = spacetab + newline +local spacing_nl = Cs((space_nl)^0) +local anything_nl = newline + P(1) local function weirdentity(k,v) if trace_entities then @@ -984,97 +969,177 @@ local function publicentity(k,v,n) entities[k] = v end --- todo: separate dtd parser +local function install(spacenewline,spacing,anything) -local begindoctype = open * P("!DOCTYPE") -local enddoctype = close -local beginset = P("[") -local endset = P("]") -local wrdtypename = C((1-somespace-P(";"))^1) -local doctypename = C((1-somespace-close)^0) -local elementdoctype = optionalspace * P("<!ELEMENT") * (1-close)^0 * close + local anyentitycontent = (1-open-semicolon-space-close-ampersand)^0 + local hexentitycontent = R("AF","af","09")^1 + local decentitycontent = R("09")^1 + local parsedentity = P("#")/"" * ( + P("x")/"" * (hexentitycontent/handle_hex_entity) + + (decentitycontent/handle_dec_entity) + ) + (anyentitycontent/handle_any_entity_dtd) -- can be Cc(true) + local parsedentity_text= P("#")/"" * ( + P("x")/"" * (hexentitycontent/handle_hex_entity) + + (decentitycontent/handle_dec_entity) + ) + (anyentitycontent/handle_any_entity_text) -- can be Cc(false) + local entity = (ampersand/"") * parsedentity * (semicolon/"") + + ampersand * (anyentitycontent / handle_end_entity) + local entity_text = (ampersand/"") * parsedentity_text * (semicolon/"") + + ampersand * (anyentitycontent / handle_end_entity) -local basiccomment = begincomment * ((1 - endcomment)^0) * endcomment + local text_unparsed = Cs((anything-open)^1) + local text_parsed = (Cs((anything-open-ampersand)^1)/add_text + Cs(entity_text)/add_text)^1 -local weirdentitytype = P("%") * (somespace * doctypename * somespace * value) / weirdentity -local normalentitytype = (doctypename * somespace * value) / normalentity -local publicentitytype = (doctypename * somespace * P("PUBLIC") * somespace * value)/publicentity -local systementitytype = (doctypename * somespace * P("SYSTEM") * somespace * value * somespace * P("NDATA") * somespace * doctypename)/systementity -local entitydoctype = optionalspace * P("<!ENTITY") * somespace * (systementitytype + publicentitytype + normalentitytype + weirdentitytype) * optionalspace * close + local somespace = (spacenewline)^1 + local optionalspace = (spacenewline)^0 -local function weirdresolve(s) - lpegmatch(entitydoctype,parameters[s]) -end + local value = (squote * Cs((entity + (anything - squote))^0) * squote) + (dquote * Cs((entity + (anything - dquote))^0) * dquote) -- ampersand and < also invalid in value -local function normalresolve(s) - lpegmatch(entitydoctype,entities[s]) -end + local endofattributes = slash * close + close -- recovery of flacky html + local whatever = space * name * optionalspace * equal + local wrongvalue = Cs(P(entity + (1-space-endofattributes))^1) / attribute_value_error -local entityresolve = P("%") * (wrdtypename/weirdresolve ) * P(";") - + P("&") * (wrdtypename/normalresolve) * P(";") + local attributevalue = value + wrongvalue -entitydoctype = entitydoctype + entityresolve + local attribute = (somespace * name * optionalspace * equal * optionalspace * attributevalue) / add_attribute --- we accept comments in doctypes +-- local attributes = (attribute + somespace^-1 * (((1-endofattributes)^1)/attribute_specification_error))^0 + local attributes = (attribute + somespace^-1 * (((anything-endofattributes)^1)/attribute_specification_error))^0 -local doctypeset = beginset * optionalspace * P(elementdoctype + entitydoctype + entityresolve + basiccomment + space)^0 * optionalspace * endset -local definitiondoctype= doctypename * somespace * doctypeset -local publicdoctype = doctypename * somespace * P("PUBLIC") * somespace * value * somespace * value * somespace * doctypeset -local systemdoctype = doctypename * somespace * P("SYSTEM") * somespace * value * somespace * doctypeset -local simpledoctype = (1-close)^1 -- * balanced^0 -local somedoctype = C((somespace * (publicdoctype + systemdoctype + definitiondoctype + simpledoctype) * optionalspace)^0) + local parsedtext = text_parsed -- / add_text + local unparsedtext = text_unparsed / add_text + local balanced = P { "[" * ((anything - S"[]") + V(1))^0 * "]" } -- taken from lpeg manual, () example -local instruction = (spacing * begininstruction * someinstruction * endinstruction) / function(...) add_special("@pi@",...) end -local comment = (spacing * begincomment * somecomment * endcomment ) / function(...) add_special("@cm@",...) end -local cdata = (spacing * begincdata * somecdata * endcdata ) / function(...) add_special("@cd@",...) end -local doctype = (spacing * begindoctype * somedoctype * enddoctype ) / function(...) add_special("@dt@",...) end + local emptyelement = (spacing * open * name * attributes * optionalspace * slash * close) / add_empty + local beginelement = (spacing * open * name * attributes * optionalspace * close) / add_begin + local endelement = (spacing * open * slash * name * optionalspace * close) / add_end -local crap_parsed = 1 - beginelement - endelement - emptyelement - begininstruction - begincomment - begincdata - ampersand -local crap_unparsed = 1 - beginelement - endelement - emptyelement - begininstruction - begincomment - begincdata -local parsedcrap = Cs((crap_parsed^1 + entity_text)^1) / handle_crap_error -local parsedcrap = Cs((crap_parsed^1 + entity_text)^1) / handle_crap_error -local unparsedcrap = Cs((crap_unparsed )^1) / handle_crap_error + -- todo: combine the opens in: --- nicer but slower: --- --- local instruction = (Cc("@pi@") * spacing * begininstruction * someinstruction * endinstruction) / add_special --- local comment = (Cc("@cm@") * spacing * begincomment * somecomment * endcomment ) / add_special --- local cdata = (Cc("@cd@") * spacing * begincdata * somecdata * endcdata ) / add_special --- local doctype = (Cc("@dt@") * spacing * begindoctype * somedoctype * enddoctype ) / add_special + local begincomment = open * P("!--") + local endcomment = P("--") * close + local begininstruction = open * P("?") + local endinstruction = P("?") * close + local begincdata = open * P("![CDATA[") + local endcdata = P("]]") * close -local trailer = space^0 * (text_unparsed/set_message)^0 + local someinstruction = C((anything - endinstruction)^0) + local somecomment = C((anything - endcomment )^0) + local somecdata = C((anything - endcdata )^0) --- comment + emptyelement + text + cdata + instruction + V("parent"), -- 6.5 seconds on 40 MB database file --- text + comment + emptyelement + cdata + instruction + V("parent"), -- 5.8 --- text + V("parent") + emptyelement + comment + cdata + instruction, -- 5.5 + -- todo: separate dtd parser --- local grammar_parsed_text = P { "preamble", --- preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0 * V("parent") * trailer, --- parent = beginelement * V("children")^0 * endelement, --- children = parsedtext + V("parent") + emptyelement + comment + cdata + instruction + parsedcrap, --- } + local begindoctype = open * P("!DOCTYPE") + local enddoctype = close + local beginset = P("[") + local endset = P("]") + local wrdtypename = C((anything-somespace-P(";"))^1) + local doctypename = C((anything-somespace-close)^0) + local elementdoctype = optionalspace * P("<!ELEMENT") * (anything-close)^0 * close -grammar_parsed_text_one = P { "preamble", - preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0, -} + local basiccomment = begincomment * ((anything - endcomment)^0) * endcomment -grammar_parsed_text_two = P { "followup", - followup = V("parent") * trailer, - parent = beginelement * V("children")^0 * endelement, - children = parsedtext + V("parent") + emptyelement + comment + cdata + instruction + parsedcrap, -} + local weirdentitytype = P("%") * (somespace * doctypename * somespace * value) / weirdentity + local normalentitytype = (doctypename * somespace * value) / normalentity + local publicentitytype = (doctypename * somespace * P("PUBLIC") * somespace * value)/publicentity + local systementitytype = (doctypename * somespace * P("SYSTEM") * somespace * value * somespace * P("NDATA") * somespace * doctypename)/systementity + local entitydoctype = optionalspace * P("<!ENTITY") * somespace * (systementitytype + publicentitytype + normalentitytype + weirdentitytype) * optionalspace * close -local grammar_unparsed_text = P { "preamble", - preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0 * V("parent") * trailer, - parent = beginelement * V("children")^0 * endelement, - children = unparsedtext + V("parent") + emptyelement + comment + cdata + instruction + unparsedcrap, -} + local function weirdresolve(s) + lpegmatch(entitydoctype,parameters[s]) + end + + local function normalresolve(s) + lpegmatch(entitydoctype,entities[s]) + end + + local entityresolve = P("%") * (wrdtypename/weirdresolve ) * P(";") + + P("&") * (wrdtypename/normalresolve) * P(";") + + entitydoctype = entitydoctype + entityresolve + + -- we accept comments in doctypes + + local doctypeset = beginset * optionalspace * P(elementdoctype + entitydoctype + entityresolve + basiccomment + space)^0 * optionalspace * endset + local definitiondoctype= doctypename * somespace * doctypeset + local publicdoctype = doctypename * somespace * P("PUBLIC") * somespace * value * somespace * value * somespace * doctypeset + local systemdoctype = doctypename * somespace * P("SYSTEM") * somespace * value * somespace * doctypeset + local simpledoctype = (anything-close)^1 -- * balanced^0 + local somedoctype = C((somespace * (publicdoctype + systemdoctype + definitiondoctype + simpledoctype) * optionalspace)^0) + + local instruction = (spacing * begininstruction * someinstruction * endinstruction) / function(...) add_special("@pi@",...) end + local comment = (spacing * begincomment * somecomment * endcomment ) / function(...) add_special("@cm@",...) end + local cdata = (spacing * begincdata * somecdata * endcdata ) / function(...) add_special("@cd@",...) end + local doctype = (spacing * begindoctype * somedoctype * enddoctype ) / function(...) add_special("@dt@",...) end + + local crap_parsed = anything - beginelement - endelement - emptyelement - begininstruction - begincomment - begincdata - ampersand + local crap_unparsed = anything - beginelement - endelement - emptyelement - begininstruction - begincomment - begincdata + + local parsedcrap = Cs((crap_parsed^1 + entity_text)^1) / handle_crap_error + local parsedcrap = Cs((crap_parsed^1 + entity_text)^1) / handle_crap_error + local unparsedcrap = Cs((crap_unparsed )^1) / handle_crap_error + + -- nicer but slower: + -- + -- local instruction = (Cc("@pi@") * spacing * begininstruction * someinstruction * endinstruction) / add_special + -- local comment = (Cc("@cm@") * spacing * begincomment * somecomment * endcomment ) / add_special + -- local cdata = (Cc("@cd@") * spacing * begincdata * somecdata * endcdata ) / add_special + -- local doctype = (Cc("@dt@") * spacing * begindoctype * somedoctype * enddoctype ) / add_special + + local trailer = space^0 * (text_unparsed/set_message)^0 + + -- comment + emptyelement + text + cdata + instruction + V("parent"), -- 6.5 seconds on 40 MB database file + -- text + comment + emptyelement + cdata + instruction + V("parent"), -- 5.8 + -- text + V("parent") + emptyelement + comment + cdata + instruction, -- 5.5 + + -- local grammar_parsed_text = P { "preamble", + -- preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0 * V("parent") * trailer, + -- parent = beginelement * V("children")^0 * endelement, + -- children = parsedtext + V("parent") + emptyelement + comment + cdata + instruction + parsedcrap, + -- } + + local grammar_parsed_text_one = P { "preamble", + preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0, + } + + local grammar_parsed_text_two = P { "followup", + followup = V("parent") * trailer, + parent = beginelement * V("children")^0 * endelement, + children = parsedtext + V("parent") + emptyelement + comment + cdata + instruction + parsedcrap, + } + + local grammar_unparsed_text = P { "preamble", + preamble = utfbom^0 * instruction^0 * (doctype + comment + instruction)^0 * V("parent") * trailer, + parent = beginelement * V("children")^0 * endelement, + children = unparsedtext + V("parent") + emptyelement + comment + cdata + instruction + unparsedcrap, + } + + return grammar_parsed_text_one, grammar_parsed_text_two, grammar_unparsed_text + +end + +grammar_parsed_text_one_nop , +grammar_parsed_text_two_nop , +grammar_unparsed_text_nop = install(space, spacing, anything) + +grammar_parsed_text_one_yes , +grammar_parsed_text_two_yes , +grammar_unparsed_text_yes = install(space_nl, spacing_nl, anything_nl) -- maybe we will add settings to result as well local function _xmlconvert_(data,settings) settings = settings or { } -- no_root strip_cm_and_dt given_entities parent_root error_handler preparexmlstate(settings) + if settings.linenumbers then + grammar_parsed_text_one = grammar_parsed_text_one_yes + grammar_parsed_text_two = grammar_parsed_text_two_yes + grammar_unparsed_text = grammar_unparsed_text_yes + else + grammar_parsed_text_one = grammar_parsed_text_one_nop + grammar_parsed_text_two = grammar_parsed_text_two_nop + grammar_unparsed_text = grammar_unparsed_text_nop + end local preprocessor = settings.preprocessor if data and data ~= "" and type(preprocessor) == "function" then data = preprocessor(data,settings) or data -- settings.currentresource @@ -1113,7 +1178,7 @@ local function _xmlconvert_(data,settings) end local result if errorstr and errorstr ~= "" then - result = { dt = { { ns = "", tg = "error", dt = { errorstr }, at={ }, er = true } } } + result = { dt = { { ns = "", tg = "error", dt = { errorstr }, at = { }, er = true } } } setmetatable(result, mt) setmetatable(result.dt[1], mt) setmetatable(stack, mt) diff --git a/tex/context/base/mkiv/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua index 582185ba8..f79aa708f 100644 --- a/tex/context/base/mkiv/lxml-tex.lua +++ b/tex/context/base/mkiv/lxml-tex.lua @@ -17,6 +17,7 @@ local lpegmatch = lpeg.match local P, S, C, Cc, Cs = lpeg.P, lpeg.S, lpeg.C, lpeg.Cc, lpeg.Cs local patterns = lpeg.patterns local setmetatableindex = table.setmetatableindex +local formatters = string.formatters local tex, xml = tex, xml local lowerchars, upperchars, lettered = characters.lower, characters.upper, characters.lettered @@ -481,13 +482,24 @@ end xml.originalload = xml.originalload or xml.load -local noffiles, nofconverted = 0, 0 +local noffiles = 0 +local nofconverted = 0 +local linenumbers = false + +-- directives.register("lxml.linenumbers", function(v) +-- linenumbers = v +-- end) + +directives.register("system.synctex.xml",function(v) + linenumbers = v +end) function xml.load(filename,settings) noffiles, nofconverted = noffiles + 1, nofconverted + 1 starttiming(xml) local ok, data = resolvers.loadbinfile(filename) settings = settings or { } + settings.linenumbers = linenumbers settings.currentresource = filename local xmltable = xml.convert((ok and data) or "",settings) settings.currentresource = nil @@ -528,6 +540,7 @@ local function lxmlconvert(id,data,compress,currentresource) resolve_entities = function(str,ent) return entityconverter(id,str,ent) end, currentresource = tostring(currentresource or id), preprocessor = lxml.preprocessor, + linenumbers = linenumbers, } if compress and compress == variables.yes then settings.strip_cm_and_dt = true @@ -545,7 +558,8 @@ function lxml.load(id,filename,compress) noffiles, nofconverted = noffiles + 1, nofconverted + 1 starttiming(xml) local ok, data = resolvers.loadbinfile(filename) - local xmltable = lxmlconvert(id,(ok and data) or "",compress,format("id: %s, file: %s",id,filename)) +-- local xmltable = lxmlconvert(id,(ok and data) or "",compress,formatters["id: %s, file: %s"](id,filename)) +local xmltable = lxmlconvert(id,(ok and data) or "",compress,filename) stoptiming(xml) lxml.store(id,xmltable,filename) return xmltable, filename @@ -599,7 +613,8 @@ function lxml.include(id,pattern,attribute,options) report_lxml("including file %a",filename) end noffiles, nofconverted = noffiles + 1, nofconverted + 1 - return resolvers.loadtexfile(filename) or "" + return resolvers.loadtexfile(filename) or "", + resolvers.findtexfile(filename) or "" else return "" end @@ -694,7 +709,37 @@ local default_element_handler = xml.gethandlers("verbose").functions["@el@"] -- return v -- end) +local setfilename = false +local trace_name = false +local report_name = logs.reporter("lxml") + +directives.register("system.synctex.xml",function(v) + if v then + setfilename = luatex.synctex.setfilename + else + setfilename = false + end +end) + +local function syncfilename(e,where) + local cf = e.cf + if cf then + local cl = e.cl or 1 + if trace_name then + report_name("set filename, case %a, tag %a, file %a, line %a",where,e.tg,cf,cl) + end + setfilename(cf,cl); + end +end + +trackers.register("system.synctex.xml",function(v) + trace_name = v +end) + local function tex_element(e,handlers) + if setfilename then + syncfilename(e,"element") + end local command = e.command if command == nil then default_element_handler(e,handlers) @@ -895,11 +940,14 @@ function lxml.setaction(id,pattern,action) end end -local function sprint(root) -- check rawroot usage +local function sprint(root,p) -- check rawroot usage if root then local tr = type(root) if tr == "string" then -- can also be result of lpath -- rawroot = false -- ? + if setfilename and p then + syncfilename(p,"sprint s") + end root = xmlunspecialized(root) lpegmatch(xmltextcapture,root) elseif tr == "table" then @@ -910,12 +958,32 @@ local function sprint(root) -- check rawroot usage root = xmldespecialized(xmltostring(root)) lpegmatch(xmltextcapture,root) -- goes to toc else +if setfilename and p then -- and not root.cl + syncfilename(p,"sprint t") +end xmlserialize(root,xmltexhandler) end end end end +-- local function tprint(root) -- we can move sprint inline +-- local tr = type(root) +-- if tr == "table" then +-- local n = #root +-- if n == 0 then +-- -- skip +-- else +-- for i=1,n do +-- sprint(root[i]) +-- end +-- end +-- elseif tr == "string" then +-- root = xmlunspecialized(root) +-- lpegmatch(xmltextcapture,root) +-- end +-- end + local function tprint(root) -- we can move sprint inline local tr = type(root) if tr == "table" then @@ -924,7 +992,24 @@ local function tprint(root) -- we can move sprint inline -- skip else for i=1,n do - sprint(root[i]) + -- sprint(root[i]) -- inlined because of filename: + local ri = root[i] + local tr = type(ri) + if tr == "string" then -- can also be result of lpath + if setfilename then + syncfilename(ri,"tprint") + end + root = xmlunspecialized(ri) + lpegmatch(xmltextcapture,ri) + elseif tr == "table" then + if forceraw then + rawroot = ri + root = xmldespecialized(xmltostring(ri)) + lpegmatch(xmltextcapture,ri) -- goes to toc + else + xmlserialize(ri,xmltexhandler) + end + end end end elseif tr == "string" then @@ -942,6 +1027,9 @@ local function cprint(root) -- content root = xmlunspecialized(root) lpegmatch(xmltextcapture,root) else + if setfilename then + syncfilename(root,"cprint") + end local rootdt = root.dt if forceraw then rawroot = root @@ -961,7 +1049,11 @@ xml.cprint = cprint local xmlcprint = cprint -- calls ct mathml -> will be re -- now we can flush function lxml.main(id) - xmlserialize(getid(id),xmltexhandler) -- the real root (@rt@) + local root = getid(id) +-- if setfilename then +-- syncfilename(root,"main") +-- end + xmlserialize(root,xmltexhandler) -- the real root (@rt@) end -- -- lines (untested) @@ -1932,7 +2024,7 @@ function lxml.flush(id) if e then local dt = e.dt if dt then - xmlsprint(dt) + xmlsprint(dt,e) end end end @@ -1954,7 +2046,7 @@ function lxml.snippet(id,i) if dt then local dti = dt[i] if dti then - xmlsprint(dti) + xmlsprint(dti,e) end end end @@ -2086,12 +2178,13 @@ function lxml.strip(id,pattern,nolines,anywhere) end function lxml.stripped(id,pattern,nolines) - local str = xmltext(getid(id),pattern) or "" + local root = getid(id) + local str = xmltext(root,pattern) or "" str = gsub(str,"^%s*(.-)%s*$","%1") if nolines then str = gsub(str,"%s+"," ") end - xmlsprint(str) + xmlsprint(str,root) end function lxml.delete(id,pattern) diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua index 4fcac17d8..ddc7510b1 100644 --- a/tex/context/base/mkiv/math-act.lua +++ b/tex/context/base/mkiv/math-act.lua @@ -28,6 +28,7 @@ local appendgroup = sequencers.appendgroup local appendaction = sequencers.appendaction local fontchars = fonts.hashes.characters +local fontproperties = fonts.hashes.properties local mathfontparameteractions = sequencers.new { name = "mathparameters", @@ -664,10 +665,20 @@ blocks["uppercasedoublestruck"].gaps = { local stack = { } -function mathematics.registerfallbackid(n,id) +function mathematics.registerfallbackid(n,id,name) + if trace_collecting then + report_math("resolved fallback font %i, name %a, id %a, used %a", + n,name,id,fontproperties[id].fontname) + end stack[#stack][n] = id end +interfaces.implement { -- will be shared with text + name = "registerfontfallbackid", + arguments = { "integer", "integer", "string" }, + actions = mathematics.registerfallbackid, +} + function mathematics.resolvefallbacks(target,specification,fallbacks) local definitions = fonts.collections.definitions[fallbacks] if definitions then @@ -733,8 +744,8 @@ function mathematics.finishfallbacks(target,specification,fallbacks) end if force or (not done[unic] and not characters[unic]) then if trace_collecting then - report_math("replacing math character %C by %C using vector %a and font %a named %a%s%s", - unic,unicode,fallbacks,id,name,check and ", checked",gap and ", gap plugged") + report_math("replacing math character %C by %C using vector %a and font id %a for %a%s%s", + unic,unicode,fallbacks,id,fontproperties[id].fontname,check and ", checked",gap and ", gap plugged") end characters[unic] = copiedglyph(target,characters,chars,unicode,index) done[unic] = true diff --git a/tex/context/base/mkiv/math-fbk.lua b/tex/context/base/mkiv/math-fbk.lua index 564ece8d7..7621b6525 100644 --- a/tex/context/base/mkiv/math-fbk.lua +++ b/tex/context/base/mkiv/math-fbk.lua @@ -519,45 +519,19 @@ virtualcharacters[0xFE303] = function(data) return smashed(data,0x0303,0xFE303) -- these primes in fonts are a real mess .. kind of a dead end, so don't wonder about -- the values below --- todo: check tounicodes - -local function smashed(data,unicode,optional) - local oldchar = data.characters[unicode] - if oldchar then - local xheight = data.target.parameters.xheight - local height = 1.2 * xheight - local shift = oldchar.height - height - local newchar = { - commands = { - { "down", shift }, - { "char", unicode }, - }, - height = height, - width = oldchar.width, - } - return newchar - elseif not optional then - report_fallbacks("missing %U prime in font %a",unicode,data.target.properties.fullname) - end -end - --- -- relocate all but less flexible so not used .. instead some noad hackery plus --- -- the above --- -- local function smashed(data,unicode,optional) -- local oldchar = data.characters[unicode] -- if oldchar then -- local xheight = data.target.parameters.xheight --- local height = oldchar.height --- local shift = oldchar.height < 1.5*xheight and -(1.8*xheight-height) or 0 +-- local height = 1.25 * xheight +-- local shift = oldchar.height - height -- local newchar = { -- commands = { -- { "down", shift }, -- { "char", unicode }, -- }, --- unicode = unicode, --- height = height, --- width = oldchar.width, +-- height = height, +-- width = oldchar.width, -- } -- return newchar -- elseif not optional then @@ -565,23 +539,23 @@ end -- end -- end -addextra(0xFE932, { description="SMASHED PRIME 0x02032", unicodeslot=0xFE932 } ) -addextra(0xFE933, { description="SMASHED PRIME 0x02033", unicodeslot=0xFE933 } ) -addextra(0xFE934, { description="SMASHED PRIME 0x02034", unicodeslot=0xFE934 } ) -addextra(0xFE957, { description="SMASHED PRIME 0x02057", unicodeslot=0xFE957 } ) +-- addextra(0xFE932, { description = "SMASHED PRIME 0x02032", unicodeslot = 0xFE932 } ) +-- addextra(0xFE933, { description = "SMASHED PRIME 0x02033", unicodeslot = 0xFE933 } ) +-- addextra(0xFE934, { description = "SMASHED PRIME 0x02034", unicodeslot = 0xFE934 } ) +-- addextra(0xFE957, { description = "SMASHED PRIME 0x02057", unicodeslot = 0xFE957 } ) -addextra(0xFE935, { description="SMASHED BACKWARD PRIME 0x02035", unicodeslot=0xFE935 } ) -addextra(0xFE936, { description="SMASHED BACKWARD PRIME 0x02036", unicodeslot=0xFE936 } ) -addextra(0xFE937, { description="SMASHED BACKWARD PRIME 0x02037", unicodeslot=0xFE937 } ) +-- addextra(0xFE935, { description = "SMASHED BACKWARD PRIME 0x02035", unicodeslot = 0xFE935 } ) +-- addextra(0xFE936, { description = "SMASHED BACKWARD PRIME 0x02036", unicodeslot = 0xFE936 } ) +-- addextra(0xFE937, { description = "SMASHED BACKWARD PRIME 0x02037", unicodeslot = 0xFE937 } ) -virtualcharacters[0xFE932] = function(data) return smashed(data,0x02032) end -virtualcharacters[0xFE933] = function(data) return smashed(data,0x02033) end -virtualcharacters[0xFE934] = function(data) return smashed(data,0x02034) end -virtualcharacters[0xFE957] = function(data) return smashed(data,0x02057) end +-- virtualcharacters[0xFE932] = function(data) return smashed(data,0x02032) end +-- virtualcharacters[0xFE933] = function(data) return smashed(data,0x02033) end +-- virtualcharacters[0xFE934] = function(data) return smashed(data,0x02034) end +-- virtualcharacters[0xFE957] = function(data) return smashed(data,0x02057) end -virtualcharacters[0xFE935] = function(data) return smashed(data,0x02035,true) end -virtualcharacters[0xFE936] = function(data) return smashed(data,0x02036,true) end -virtualcharacters[0xFE937] = function(data) return smashed(data,0x02037,true) end +-- virtualcharacters[0xFE935] = function(data) return smashed(data,0x02035,true) end +-- virtualcharacters[0xFE936] = function(data) return smashed(data,0x02036,true) end +-- virtualcharacters[0xFE937] = function(data) return smashed(data,0x02037,true) end -- actuarian (beware: xits has an ugly one) diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua index f9e8c9f70..2e94f0d71 100644 --- a/tex/context/base/mkiv/math-noa.lua +++ b/tex/context/base/mkiv/math-noa.lua @@ -1510,6 +1510,8 @@ local collapse = { } processors.collapse = collapse local mathpairs = characters.mathpairs -- next will move to char-def +-- 0x02B9 modifier + mathpairs[0x2032] = { [0x2032] = 0x2033, [0x2033] = 0x2034, [0x2034] = 0x2057 } -- (prime,prime) (prime,doubleprime) (prime,tripleprime) mathpairs[0x2033] = { [0x2032] = 0x2034, [0x2033] = 0x2057 } -- (doubleprime,prime) (doubleprime,doubleprime) mathpairs[0x2034] = { [0x2032] = 0x2057 } -- (tripleprime,prime) @@ -1521,24 +1523,40 @@ mathpairs[0x222B] = { [0x222B] = 0x222C, [0x222C] = 0x222D } mathpairs[0x222C] = { [0x222B] = 0x222D } mathpairs[0x007C] = { [0x007C] = 0x2016, [0x2016] = 0x2980 } -- bar+bar=double bar+double=triple -mathpairs[0x2016] = { [0x007C] = 0x2980 } -- double+bar=triple +mathpairs[0x2016] = { [0x007C] = 0x2980, [0x02B9] = 0x2016 } -- double+bar=triple + +-- local movesub = { +-- -- primes +-- [0x2032] = 0xFE932, +-- [0x2033] = 0xFE933, +-- [0x2034] = 0xFE934, +-- [0x2057] = 0xFE957, +-- -- reverse primes +-- [0x2035] = 0xFE935, +-- [0x2036] = 0xFE936, +-- [0x2037] = 0xFE937, +-- } local movesub = { -- primes - [0x2032] = 0xFE932, - [0x2033] = 0xFE933, - [0x2034] = 0xFE934, - [0x2057] = 0xFE957, + [0x2032] = 0x2032, + [0x2033] = 0x2033, + [0x2034] = 0x2034, + [0x2057] = 0x2057, -- reverse primes - [0x2035] = 0xFE935, - [0x2036] = 0xFE936, - [0x2037] = 0xFE937, + [0x2035] = 0x2035, + [0x2036] = 0x2036, + [0x2037] = 0x2037, } +-- inner under over vcenter + local validpair = { - [noad_rel] = true, [noad_ord] = true, + [noad_rel] = true, [noad_bin] = true, -- new + [noad_open] = true, -- new + [noad_close] = true, -- new [noad_punct] = true, -- new [noad_opdisplaylimits] = true, [noad_oplimits] = true, @@ -1548,9 +1566,11 @@ local validpair = { local function movesubscript(parent,current_nucleus,current_char) local prev = getprev(parent) if prev and getid(prev) == math_noad then - if not getsup(prev) and not getsub(prev) then + local psup = getsup(prev) + local psub = getsub(prev) + if not psup and not psub then -- {f} {'}_n => f_n^' - setchar(current_nucleus,movesub[current_char or getchar(current_nucleus)]) + -- setchar(current_nucleus,movesub[current_char or getchar(current_nucleus)]) local nucleus = getnucleus(parent) local sub = getsub(parent) local sup = getsup(parent) @@ -1563,9 +1583,9 @@ local function movesubscript(parent,current_nucleus,current_char) if trace_collapsing then report_collapsing("fixing subscript") end - elseif not getsup(prev) then + elseif not psup then -- {f} {'}_n => f_n^' - setchar(current_nucleus,movesub[current_char or getchar(current_nucleus)]) + -- setchar(current_nucleus,movesub[current_char or getchar(current_nucleus)]) local nucleus = getnucleus(parent) local sup = getsup(parent) setsup(prev,nucleus) @@ -1592,9 +1612,9 @@ local function collapsepair(pointer,what,n,parent,nested) -- todo: switch to tur if next_noad and getid(next_noad) == math_noad then if validpair[getsubtype(next_noad)] then local next_nucleus = getnucleus(next_noad) - local next_char = getchar(next_nucleus) if getid(next_nucleus) == math_char then - local newchar = mathpair[next_char] + local next_char = getchar(next_nucleus) + local newchar = mathpair[next_char] if newchar then local id = getfont(current_nucleus) local characters = fontcharacters[id] @@ -1609,30 +1629,37 @@ local function collapsepair(pointer,what,n,parent,nested) -- todo: switch to tur else setnext(parent) end - setsup(parent,getsup(next_noad)) - setsub(parent,getsub(next_noad)) - setsup(next_noad) - setsub(next_noad) + local nsup = getsup(next_noad) + local nsub = getsub(next_noad) + if nsup then + setsup(parent,nsup) + setsup(next_noad) + end + if nsub then + setsub(parent,nsub) + setsub(next_noad) + end flush_node(next_noad) collapsepair(pointer,what,n,parent,true) - -- if not nested and movesub[current_char] then - -- movesubscript(parent,current_nucleus,current_char) - -- end end - elseif not nested and movesub[current_char] then - movesubscript(parent,current_nucleus,current_char) +-- elseif not nested and movesub[current_char] then +-- movesubscript(parent,current_nucleus,current_char) end end end - elseif not nested and movesub[current_char] then - movesubscript(parent,current_nucleus,current_char) +-- elseif not nested and movesub[current_char] then +-- movesubscript(parent,current_nucleus,current_char) end - elseif not nested and movesub[current_char] then - movesubscript(parent,current_nucleus,current_char) +-- elseif not nested and movesub[current_char] then +-- movesubscript(parent,current_nucleus,current_char) end - elseif not nested and movesub[current_char] then - movesubscript(parent,current_nucleus,current_char) +-- elseif not nested and movesub[current_char] then +-- movesubscript(parent,current_nucleus,current_char) end +local current_char = getchar(current_nucleus) +if movesub[current_char] then + movesubscript(parent,current_nucleus,current_char) +end end end end diff --git a/tex/context/base/mkiv/node-fnt.lua b/tex/context/base/mkiv/node-fnt.lua index 8aa088f88..0f89e581f 100644 --- a/tex/context/base/mkiv/node-fnt.lua +++ b/tex/context/base/mkiv/node-fnt.lua @@ -449,7 +449,7 @@ function handlers.characters(head,groupcode,size,packtype,direction) local attr = a > 0 and 0 or false -- 0 is the savest way for font, processors in next, usedfonts do -- unordered for i=1,#processors do - local h, d = processors[i](head,font,attr,direction) + local h, d = processors[i](head,font,attr,direction,u) if d then if h then head = h @@ -478,7 +478,7 @@ function handlers.characters(head,groupcode,size,packtype,direction) for font, dynamics in next, attrfonts do for attribute, processors in next, dynamics do -- unordered, attr can switch in between for i=1,#processors do - local h, d = processors[i](head,font,attribute,direction) + local h, d = processors[i](head,font,attribute,direction,a) if d then if h then head = h diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua index b23709ff0..cbaeb8977 100644 --- a/tex/context/base/mkiv/node-nut.lua +++ b/tex/context/base/mkiv/node-nut.lua @@ -205,7 +205,9 @@ end if LUATEXVERSION < 1.005 then local getfield = direct.getfield - function direct.getsup(n) return getfield(n,"sup") end + function direct.getnucleus(n) return getfield(n,"nucleus") end + function direct.getsub (n) return getfield(n,"sub") end + function direct.getsup (n) return getfield(n,"sup") end end -- if LUATEXVERSION < 1.004 then @@ -856,8 +858,52 @@ end -- here: -nodes.set_synctex_line = node.set_synctex_line -nodes.set_synctex_tag = node.set_synctex_tag - nuts.get_synctex_fields = direct.get_synctex_fields nuts.set_synctex_fields = direct.set_synctex_fields + +-- for now + +nodes.uses_font = nodes.uses_font +nuts.uses_font = direct.uses_font + +if not nuts.uses_font then + + local glyph_code = nodecodes.glyph + local getdisc = nuts.getdisc + local getfont = nuts.getfont + local traverse_id = nuts.traverse_id + local tonut = nodes.tonut + + function nuts.uses_font(n,font) + local pre, post, replace = getdisc(n) + if pre then + -- traverse_char + for n in traverse_id(glyph_code,pre) do + if getfont(n) == font then + return true + end + end + end + if post then + for n in traverse_id(glyph_code,post) do + if getfont(n) == font then + return true + end + end + end + if replace then + for n in traverse_id(glyph_code,replace) do + if getfont(n) == font then + return true + end + end + end + return false + end + + function nodes.uses_font(n,font) + return nuts.uses_font(tonut(n),font) + end + +end + diff --git a/tex/context/base/mkiv/node-syn.lua b/tex/context/base/mkiv/node-syn.lua index 1b8e07382..a196f0b95 100644 --- a/tex/context/base/mkiv/node-syn.lua +++ b/tex/context/base/mkiv/node-syn.lua @@ -18,11 +18,13 @@ if not modules then modules = { } end modules ['node-syn'] = { -- -- Possible optimizations: pack whole lines. +-- InverseSearchCmdLine = mtxrun.exe --script synctex --edit --name="%f" --line="%l" $ + local type, rawset = type, rawset local concat = table.concat local formatters = string.formatters -local trace = false trackers.register("system.syntex.visualize", function(v) trace = v end) +local trace = false trackers.register("system.synctex.visualize", function(v) trace = v end) local nuts = nodes.nuts local tonut = nuts.tonut @@ -65,7 +67,12 @@ local a_fontkern = attributes.private("fontkern") local get_synctex_fields = nuts.get_synctex_fields local set_synctex_fields = nuts.set_synctex_fields -local set_syntex_tag = nodes.set_synctex_tag +local set_synctex_line = tex.set_synctex_line +local set_synctex_tag = tex.set_synctex_tag +local force_synctex_tag = tex.force_synctex_tag +local force_synctex_line = tex.force_synctex_line +----- get_synctex_tag = tex.get_synctex_tag +----- get_synctex_line = tex.get_synctex_line local getcount = tex.getcount local setcount = tex.setcount @@ -75,6 +82,9 @@ local getpos = function() return getpos() end + +local eol = "\010" + local f_glue = formatters["g%i,%i:%i,%i"] local f_glyph = formatters["x%i,%i:%i,%i"] local f_kern = formatters["k%i,%i:%i,%i:%i"] @@ -88,6 +98,10 @@ local f_vvoid = formatters["v%i,%i:%i,%i:%i,%i,%i"] local characters = fonts.hashes.characters +local foundintree = resolvers.foundintree +local suffixonly = file.suffix +local nameonly = file.nameonly + local synctex = { } luatex.synctex = synctex @@ -95,25 +109,56 @@ luatex.synctex = synctex local noftags = 0 local stnums = { } -local sttags = table.setmetatableindex(function(t,name) - noftags = noftags + 1 - t[name] = noftags - stnums[noftags] = name - return noftags +local nofblocked = 0 +local blockedfilenames = { } +local blockedsuffixes = { + mkii = true, + mkiv = true, + mkvi = true, + mkix = true, + mkxi = true, + -- lfg = true, +} + + +local sttags = table.setmetatableindex(function(t,name) + if blockedsuffixes[suffixonly(name)] then + -- Just so that I don't get the ones on my development tree. + nofblocked = nofblocked + 1 + return 0 + elseif blockedfilenames[nameonly(name)] then + -- So we can block specific files. + nofblocked = nofblocked + 1 + return 0 + elseif foundintree(name) then + -- One shouldn't edit styles etc this way. + nofblocked = nofblocked + 1 + return 0 + else + noftags = noftags + 1 + t[name] = noftags + stnums[noftags] = name + return noftags + end end) -function synctex.setfilename(name) - if set_syntex_tag and name then - set_syntex_tag(sttags[name]) +function synctex.blockfilename(name) + blockedfilenames[nameonly(name)] = name +end + +function synctex.setfilename(name,line) + if force_synctex_tag and name then + force_synctex_tag(sttags[name]) + if line then + force_synctex_line(line) + end end end function synctex.resetfilename() - if set_syntex_tag then - local name = luatex.currentfile() - if name then - set_syntex_tag(name) - end + if force_synctex_tag then + force_synctex_tag(0) + force_synctex_line(0) end end @@ -128,10 +173,14 @@ local last = 0 local filesdone = 0 local enabled = false local compact = true +-- local compact = false +local fulltrace = false +-- local fulltrace = true +local logfile = false local function writeanchor() local size = f:seek("end") - f:write("!" .. (size-last) .. "\n") + f:write("!" .. (size-last) ..eol) last = size end @@ -139,34 +188,35 @@ local function writefiles() local total = #stnums if filesdone < total then for i=filesdone+1,total do - f:write("Input:"..i..":"..stnums[i].."\n") + f:write("Input:"..i..":"..stnums[i]..eol) end filesdone = total end end local function flushpreamble() - local jobname = tex.jobname - stnums[0] = jobname - f = io.open(file.replacesuffix(jobname,"syncctx"),"w") - f:write("SyncTeX Version:1\n") - f:write("Input:0:"..jobname.."\n") + logfile = file.replacesuffix(tex.jobname,"syncctx") + f = io.open(logfile,"wb") + f:write("SyncTeX Version:1"..eol) writefiles() - f:write("Output:pdf\n") - f:write("Magnification:1000\n") - f:write("Unit:1\n") - f:write("X Offset:0\n") - f:write("Y Offset:0\n") - f:write("Content:\n") + f:write("Output:pdf"..eol) + f:write("Magnification:1000"..eol) + f:write("Unit:1"..eol) + f:write("X Offset:0"..eol) + f:write("Y Offset:0"..eol) + f:write("Content:"..eol) flushpreamble = writefiles end local function flushpostamble() + if not f then + return + end writeanchor() - f:write("Postamble:\n") - f:write("Count:"..nofobjects.."\n") + f:write("Postamble:"..eol) + f:write("Count:"..nofobjects..eol) writeanchor() - f:write("Post scriptum:\n") + f:write("Post scriptum:"..eol) f:close() enabled = false end @@ -261,7 +311,14 @@ end -- end)) -- end -local function collect(head,t,l) +-- todo: why not only lines +-- todo: larger ranges + +-- color is already handled so no colors + +-- we can have ranges .. more efficient but a bit more complex to analyze ... some day + +local function collect(head,t,l,dp,ht) local current = head while current do local id = getid(current) @@ -270,9 +327,20 @@ local function collect(head,t,l) local last = current while true do id = getid(current) + -- traditionally glyphs have no synctex code which works sort of ok + -- but not when we don't leave hmode cq. have no par + -- if id == glyph_code or id == disc_code then + local tc, lc = get_synctex_fields(current) + if tc and tc > 0 then + t, l = tc, lc + end last = current elseif id == kern_code and (getsubtype(current) == fontkern_code or getattr(current,a_fontkern)) then + local tc, lc = get_synctex_fields(current) + if tc and tc > 0 then + t, l = tc, lc + end last = current else if id == glue_code then @@ -285,16 +353,13 @@ local function collect(head,t,l) end local w, h, d = getdimensions(first,getnext(last)) -- local w, h, d = getrangedimensions(head,first,getnext(last)) + if dp and d < dp then d = dp end + if ht and h < ht then h = ht end + if h < 655360 then h = 655360 end + if d < 327680 then d = 327680 end if trace then - -- color is already handled so no colors - head = insert_before(head,first,new_hlist(new_rule(w,32768,32768))) + head = insert_before(head,first,new_hlist(new_rule(w,fulltrace and h or 32768,fulltrace and d or 32768))) end -if h < 655360 then - h = 655360 -end -if d < 327680 then - d = 327680 -end head = x_hlist(head,first,t,l,w,h,d) break end @@ -302,16 +367,13 @@ end if not current then local w, h, d = getdimensions(first,getnext(last)) -- local w, h, d = getrangedimensions(head,first,getnext(last)) + if dp and d < dp then d = dp end + if ht and h < ht then h = ht end + if h < 655360 then h = 655360 end + if d < 327680 then d = 327680 end if trace then - -- color is already handled so no colors - head = insert_before(head,first,new_hlist(new_rule(w,32768,32768))) + head = insert_before(head,first,new_hlist(new_rule(w,fulltrace and h or 32768,fulltrace and d or 32768))) end -if h < 655360 then - h = 655360 -end -if d < 327680 then - d = 327680 -end head = x_hlist(head,first,t,l,w,h,d) return head end @@ -341,15 +403,15 @@ end end elseif list then -- head = b_hlist(head,current,t,l,w,h,d) - head = b_hlist(head,current,0,0,w,h,d) - local l = collect(list,t,l) + head = b_hlist(head,current,0,0,w,h,d) -- todo: only d h when line + local l = collect(list,t,l,d,h) if l ~= list then setlist(current,l) end head, current = e_hlist(head,current) else -- head = x_hlist(head,current,t,l,w,h,d) - head = x_hlist(head,current,0,0,w,h,d) + head = x_hlist(head,current,0,0,w,h,d) -- todo: only d h when line end end elseif id == vlist_code then @@ -436,37 +498,71 @@ function synctex.flush() nofsheets = nofsheets + 1 -- could be realpageno flushpreamble() writeanchor() - f:write("{"..nofsheets.."\n") + f:write("{"..nofsheets..eol) if compact then - f:write(f_vlist(0,0,0,0,tex.pagewidth,tex.pageheight,0)) - f:write("\n") + -- f:write(f_vlist(0,0,0,0,tex.pagewidth,tex.pageheight,0)) + f:write(f_hlist(0,0,0,0,0,0,0)) + f:write(eol) + f:write(f_vlist(0,0,0,0,0,0,0)) + f:write(eol) end - f:write(concat(result,"\n")) + f:write(concat(result,eol)) if compact then - f:write("\n") + f:write(eol) f:write(s_vlist) + f:write(eol) + f:write(s_hlist) end - f:write("\n") + f:write(eol) writeanchor() - f:write("}"..nofsheets.."\n") + f:write("}"..nofsheets..eol) nofobjects = nofobjects + 2 result, r = { }, 0 end end -function synctex.enable() - if not enabled and node.set_synctex_mode then - enabled = true - node.set_synctex_mode(1) - tex.normalsynctex = 0 - nodes.tasks.appendaction("shipouts", "after", "nodes.synctex.collect") +local details = 1 +local state = 0 + +directives.register("system.synctex.details",function(v) + details = tonumber(v) or 1 +end) + +local set_synctex_mode = tex.set_synctex_mode + +if set_synctex_mode then + + function synctex.enable() + if not enabled then + enabled = true + state = details or 1 + set_synctex_mode(state) + tex.normalsynctex = 0 + directives.enable("system.synctex.xml") + nodes.tasks.appendaction("shipouts", "after", "nodes.synctex.collect") + elseif state > 0 then + set_synctex_mode(state) + end end -end -function synctex.finish() - if enabled then - flushpostamble() + function synctex.disable() + if enabled then + set_synctex_mode(0) + end end + + function synctex.finish() + if enabled then + flushpostamble() + end + end + +else + + function synctex.enable () end + function synctex.disable() end + function synctex.finish () end + end -- not the best place @@ -478,27 +574,60 @@ nodes.tasks.appendaction("shipouts", "after", "luatex.synctex.collect") -- moved here local report_system = logs.reporter("system") -local synctex = false +local synctex_used = false -directives.register("system.synctex", function(v) +local function setsynctex(v) if v == "context" then - luatex.synctex.enable() + synctex.enable() setcount("normalsynctex",0) - synctex = true + synctex_used = true else v = tonumber(v) or (toboolean(v,true) and 1) or (v == "zipped" and 1) or (v == "unzipped" and -1) or 0 setcount("normalsynctex",v) - synctex = v ~= 0 + synctex_used = v ~= 0 end - if synctex then + if synctex_used then report_system("synctex functionality is enabled (%s), expect runtime overhead!",tostring(v)) else report_system("synctex functionality is disabled!") end +end + +directives.register("system.synctex", setsynctex) -- 0|1|false|true|zipped|unzipped|context + +directives.register("system.synctex.context", function(v) + setsynctex(v and "context" or false) end) statistics.register("synctex tracing",function() - if synctex or getcount("normalsynctex") ~= 0 then - return "synctex has been enabled (extra log file generated)" + if synctex_used or getcount("normalsynctex") ~= 0 then + return string.format("%i referenced files, %i files ignored, logfile: %s",noftags,nofblocked,logfile) end end) + +interfaces.implement { + name = "synctexblockfilename", + arguments = "string", + actions = synctex.blockfilename, +} + +interfaces.implement { + name = "synctexsetfilename", + arguments = "string", + actions = synctex.setfilename, +} + +interfaces.implement { + name = "synctexresetfilename", + actions = synctex.resetfilename, +} + +interfaces.implement { + name = "synctexenable", + actions = synctex.enable, +} + +interfaces.implement { + name = "synctexdisable", + actions = synctex.disable, +} diff --git a/tex/context/base/mkiv/page-one.mkiv b/tex/context/base/mkiv/page-one.mkiv index 9bd6951f3..59efbd204 100644 --- a/tex/context/base/mkiv/page-one.mkiv +++ b/tex/context/base/mkiv/page-one.mkiv @@ -456,7 +456,6 @@ \fi\fi \fi} - \def\page_one_place_float_here_indeed {\ifgridsnapping % otherwise real bad outcome diff --git a/tex/context/base/mkiv/publ-aut.lua b/tex/context/base/mkiv/publ-aut.lua index 6ad8b1296..6a8e52cb8 100644 --- a/tex/context/base/mkiv/publ-aut.lua +++ b/tex/context/base/mkiv/publ-aut.lua @@ -313,12 +313,12 @@ local function the_initials(initials,symbol,connector) s = s + 1 ; set[s] = connector end s = s + 1 ; set[s] = initial[i] - s = s + 1 ; set[s] = symbol end r = r + 1 ; result[r] = concat(set) else - r = r + 1 ; result[r] = initial .. symbol + r = r + 1 ; result[r] = initial end + r = r + 1 ; result[r] = symbol end return result end @@ -339,8 +339,9 @@ local ctx_btxstopauthor = context.btxstopauthor local concatstate = publications.concatstate local f_invalid = formatters["<invalid %s: %s>"] -local currentauthordata = nil -local currentauthorsymbol = nil +local currentauthordata = nil +local currentauthorsymbol = nil +local currentauthorconnector = nil local manipulators = typesetters.manipulators local splitmanipulation = manipulators.splitspecification @@ -359,7 +360,7 @@ local function value(i,field) end implement { name = "btxcurrentfirstnames", arguments = "integer", actions = function(i) local v = value(i,"firstnames") if v then context(concat(v," ")) end end } -implement { name = "btxcurrentinitials", arguments = "integer", actions = function(i) local v = value(i,"initials") if v then context(concat(the_initials(v,currentauthorsymbol))) end end } +implement { name = "btxcurrentinitials", arguments = "integer", actions = function(i) local v = value(i,"initials") if v then context(concat(the_initials(v,currentauthorsymbol,currentauthorconnector))) end end } implement { name = "btxcurrentjuniors", arguments = "integer", actions = function(i) local v = value(i,"juniors") if v then context(concat(v," ")) end end } implement { name = "btxcurrentsurnames", arguments = "integer", actions = function(i) local v = value(i,"surnames") if v then context(concat(v," ")) end end } implement { name = "btxcurrentvons", arguments = "integer", actions = function(i) local v = value(i,"vons") if v then context(concat(v," ")) end end } @@ -408,6 +409,7 @@ local function btxauthor(dataset,tag,field,settings) local etallast = etaloption[v_last] local combiner = settings.combiner local symbol = settings.symbol + local connector = settings.connector local index = settings.index if not combiner or combiner == "" then combiner = "normal" @@ -421,8 +423,9 @@ local function btxauthor(dataset,tag,field,settings) else etallast = false end - currentauthordata = split - currentauthorsymbol = symbol + currentauthordata = split + currentauthorsymbol = symbol + currentauthorconnector = connector local function oneauthor(i,last,justone) local author = split[i] @@ -508,6 +511,7 @@ implement { { "etaldisplay" }, { "etaloption" }, { "symbol" }, + { "connector" }, } } } diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv index 5f9aaa692..1a45ec587 100644 --- a/tex/context/base/mkiv/publ-ini.mkiv +++ b/tex/context/base/mkiv/publ-ini.mkiv @@ -1084,6 +1084,7 @@ etaldisplay {\btxparameter\c!etaldisplay}% etaloption {\btxparameter\c!etaloption}% symbol {\btxparameter{\c!stopper:initials}}% + connector {\btxparameter{\c!connector:initials}}% }% \relax \endgroup} diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex ac5183783..a38925207 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 7e492a7e7..8e140db0c 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/tabl-frm.mkiv b/tex/context/base/mkiv/tabl-frm.mkiv index 639d6f06d..c0f4b7cd1 100644 --- a/tex/context/base/mkiv/tabl-frm.mkiv +++ b/tex/context/base/mkiv/tabl-frm.mkiv @@ -134,6 +134,56 @@ {\framedparameter\c!after \endgroup} +% \unexpanded\def\startframedrow +% {\advance\c_tabl_framed_r\plusone +% \c_tabl_framed_c\zerocount +% \d_tabl_framed_h\zeropoint +% \bgroup +% \edef\currentframed{\number\c_tabl_framed_r}% +% \edef\currentframed +% {\??framedtablerow\currentframedtable +% \ifcsname\??framedtablerow\currentframedtable:\currentframed\endcsname +% :\currentframed +% \else\ifcsname\??framedtablerow\currentframedtable:\v!each\endcsname +% :\v!each +% \fi\fi}% +% \dosingleempty\pack_framed_start_framed_nop_indeed} +% +% \unexpanded\def\stopframedrow +% {\dofastloopcs\c_tabl_framed_c\tabl_framed_flush_row +% \stopframed +% \nointerlineskip +% \vskip\zeropoint\relax +% \framedparameter\c!inbetween} +% +% \unexpanded\def\tabl_framed_flush_row +% {\vpack to \d_tabl_framed_h{\flushbox\??framedtable{\number\fastloopindex}\vfill}% +% \ifdim\d_tabl_framed_d=\zeropoint\else\kern\d_tabl_framed_d\fi} +% +% \unexpanded\def\startframedcell +% {\advance\c_tabl_framed_c\plusone +% \setbox\b_tabl_framed\hpack\bgroup +% %\bgroup +% \edef\currentframed{\number\c_tabl_framed_c}% +% \edef\currentframed +% {\??framedtablecolumn\currentframedtable +% \ifcsname\??framedtablecolumn\currentframedtable:\currentframed\endcsname +% :\currentframed +% \else\ifcsname\??framedtablecolumn\currentframedtable:\v!each\endcsname +% :\v!each +% \fi\fi}% +% \dosingleempty\pack_framed_start_framed_nop_indeed} +% +% \unexpanded\def\stopframedcell +% {\stopframed +% %\egroup +% \ifdim\ht\b_tabl_framed>\d_tabl_framed_h +% \d_tabl_framed_h\ht\b_tabl_framed +% \fi +% \savebox\??framedtable{\number\c_tabl_framed_c}{\box\b_tabl_framed}} + +% a two pass variant that deals with the height .. so no catcode changes here + \unexpanded\def\startframedrow {\advance\c_tabl_framed_r\plusone \c_tabl_framed_c\zerocount @@ -160,6 +210,52 @@ {\vpack to \d_tabl_framed_h{\flushbox\??framedtable{\number\fastloopindex}\vfill}% \ifdim\d_tabl_framed_d=\zeropoint\else\kern\d_tabl_framed_d\fi} +\newcount\c_tabl_framed_pass + +\let\stopframedrow\relax + +\unexpanded\def\startframedrow#1\stopframedrow + {\advance\c_tabl_framed_r\plusone + \startframedrow_one#1\stopframedrow_one + \startframedrow_two#1\stopframedrow_two} + +\def\startframedrow_one + {\bgroup + \c_tabl_framed_pass\plusone + \c_tabl_framed_c\zerocount + \d_tabl_framed_h\zeropoint + \settrialtypesetting + \gobblesingleempty} + +\unexpanded\def\stopframedrow_one + {\normalexpanded{\egroup\d_tabl_framed_h\the\d_tabl_framed_h\relax}} + +\def\startframedrow_two + {\bgroup + \c_tabl_framed_c\zerocount + \c_tabl_framed_pass\plustwo + \edef\currentframed{\number\c_tabl_framed_r}% + \edef\currentframed + {\??framedtablerow\currentframedtable + \ifcsname\??framedtablerow\currentframedtable:\currentframed\endcsname + :\currentframed + \else\ifcsname\??framedtablerow\currentframedtable:\v!each\endcsname + :\v!each + \fi\fi}% + \dosingleempty\pack_framed_start_framed_nop_indeed} + +\unexpanded\def\stopframedrow_two + {\dofastloopcs\c_tabl_framed_c\tabl_framed_flush_row + \stopframed + \nointerlineskip + \vskip\zeropoint\relax + \framedparameter\c!inbetween} + +\unexpanded\def\tabl_framed_flush_row_two + {\vpack to \d_tabl_framed_h{\flushbox\??framedtable{\number\fastloopindex}\vfill}% + \ifdim\d_tabl_framed_d=\zeropoint\else\kern\d_tabl_framed_d\fi} + + \unexpanded\def\startframedcell {\advance\c_tabl_framed_c\plusone \setbox\b_tabl_framed\hpack\bgroup @@ -172,15 +268,26 @@ \else\ifcsname\??framedtablecolumn\currentframedtable:\v!each\endcsname :\v!each \fi\fi}% + \ifcase\c_tabl_framed_pass + \or + \letframedparameter\c!background\empty + \letframedparameter\c!frame\v!off + \or + \letframedparameter\c!height\d_tabl_framed_h + \fi \dosingleempty\pack_framed_start_framed_nop_indeed} \unexpanded\def\stopframedcell {\stopframed %\egroup - \ifdim\ht\b_tabl_framed>\d_tabl_framed_h - \d_tabl_framed_h\ht\b_tabl_framed - \fi - \savebox\??framedtable{\number\c_tabl_framed_c}{\box\b_tabl_framed}} + \ifcase\c_tabl_framed_pass + \or + \ifdim\ht\b_tabl_framed>\d_tabl_framed_h + \d_tabl_framed_h\ht\b_tabl_framed + \fi + \else + \savebox\??framedtable{\number\c_tabl_framed_c}{\box\b_tabl_framed}% + \fi} \protect \endinput diff --git a/tex/context/base/mkiv/trac-set.lua b/tex/context/base/mkiv/trac-set.lua index d0047650f..77de85e8e 100644 --- a/tex/context/base/mkiv/trac-set.lua +++ b/tex/context/base/mkiv/trac-set.lua @@ -219,13 +219,30 @@ function setters.show(t) local name = list[k] local functions = t.data[name] if functions then - local value, default, modules = functions.value, functions.default, #functions - value = value == nil and "unset" or tostring(value) - default = default == nil and "unset" or tostring(default) - t.report("%-50s modules: %2i default: %-12s value: %-12s",name,modules,default,value) + local value = functions.value + local default = functions.default + local modules = #functions + if default == nil then + default = "unset" + elseif type(default) == "table" then + default = concat(default,"|") + else + default = tostring(default) + end + if value == nil then + value = "unset" + elseif type(value) == "table" then + value = concat(value,"|") + else + value = tostring(value) + end + t.report(name) + t.report(" modules : %i",modules) + t.report(" default : %s",default) + t.report(" value : %s",value) + t.report() end end - t.report() end -- we could have used a bit of oo and the trackers:enable syntax but diff --git a/tex/context/base/mkiv/trac-tex.lua b/tex/context/base/mkiv/trac-tex.lua index 66cdc2c91..38035a044 100644 --- a/tex/context/base/mkiv/trac-tex.lua +++ b/tex/context/base/mkiv/trac-tex.lua @@ -84,7 +84,7 @@ local function saveusedfilesintrees(format) jobname = environment.jobname or "?", version = environment.version or "?", kind = environment.kind or "?", - files = resolvers.instance.foundintrees + files = resolvers.foundintrees() } local filename = file.replacesuffix(environment.jobname or "context-job",'jlg') if format == "lua" then diff --git a/tex/context/fonts/mkiv/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg index 29206da1a..5f973f41e 100644 --- a/tex/context/fonts/mkiv/lucida-opentype-math.lfg +++ b/tex/context/fonts/mkiv/lucida-opentype-math.lfg @@ -22,6 +22,7 @@ return { dimensions = { default = { -- experimental values [0x2044] = { xoffset = 275, width = 600 }, +-- [0x2032] = { yoffset = -10 }, }, }, }, diff --git a/tex/context/fonts/mkiv/px-math.lfg b/tex/context/fonts/mkiv/px-math.lfg index 14f71dad3..08d208b3f 100644 --- a/tex/context/fonts/mkiv/px-math.lfg +++ b/tex/context/fonts/mkiv/px-math.lfg @@ -10,8 +10,9 @@ return { }, virtuals = { ["px-math"] = { - { name = "texgyre-pagella-math-regular.otf", features = "virtualmath", main = true }, - { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" } , +-- { name = "texgyre-pagella-math-regular.otf", features = "virtualmath", main = true }, +-- { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" } , + { name = "texgyrepagella-regular.otf", features = "virtualmath" } , { name = "rpxr.tfm", vector = "tex-mr" } , { name = "rpxmi.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F }, diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index e8353dbdc..07181d34f 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-anchor.xml"> - <cd:command file="pack-box.mkiv" name="defineanchor"> + <cd:command file="pack-box.mkiv" level="style" name="defineanchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19,7 +19,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="anchor"> + <cd:command file="pack-box.mkiv" level="document" name="anchor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -36,7 +36,7 @@ </cd:command> </cd:interface> <cd:interface file="i-attachment.xml"> - <cd:command file="scrn-wid.mkvi" name="defineattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="defineattachment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -49,7 +49,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setupattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupattachment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -121,9 +121,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="registerattachment"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupattachments"> <cd:arguments> - <cd:keywords> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> @@ -131,25 +131,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="attachment" variant="example"> - <cd:sequence> - <cd:variable value="attachment"/> - </cd:sequence> + <cd:command file="scrn-wid.mkvi" name="registerattachment"> <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupattachment"/> </cd:assignments> </cd:arguments> - <cd:instances> - <cd:constant value="attachment"/> - </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="attachment" type="environment" variant="example"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" variant="instance"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -163,18 +157,10 @@ <cd:constant value="attachment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placeattachments"/> - <cd:command file="scrn-wid.mkvi" name="attachment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="scrn-wid.mkvi" name="attachment" type="environment"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="attachment" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="attachment"/> + </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -183,25 +169,29 @@ <cd:inherit name="setupattachment"/> </cd:assignments> </cd:arguments> + <cd:instances> + <cd:constant value="attachment"/> + </cd:instances> </cd:command> + <cd:command file="scrn-wid.mkvi" level="document" name="placeattachments"/> </cd:interface> <cd:interface file="i-attribute.xml"> - <cd:command file="attr-ini.mkiv" name="pushattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="pushattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="popattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="popattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="installattributestack"> + <cd:command file="attr-ini.mkiv" level="system" name="installattributestack"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="defineattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="defineattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -214,7 +204,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="definesystemattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="definesystemattribute"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -227,12 +217,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="newattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="newattribute"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="dosetattribute"> + <cd:command file="attr-ini.mkiv" level="system" name="dosetattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -242,36 +232,36 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-ini.mkiv" name="doresetattribute"> + <cd:command 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" name="dogetattribute"> + <cd:command 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" name="dogetattributeid"> + <cd:command 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" name="resetallattributes"/> - <cd:command file="attr-ini.mkiv" name="savecurrentattributes"> + <cd:command file="attr-ini.mkiv" level="system" name="resetallattributes"/> + <cd:command 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" name="restorecurrentattributes"> + <cd:command file="attr-ini.mkiv" level="system" name="restorecurrentattributes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -281,7 +271,7 @@ <cd:command file="attr-ini.mkiv" name="showattributes"/> </cd:interface> <cd:interface file="i-backend.xml"> - <cd:command file="back-ini.mkiv" name="setupbackend"> + <cd:command file="back-ini.mkiv" level="style" name="setupbackend"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> @@ -324,7 +314,7 @@ </cd:command> </cd:interface> <cd:interface file="i-background.xml"> - <cd:command file="pack-bck.mkvi" name="definebackground"> + <cd:command file="pack-bck.mkvi" level="style" name="definebackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -337,7 +327,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" name="setupbackground"> + <cd:command file="pack-bck.mkvi" level="style" name="setupbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -369,7 +359,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" generated="yes" name="background" type="environment" variant="example"> + <cd:command file="pack-bck.mkvi" generated="yes" level="document" name="background" type="environment" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -382,14 +372,14 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" name="background" type="environment"> + <cd:command 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" name="background" variant="example"> + <cd:command file="pack-bck.mkvi" generated="yes" level="document" name="background" variant="example"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -400,12 +390,12 @@ <cd:constant value="background"/> </cd:instances> </cd:command> - <cd:command file="pack-bck.mkvi" name="background"> + <cd:command file="pack-bck.mkvi" level="document" name="background"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-bck.mkvi" name="backgroundline"> + <cd:command file="pack-bck.mkvi" level="document" name="backgroundline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -413,7 +403,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="setupbackgrounds"> + <cd:command file="page-bck.mkiv" level="style" name="setupbackgrounds"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="top"/> @@ -434,7 +424,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="setupbackgrounds" variant="page"> + <cd:command file="page-bck.mkiv" level="style" name="setupbackgrounds" variant="page"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -460,7 +450,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifelsesomebackground"> + <cd:command file="page-bck.mkiv" level="system" name="doifelsesomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -473,7 +463,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifsomebackgroundelse"> + <cd:command file="page-bck.mkiv" level="system" name="doifsomebackgroundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -486,7 +476,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-bck.mkiv" name="doifsomebackground"> + <cd:command file="page-bck.mkiv" level="system" name="doifsomebackground"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -501,7 +491,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bar.xml"> - <cd:command file="node-rul.mkiv" name="definebar"> + <cd:command file="node-rul.mkiv" level="style" name="definebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -514,7 +504,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setupbar"> + <cd:command file="node-rul.mkiv" level="style" name="setupbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -584,9 +574,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" name="bar" variant="example"> + <cd:command file="node-rul.mkiv" level="style" name="setupbars"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupbar"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command file="node-rul.mkiv" generated="yes" level="document" name="bar" variant="instance"> <cd:sequence> - <cd:variable value="bar"/> + <cd:instance value="bar"/> </cd:sequence> <cd:arguments> <cd:content/> @@ -610,118 +610,38 @@ <cd:constant value="hiddenbar"/> </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" name="bar" type="environment"> + <cd:command 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" name="setbar"> + <cd:command 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" name="directsetbar"> + <cd:command 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" name="bar" type="environment"> + <cd:command begin="push" 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="overbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="hiddenbar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overstrike"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="understrike"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overbars"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underbars"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="overstrikes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="understrikes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underrandom"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underrandoms"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdash"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdashes"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdot"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="underdots"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="node-rul.mkiv" name="nobar"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> <cd:command file="node-rul.mkiv" name="resetbar"/> </cd:interface> <cd:interface file="i-blackrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupblackrules"> + <cd:command file="pack-mrl.mkiv" level="style" name="setupblackrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -764,28 +684,28 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="blackrule"> + <cd:command 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" name="blackrules"> + <cd:command 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" name="vl"> + <cd:command file="pack-mrl.mkiv" level="document" name="vl"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="hl"> + <cd:command file="pack-mrl.mkiv" level="document" name="hl"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -816,7 +736,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bleed.xml"> - <cd:command file="pack-box.mkiv" name="setupbleeding"> + <cd:command file="pack-box.mkiv" level="style" name="setupbleeding"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -859,7 +779,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="bleed"> + <cd:command file="pack-box.mkiv" level="document" name="bleed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> @@ -871,7 +791,7 @@ <cd:command file="pack-box.mkiv" name="bleedheight"/> </cd:interface> <cd:interface file="i-block.xml"> - <cd:command file="strc-blk.mkiv" name="defineblock"> + <cd:command file="strc-blk.mkiv" level="style" name="defineblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -884,7 +804,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="setupblock"> + <cd:command file="strc-blk.mkiv" level="style" name="setupblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -909,7 +829,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="begin" end="end" file="strc-blk.mkiv" generated="yes" name="block" type="environment" variant="example"> + <cd:command begin="begin" end="end" file="strc-blk.mkiv" generated="yes" level="document" name="block" type="environment" variant="example"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -917,6 +837,7 @@ <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> @@ -926,8 +847,7 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> @@ -937,19 +857,17 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="useblocks"> + <cd:command file="strc-blk.mkiv" level="document" name="useblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -959,14 +877,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="processblocks"> + <cd:command file="strc-blk.mkiv" level="document" name="processblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -976,14 +893,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-blk.mkiv" name="selectblocks"> + <cd:command file="strc-blk.mkiv" level="document" name="selectblocks"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> @@ -995,7 +911,7 @@ </cd:command> </cd:interface> <cd:interface file="i-bookmark.xml"> - <cd:command file="strc-bkm.mkiv" name="setupbookmark"> + <cd:command file="strc-bkm.mkiv" level="style" name="setupbookmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -1035,7 +951,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-bkm.mkiv" name="bookmark"> + <cd:command file="strc-bkm.mkiv" level="document" name="bookmark"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> @@ -1102,7 +1018,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextbox"> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1111,21 +1027,21 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextboxcs"> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcs"> <cd:arguments> <cd:csname/> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="nextboxwd"/> - <cd:command file="supp-box.mkiv" name="nextboxht"/> - <cd:command file="supp-box.mkiv" name="nextboxdp"/> - <cd:command file="supp-box.mkiv" name="nextboxhtdp"/> - <cd:command file="supp-box.mkiv" name="flushnextbox"/> - <cd:command file="supp-box.mkiv" name="nextbox"/> - <cd:command file="supp-box.mkiv" name="nextdepth"/> - <cd:command file="supp-box.mkiv" name="dowithnextboxcontent"> + <cd:command file="supp-box.mkiv" level="system" name="nextboxwd"/> + <cd:command file="supp-box.mkiv" level="system" name="nextboxht"/> + <cd:command file="supp-box.mkiv" level="system" name="nextboxdp"/> + <cd:command file="supp-box.mkiv" level="system" name="nextboxhtdp"/> + <cd:command file="supp-box.mkiv" level="system" name="flushnextbox"/> + <cd:command file="supp-box.mkiv" level="system" name="nextbox"/> + <cd:command file="supp-box.mkiv" level="system" name="nextdepth"/> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1137,7 +1053,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="dowithnextboxcontentcs"> + <cd:command file="supp-box.mkiv" level="system" name="dowithnextboxcontentcs"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1170,22 +1086,22 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="reshapebox"> + <cd:command file="supp-box.mkiv" level="system" name="reshapebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="beginof" end="endof" file="supp-box.mkiv" name="shapebox" type="environment"/> - <cd:command file="supp-box.mkiv" name="flushshapebox"/> - <cd:command file="supp-box.mkiv" name="innerflushshapebox"/> - <cd:command file="supp-box.mkiv" name="shapedhbox"> + <cd:command begin="beginof" end="endof" file="supp-box.mkiv" level="system" name="shapebox" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="flushshapebox"/> + <cd:command file="supp-box.mkiv" level="system" name="innerflushshapebox"/> + <cd:command file="supp-box.mkiv" level="system" name="shapedhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processtokens"> + <cd:command file="supp-box.mkiv" level="system" name="processtokens"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -1204,7 +1120,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doboundtext"> + <cd:command file="supp-box.mkiv" level="system" name="doboundtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1256,7 +1172,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processisolatedchars"> + <cd:command file="supp-box.mkiv" level="system" name="processisolatedchars"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1264,7 +1180,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="processisolatedwords"> + <cd:command file="supp-box.mkiv" level="system" name="processisolatedwords"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1272,7 +1188,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytocharacters"> + <cd:command file="supp-box.mkiv" level="system" name="applytocharacters"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1280,7 +1196,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytowords"> + <cd:command file="supp-box.mkiv" level="system" name="applytowords"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1288,7 +1204,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringchar"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringchar"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1296,7 +1212,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringword"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringword"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1304,7 +1220,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringline"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringline"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1312,7 +1228,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringcharspaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringcharspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1320,7 +1236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringwordspaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringwordspaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1328,7 +1244,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="applytosplitstringlinespaced"> + <cd:command file="supp-box.mkiv" level="system" name="applytosplitstringlinespaced"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -1380,7 +1296,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setrigidcolumnhsize"> + <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnhsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -1393,7 +1309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setrigidcolumnbalance"> + <cd:command file="supp-box.mkiv" level="system" name="setrigidcolumnbalance"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1401,11 +1317,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vboxtohbox" type="environment"/> - <cd:command file="supp-box.mkiv" name="vboxtohboxseparator" type="environment"/> - <cd:command file="supp-box.mkiv" name="convertvboxtohbox"/> - <cd:command file="supp-box.mkiv" name="hboxestohbox" type="environment"/> - <cd:command file="supp-box.mkiv" name="unhhbox"> + <cd:command file="supp-box.mkiv" level="system" name="vboxtohbox" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="vboxtohboxseparator" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="convertvboxtohbox"/> + <cd:command file="supp-box.mkiv" level="system" name="hboxestohbox" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="unhhbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1417,7 +1333,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hboxofvbox"> + <cd:command file="supp-box.mkiv" level="system" name="hboxofvbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1672,7 +1588,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setstackbox"> + <cd:command file="supp-box.mkiv" level="system" name="setstackbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1683,14 +1599,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="initializeboxstack"> + <cd:command file="supp-box.mkiv" level="system" name="initializeboxstack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="savebox"> + <cd:command file="supp-box.mkiv" level="system" name="savebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1701,7 +1617,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="restorebox"> + <cd:command file="supp-box.mkiv" level="system" name="restorebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1711,7 +1627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="foundbox"> + <cd:command file="supp-box.mkiv" level="system" name="foundbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1721,7 +1637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelsebox"> + <cd:command file="supp-box.mkiv" level="system" name="doifelsebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1737,7 +1653,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifboxelse"> + <cd:command file="supp-box.mkiv" level="system" name="doifboxelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -1753,7 +1669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="localpushbox"> + <cd:command file="supp-box.mkiv" level="system" name="localpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1761,7 +1677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="localpopbox"> + <cd:command file="supp-box.mkiv" level="system" name="localpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1769,7 +1685,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="globalpushbox"> + <cd:command file="supp-box.mkiv" level="system" name="globalpushbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1777,7 +1693,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="globalpopbox"> + <cd:command file="supp-box.mkiv" level="system" name="globalpopbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1792,9 +1708,9 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="removebottomthings"/> - <cd:command file="supp-box.mkiv" name="removelastskip"/> - <cd:command file="supp-box.mkiv" name="makestrutofbox"> + <cd:command file="supp-box.mkiv" level="system" name="removebottomthings"/> + <cd:command file="supp-box.mkiv" level="system" name="removelastskip"/> + <cd:command file="supp-box.mkiv" level="system" name="makestrutofbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1830,7 +1746,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalhbox"> + <cd:command file="supp-box.mkiv" level="system" name="naturalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1838,7 +1754,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvbox"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1846,7 +1762,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvtop"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1854,7 +1770,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvcenter"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvcenter"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1862,7 +1778,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalhpack"> + <cd:command file="supp-box.mkiv" level="system" name="naturalhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1870,7 +1786,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="naturalvpack"> + <cd:command file="supp-box.mkiv" level="system" name="naturalvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1878,12 +1794,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="frozenhbox"> + <cd:command file="supp-box.mkiv" level="system" name="frozenhbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="setboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1894,7 +1810,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="setboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1905,7 +1821,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="gsetboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="gsetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1916,7 +1832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="gsetboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="gsetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1927,7 +1843,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="getboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1935,7 +1851,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="getboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1943,7 +1859,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="directgetboxllx"> + <cd:command file="supp-box.mkiv" level="system" name="directgetboxllx"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1951,7 +1867,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="directgetboxlly"> + <cd:command file="supp-box.mkiv" level="system" name="directgetboxlly"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1959,13 +1875,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="shownextbox"> + <cd:command file="supp-box.mkiv" level="system" name="shownextbox"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="spreadhbox"> + <cd:command file="supp-box.mkiv" level="system" name="spreadhbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1973,7 +1889,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="minimalhbox"> + <cd:command file="supp-box.mkiv" level="system" name="minimalhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -1981,13 +1897,13 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="nodetostring"> + <cd:command file="supp-box.mkiv" level="system" name="nodetostring"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getnaturaldimensions"> + <cd:command file="supp-box.mkiv" level="system" name="getnaturaldimensions"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -1995,10 +1911,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="lastnaturalboxwd"/> - <cd:command file="supp-box.mkiv" name="lastnaturalboxht"/> - <cd:command file="supp-box.mkiv" name="lastnaturalboxdp"/> - <cd:command file="supp-box.mkiv" name="naturalwd"> + <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxwd"/> + <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxht"/> + <cd:command file="supp-box.mkiv" level="system" name="lastnaturalboxdp"/> + <cd:command file="supp-box.mkiv" level="system" name="naturalwd"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2006,7 +1922,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifelserighttoleftinbox"> + <cd:command file="supp-box.mkiv" level="system" name="doifelserighttoleftinbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2020,7 +1936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="doifrighttoleftinboxelse"> + <cd:command file="supp-box.mkiv" level="system" name="doifrighttoleftinboxelse"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2034,15 +1950,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="runninghbox"> + <cd:command file="supp-box.mkiv" level="system" name="runninghbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command begin="begin" end="end" file="supp-box.mkiv" name="vbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" name="hbox" type="environment"/> - <cd:command begin="begin" end="end" file="supp-box.mkiv" name="vtop" type="environment"/> - <cd:command file="supp-box.mkiv" name="setvboxregister"> + <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vbox" type="environment"/> + <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="hbox" type="environment"/> + <cd:command begin="begin" end="end" file="supp-box.mkiv" level="system" name="vtop" type="environment"/> + <cd:command file="supp-box.mkiv" level="system" name="setvboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2051,7 +1967,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="sethboxregister"> + <cd:command file="supp-box.mkiv" level="system" name="sethboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2060,7 +1976,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="setvtopregister"> + <cd:command file="supp-box.mkiv" level="system" name="setvtopregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2069,7 +1985,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="flushboxregister"> + <cd:command file="supp-box.mkiv" level="system" name="flushboxregister"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2077,7 +1993,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vboxregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="vboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2085,7 +2001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hboxregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="hboxregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2093,7 +2009,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vtopregister" type="environment"> + <cd:command file="supp-box.mkiv" level="system" name="vtopregister" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -2101,7 +2017,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttolefthbox"> + <cd:command file="spac-ali.mkiv" level="system" name="righttolefthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2109,7 +2025,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorighthbox"> + <cd:command file="spac-ali.mkiv" level="system" name="lefttorighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2117,7 +2033,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttoleftvbox"> + <cd:command file="spac-ali.mkiv" level="system" name="righttoleftvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2125,7 +2041,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorightvbox"> + <cd:command file="spac-ali.mkiv" level="system" name="lefttorightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2133,7 +2049,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="righttoleftvtop"> + <cd:command file="spac-ali.mkiv" level="system" name="righttoleftvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2141,7 +2057,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="lefttorightvtop"> + <cd:command file="spac-ali.mkiv" level="system" name="lefttorightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2149,7 +2065,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirhbox"> + <cd:command file="spac-ali.mkiv" level="system" name="autodirhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2157,7 +2073,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirvbox"> + <cd:command file="spac-ali.mkiv" level="system" name="autodirvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2165,7 +2081,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="autodirvtop"> + <cd:command file="spac-ali.mkiv" level="system" name="autodirvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2173,7 +2089,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrighthbox"> + <cd:command file="spac-ali.mkiv" level="system" name="leftorrighthbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2181,7 +2097,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrightvbox"> + <cd:command file="spac-ali.mkiv" level="system" name="leftorrightvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2189,7 +2105,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ali.mkiv" name="leftorrightvtop"> + <cd:command file="spac-ali.mkiv" level="system" name="leftorrightvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -2227,9 +2143,113 @@ </cd:arguments> </cd:command> <cd:command file="supp-box.mkiv" name="lastlinewidth"/> + <cd:command file="supp-box.mkiv" level="system" name="putboxincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="getboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="doifelseboxincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </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:command file="supp-box.mkiv" level="system" name="copyboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="none"> + <cd:constant type="cd:csname"/> + <cd:constant type="cd:number"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="directboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="directcopyboxfromcache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="resetboxesincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="putnextboxincache"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:content/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-buffer.xml"> - <cd:command file="buff-ini.mkiv" name="doifelsebuffer"> + <cd:command file="buff-ini.mkiv" level="system" name="doifelsebuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2242,7 +2262,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="doifbufferelse"> + <cd:command file="buff-ini.mkiv" level="system" name="doifbufferelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -2255,21 +2275,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="resetbuffer"> + <cd:command 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" name="buffer" type="environment"> + <cd:command 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" name="grabbufferdata"> + <cd:command file="buff-ini.mkiv" level="system" name="grabbufferdata"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:category"/> @@ -2285,7 +2305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="grabbufferdatadirect"> + <cd:command file="buff-ini.mkiv" level="system" name="grabbufferdatadirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -2298,14 +2318,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="set" end="end" file="buff-ini.mkiv" name="buffer" type="environment"> + <cd:command begin="set" 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" name="setupbuffer"> + <cd:command file="buff-ini.mkiv" level="style" name="setupbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -2320,7 +2340,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="definebuffer"> + <cd:command file="buff-ini.mkiv" level="style" name="definebuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2333,7 +2353,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="getbuffer"> + <cd:command file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> @@ -2347,28 +2367,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ini.mkiv" name="inlinebuffer"> + <cd:command 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" name="buffer" type="environment" variant="example"> + <cd:command file="buff-ini.mkiv" generated="yes" level="document" name="buffer" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:instances> <cd:constant value="hiding"/> </cd:instances> </cd:command> - <cd:command file="buff-ini.mkiv" generated="yes" name="getbuffer" variant="example"> + <cd:command file="buff-ini.mkiv" generated="yes" level="document" name="getbuffer" variant="instance"> <cd:sequence> <cd:string value="get"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> </cd:command> - <cd:command file="buff-ini.mkiv" name="hiding" type="environment"/> <cd:command file="buff-ini.mkiv" name="processtexbuffer"> <cd:sequence> <cd:string value="processTEXbuffer"/> @@ -2426,7 +2445,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typebuffer"> + <cd:command file="buff-ver.mkiv" level="document" name="typebuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> @@ -2436,10 +2455,10 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typebuffer" variant="example"> + <cd:command file="buff-ver.mkiv" generated="yes" level="document" name="typebuffer" variant="instance"> <cd:sequence> <cd:string value="type"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -2459,7 +2478,7 @@ </cd:command> </cd:interface> <cd:interface file="i-button.xml"> - <cd:command file="scrn-but.mkvi" name="definebutton"> + <cd:command file="scrn-but.mkvi" level="style" name="definebutton"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2472,7 +2491,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="setupbutton"> + <cd:command file="scrn-but.mkvi" level="style" name="setupbutton"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -2633,7 +2652,7 @@ </cd:command> </cd:interface> <cd:interface file="i-capitals.xml"> - <cd:command file="typo-cap.mkiv" name="definecapitals"> + <cd:command file="typo-cap.mkiv" level="style" name="definecapitals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -2646,7 +2665,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="setupcapitals"> + <cd:command file="typo-cap.mkiv" level="style" name="setupcapitals"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -2686,49 +2705,49 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cap.mkiv" name="WORD"> + <cd:command 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" name="word"> + <cd:command 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" name="Word"> + <cd:command 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" name="Words"> + <cd:command 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="camel"> + <cd:command 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" name="WORDS"> + <cd:command 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="words"> + <cd:command file="typo-cap.mkiv" level="document" name="words"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -2864,33 +2883,33 @@ <cd:command file="typo-cap.mkiv" name="randomized" type="environment"/> </cd:interface> <cd:interface file="i-catcodes.xml"> - <cd:command file="catc-ctx.mkiv" name="texcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" name="contextcode" type="environment"/> - <cd:command file="catc-ctx.mkiv" name="contextdefinitioncode" type="environment"/> - <cd:command begin="un" end="" file="catc-def.mkiv" name="protect" type="environment"/> - <cd:command file="catc-ini.mkiv" name="newcatcodetable"> + <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:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="catcodetable" type="environment"> + <cd:command file="catc-ini.mkiv" level="system" name="catcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="extendedcatcodetable" type="environment"> + <cd:command file="catc-ini.mkiv" level="system" name="extendedcatcodetable" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="installactivecharacter"> + <cd:command 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" name="defineactivecharacter"> + <cd:command file="catc-act.mkiv" level="system" name="defineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -2900,7 +2919,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="installanddefineactivecharacter"> + <cd:command file="catc-act.mkiv" level="system" name="installanddefineactivecharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -2910,16 +2929,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-act.mkiv" name="makecharacteractive"> + <cd:command 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" name="permitcircumflexescape"/> - <cd:command file="catc-ini.mkiv" name="permitcaretescape"/> - <cd:command file="catc-ini.mkiv" name="letcatcodecommand"> + <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:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2929,7 +2948,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="defcatcodecommand"> + <cd:command file="catc-ini.mkiv" level="system" name="defcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2941,7 +2960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="uedcatcodecommand"> + <cd:command file="catc-ini.mkiv" level="system" name="uedcatcodecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -2953,21 +2972,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="catc-ini.mkiv" name="catcodetable" type="environment"/> - <cd:command file="catc-ini.mkiv" name="restorecatcodes"/> - <cd:command file="catc-ini.mkiv" name="setcatcodetable"> + <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:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="catc-ini.mkiv" name="tracecatcodetables"/> - <cd:command file="catc-ini.mkiv" name="catcodetablename"/> - <cd:command file="catc-sym.mkiv" name="rescan"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="catc-sym.mkiv" name="rescanwithsetup"> + <cd:command file="catc-sym.mkiv" level="system" name="rescanwithsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3066,7 +3085,7 @@ <cd:command file="enco-ini.mkiv" name="textplus"/> </cd:interface> <cd:interface file="i-characteralign.xml"> - <cd:command file="typo-tal.mkiv" name="singalcharacteralign"> + <cd:command file="typo-tal.mkiv" level="system" name="singalcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3076,7 +3095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="setcharacteralign"> + <cd:command file="typo-tal.mkiv" level="system" name="setcharacteralign"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -3088,9 +3107,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="resetcharacteralign"/> - <cd:command file="typo-tal.mkiv" name="alignmentcharacter"/> - <cd:command file="typo-tal.mkiv" name="characteralign" type="environment"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -3099,21 +3118,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-tal.mkiv" name="checkcharacteralign"> + <cd:command 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" name="definecharacterspacing"> + <cd:command 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" name="setupcharacterspacing"> + <cd:command file="typo-spa.mkiv" level="style" name="setupcharacterspacing"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3187,14 +3206,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="setupchemical"> + <cd:command file="chem-str.mkiv" level="style" name="setupchemical"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> <cd:parameter name="strut"> - <cd:inherit name="value-strut"/> + <cd:constant type="yes"/> + <cd:constant type="no"/> + <cd:constant type="auto"/> + <cd:constant type="cap"/> + <cd:constant type="fit"/> + <cd:constant type="line"/> + <cd:constant type="default"/> + <cd:constant type="cd:character"/> </cd:parameter> <cd:parameter name="width"> <cd:constant default="yes" type="fit"/> @@ -3283,7 +3309,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="setupchemicalframed"> + <cd:command file="chem-str.mkiv" level="style" name="setupchemicalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3369,7 +3395,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="chem-str.mkiv" name="definechemicals"> + <cd:command file="chem-str.mkiv" level="style" name="definechemicals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3384,9 +3410,9 @@ </cd:command> </cd:interface> <cd:interface file="i-cleaning.xml"> - <cd:command begin="push" end="pop" file="typo-chr.mkiv" name="punctuation" type="environment"/> - <cd:command file="typo-chr.mkiv" name="removepunctuation"/> - <cd:command file="typo-chr.mkiv" name="markcontent"> + <cd:command begin="push" end="pop" file="typo-chr.mkiv" level="system" name="punctuation" type="environment"/> + <cd:command file="typo-chr.mkiv" level="system" name="removepunctuation"/> + <cd:command file="typo-chr.mkiv" level="system" name="markcontent"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -3396,7 +3422,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" name="markedcontent" type="environment"> + <cd:command file="typo-chr.mkiv" level="system" name="markedcontent" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -3405,14 +3431,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-chr.mkiv" name="removemarkedcontent"> + <cd:command file="typo-chr.mkiv" level="system" name="removemarkedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-cln.mkiv" name="setcharactercleaning"> + <cd:command file="typo-cln.mkiv" level="system" name="setcharactercleaning"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -3422,7 +3448,7 @@ </cd:command> </cd:interface> <cd:interface file="i-clipping.xml"> - <cd:command file="grph-trf.mkiv" name="setupclipping"> + <cd:command file="grph-trf.mkiv" level="style" name="setupclipping"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -3483,7 +3509,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="clip"> + <cd:command file="grph-trf.mkiv" level="document" name="clip"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> @@ -3493,7 +3519,7 @@ </cd:command> </cd:interface> <cd:interface file="i-collector.xml"> - <cd:command file="pack-box.mkiv" name="definecollector"> + <cd:command file="pack-box.mkiv" level="style" name="definecollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3506,7 +3532,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setupcollector"> + <cd:command file="pack-box.mkiv" level="style" name="setupcollector"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -3560,7 +3586,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setcollector"> + <cd:command file="pack-box.mkiv" level="document" name="setcollector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3578,14 +3604,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="flushcollector"> + <cd:command 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" name="composedcollector"> + <cd:command file="pack-box.mkiv" level="document" name="composedcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -3602,7 +3628,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="collectedtext"> + <cd:command file="pack-box.mkiv" level="document" name="collectedtext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> @@ -3625,7 +3651,7 @@ </cd:command> </cd:interface> <cd:interface file="i-color.xml"> - <cd:command file="colo-ext.mkiv" name="negatecolorbox"> + <cd:command category="colors" file="colo-ext.mkiv" name="negatecolorbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -3633,7 +3659,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ext.mkiv" name="colorintent" type="environment"> + <cd:command category="colors" file="colo-ext.mkiv" name="colorintent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="knockout"/> @@ -3642,10 +3668,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ext.mkiv" name="overprint" type="environment"/> - <cd:command file="colo-ext.mkiv" name="knockout" type="environment"/> - <cd:command file="colo-ext.mkiv" name="textcolorintent" type="environment"/> - <cd:command file="colo-grp.mkiv" name="definecolorgroup"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3659,7 +3685,7 @@ <cd:triplet list="yes"/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definecolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="definecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3724,7 +3750,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definecolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" name="definecolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3734,7 +3760,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineglobalcolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="defineglobalcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3744,7 +3770,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineglobalcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" name="defineglobalcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3754,7 +3780,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definenamedcolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="definenamedcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3764,7 +3790,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definenamedcolor" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" name="definenamedcolor" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3774,7 +3800,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="defineprocesscolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="defineprocesscolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3787,7 +3813,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definespotcolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="definespotcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3828,7 +3854,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definemultitonecolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="definemultitonecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3846,7 +3872,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="1"> + <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="1"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3856,7 +3882,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="2"> + <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="2"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3888,7 +3914,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definetransparency" variant="3"> + <cd:command category="colors" file="colo-ini.mkiv" name="definetransparency" variant="3"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -3898,14 +3924,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="switchtocolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="switchtocolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="color"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="color"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3913,7 +3939,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="coloronly"> + <cd:command category="colors" file="colo-ini.mkiv" name="coloronly"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3921,7 +3947,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparent"> + <cd:command category="colors" file="colo-ini.mkiv" name="transparent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3929,7 +3955,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="graycolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="graycolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3937,7 +3963,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colored" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="colored" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> @@ -3945,7 +3971,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colored"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="colored"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -3953,71 +3979,71 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="color" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="color" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="coloronly" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" name="coloronly" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparent" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" name="transparent" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolor"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolored" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolored" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="directcolored"> + <cd:command category="colors" file="colo-ini.mkiv" level="document" name="directcolored"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="currentcolor" type="environment"/> - <cd:command file="colo-ini.mkiv" name="colorset" type="environment"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="usecolors"> + <cd:command category="colors" file="colo-ini.mkiv" name="usecolors"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setupcolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="setupcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setupcolors"> + <cd:command category="colors" file="colo-ini.mkiv" name="setupcolors"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -4065,15 +4091,15 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="colo-ini.mkiv" name="color" type="environment"> + <cd:command begin="push" category="colors" end="pop" file="colo-ini.mkiv" level="system" name="color" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="save" end="restore" file="colo-ini.mkiv" name="color" type="environment"/> - <cd:command file="colo-ini.mkiv" name="definepalet"> + <cd:command begin="save" category="colors" end="restore" file="colo-ini.mkiv" level="system" name="color" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" name="definepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4085,7 +4111,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="definepalet" variant="name"> + <cd:command category="colors" file="colo-ini.mkiv" name="definepalet" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4095,22 +4121,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="getpaletsize"> + <cd:command category="colors" file="colo-ini.mkiv" name="getpaletsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="paletsize"/> - <cd:command file="colo-ini.mkiv" name="setuppalet"> + <cd:command category="colors" file="colo-ini.mkiv" name="paletsize"/> + <cd:command category="colors" file="colo-ini.mkiv" name="setuppalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="setcolormodell"> + <cd:command category="colors" file="colo-ini.mkiv" name="setcolormodell"> <cd:arguments> <cd:keywords> <cd:constant type="black"/> @@ -4123,8 +4149,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="protectedcolors" type="environment"/> - <cd:command file="colo-ini.mkiv" name="defineintermediatecolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="protectedcolors" type="environment"/> + <cd:command category="colors" file="colo-ini.mkiv" name="defineintermediatecolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4143,7 +4169,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifelsecolor"> + <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifelsecolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4156,7 +4182,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifcolorelse"> + <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifcolorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4169,7 +4195,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="color-ini.mkiv" name="doifcolor"> + <cd:command category="colors" file="color-ini.mkiv" level="system" name="doifcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4179,28 +4205,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="textcolor" type="environment"> + <cd:command category="colors" file="colo-ini.mkiv" name="textcolor" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPcolor"> + <cd:command category="colors" file="colo-ini.mkiv" name="MPcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPcoloronly"> + <cd:command category="colors" file="colo-ini.mkiv" name="MPcoloronly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="MPtransparency"> + <cd:command category="colors" file="colo-ini.mkiv" name="MPtransparency"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4214,42 +4240,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colorvalue"> + <cd:command category="colors" file="colo-ini.mkiv" name="colorvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="grayvalue"> + <cd:command category="colors" file="colo-ini.mkiv" name="grayvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="colorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" name="colorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="transparencycomponents"> + <cd:command category="colors" file="colo-ini.mkiv" name="transparencycomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="processcolorcomponents"> + <cd:command category="colors" file="colo-ini.mkiv" name="processcolorcomponents"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifelseblack"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifelseblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4262,7 +4288,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifblackelse"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:color"/> @@ -4275,7 +4301,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifelsedrawingblack"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifelsedrawingblack"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4285,7 +4311,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-ini.mkiv" name="doifdrawingblackelse"> + <cd:command category="colors" file="colo-ini.mkiv" level="system" name="doifdrawingblackelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -4295,35 +4321,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorbar"> + <cd:command category="colors" file="colo-run.mkiv" name="showcolorbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolor"> + <cd:command category="colors" file="colo-run.mkiv" name="showcolor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorset"> + <cd:command category="colors" file="colo-run.mkiv" name="showcolorset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorcomponents"> + <cd:command category="colors" file="colo-run.mkiv" name="showcolorcomponents"> <cd:arguments> <cd:keywords> <cd:constant type="cd:color"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showpalet"> + <cd:command category="colors" file="colo-run.mkiv" name="showpalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4337,14 +4363,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="comparepalet"> + <cd:command category="colors" file="colo-run.mkiv" name="comparepalet"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="showcolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" name="showcolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4358,7 +4384,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="colo-run.mkiv" name="comparecolorgroup"> + <cd:command category="colors" file="colo-run.mkiv" name="comparecolorgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4367,7 +4393,7 @@ </cd:command> </cd:interface> <cd:interface file="i-columns.xml"> - <cd:command file="page-mul.mkiv" name="setupcolumns"> + <cd:command file="page-mul.mkiv" level="style" name="setupcolumns"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -4416,14 +4442,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mul.mkiv" name="columns" type="environment"> + <cd:command 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" name="setupcolumnspan"> + <cd:command file="page-mul.mkiv" level="style" name="setupcolumnspan"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -4467,7 +4493,7 @@ </cd:command> </cd:interface> <cd:interface file="i-combination.xml"> - <cd:command file="pack-com.mkiv" name="definecombination"> + <cd:command file="pack-com.mkiv" level="style" name="definecombination"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4480,7 +4506,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="setupcombination"> + <cd:command file="pack-com.mkiv" level="style" name="setupcombination"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -4540,7 +4566,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="combination" type="environment" variant="matrix"> + <cd:command file="pack-com.mkiv" level="document" name="combination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -4550,7 +4576,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="combination" type="environment"> + <cd:command file="pack-com.mkiv" level="document" name="combination" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -4560,7 +4586,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="floatcombination" type="environment" variant="matrix"> + <cd:command file="pack-com.mkiv" level="document" name="floatcombination" type="environment" variant="matrix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:matrix"/> @@ -4568,7 +4594,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="floatcombination" type="environment"> + <cd:command file="pack-com.mkiv" level="document" name="floatcombination" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> @@ -4577,7 +4603,7 @@ </cd:command> </cd:interface> <cd:interface file="i-commandhandler.xml"> - <cd:command file="mult-aux.mkiv" name="installparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4585,7 +4611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installrootparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installrootparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4593,7 +4619,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparameterhashhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparameterhashhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4601,7 +4627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparametersethandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4609,7 +4635,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installstyleandcolorhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4617,7 +4643,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinehandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinehandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4626,7 +4652,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4634,7 +4660,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installswitchsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installswitchsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4642,7 +4668,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installautosetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4650,7 +4676,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installbasicparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installbasicparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4658,7 +4684,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installbasicautosetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installbasicautosetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4667,7 +4693,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4676,7 +4702,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installswitchcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installswitchcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4685,7 +4711,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installautocommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4694,7 +4720,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsimplecommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsimplecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4703,7 +4729,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectparameterhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectparameterhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4711,7 +4737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectsetuphandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectsetuphandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4719,7 +4745,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectparametersethandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectparametersethandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4727,7 +4753,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectstyleandcolorhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectstyleandcolorhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4735,7 +4761,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdirectcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installdirectcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4743,7 +4769,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installsetuponlycommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installsetuponlycommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4751,7 +4777,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="relateparameterhandlers"> + <cd:command file="mult-aux.mkiv" level="system" name="relateparameterhandlers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -4767,28 +4793,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installactionhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="installactionhandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installnamespace"> + <cd:command file="mult-aux.mkiv" level="system" name="installnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installcorenamespace"> + <cd:command file="mult-aux.mkiv" level="system" name="installcorenamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="definenamespace"> + <cd:command file="mult-aux.mkiv" level="system" name="definenamespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4826,8 +4852,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="listnamespaces"/> - <cd:command file="mult-aux.mkiv" name="showparentchain"> + <cd:command file="mult-aux.mkiv" level="system" name="listnamespaces"/> + <cd:command file="mult-aux.mkiv" level="system" name="showparentchain"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4835,7 +4861,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifelsecommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifelsecommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4849,7 +4875,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifcommandhandlerelse"> + <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandlerelse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4863,7 +4889,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4874,7 +4900,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="doifnotcommandhandler"> + <cd:command file="mult-aux.mkiv" level="system" name="doifnotcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4885,7 +4911,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinitionset"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionset"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4893,7 +4919,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installdefinitionsetmember"> + <cd:command file="mult-aux.mkiv" level="system" name="installdefinitionsetmember"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4905,7 +4931,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="installparentinjector"> + <cd:command file="mult-aux.mkiv" level="system" name="installparentinjector"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4913,7 +4939,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installframedcommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4922,7 +4948,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installframedautocommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installframedautocommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4931,7 +4957,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="installsimpleframedcommandhandler"> + <cd:command file="pack-rul.mkiv" level="system" name="installsimpleframedcommandhandler"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -4942,7 +4968,7 @@ </cd:command> </cd:interface> <cd:interface file="i-comment.xml"> - <cd:command file="scrn-wid.mkvi" name="definecomment"> + <cd:command file="scrn-wid.mkvi" level="style" name="definecomment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -4955,7 +4981,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setupcomment"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupcomment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5030,12 +5056,18 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="space"> + <cd:constant type="yes"/> + </cd:parameter> + <cd:parameter name="buffer"> + <cd:constant type="cd:buffer"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="comment" variant="example"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="comment" variant="instance"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -5052,9 +5084,9 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" generated="yes" name="comment" type="environment" variant="example"> + <cd:command file="scrn-wid.mkvi" generated="yes" level="document" name="comment" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -5068,271 +5100,248 @@ <cd:constant value="comment"/> </cd:instances> </cd:command> - <cd:command file="scrn-wid.mkvi" name="placecomments"/> - <cd:command file="scrn-wid.mkvi" name="comment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="scrn-wid.mkvi" name="comment" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command file="scrn-wid.mkvi" level="document" name="placecomments"/> </cd:interface> <cd:interface file="i-conversion.xml"> - <cd:command file="core-con.mkiv" name="numbers"> + <cd:command category="counter" file="core-con.mkiv" name="numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Numbers"> + <cd:command category="counter" file="core-con.mkiv" name="Numbers"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="romannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Romannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="Romannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="abjadnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnodotnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="abjadnodotnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="abjadnaivenumerals"> + <cd:command category="counter" file="core-con.mkiv" name="abjadnaivenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="languagecharacters"> + <cd:command category="counter" file="core-con.mkiv" name="languagecharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="languageCharacters"> + <cd:command category="counter" file="core-con.mkiv" name="languageCharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="alphabeticnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Alphabeticnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="Alphabeticnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="thainumerals"> + <cd:command category="counter" file="core-con.mkiv" name="thainumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="devanagarinumerals"> + <cd:command category="counter" file="core-con.mkiv" name="devanagarinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="gurmurkhinumerals"> + <cd:command category="counter" file="core-con.mkiv" name="gurmurkhinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="gujaratinumerals"> + <cd:command category="counter" file="core-con.mkiv" name="gujaratinumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="tibetannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="tibetannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="greeknumerals"> + <cd:command category="counter" file="core-con.mkiv" name="greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Greeknumerals"> + <cd:command category="counter" file="core-con.mkiv" name="Greeknumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="arabicnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="persiannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="persiannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicdecimals"> + <cd:command category="counter" file="core-con.mkiv" name="arabicdecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="persiandecimals"> + <cd:command category="counter" file="core-con.mkiv" name="persiandecimals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="arabicexnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="arabicexnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="koreannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumeralsp"> + <cd:command category="counter" file="core-con.mkiv" name="koreannumeralsp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreannumeralsc"> + <cd:command category="counter" file="core-con.mkiv" name="koreannumeralsc"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreanparentnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="koreanparentnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="koreancirclenumerals"> + <cd:command category="counter" file="core-con.mkiv" name="koreancirclenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chinesenumerals"> + <cd:command category="counter" file="core-con.mkiv" name="chinesenumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chinesecapnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="chinesecapnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="chineseallnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="chineseallnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="character"> + <cd:command category="counter" file="core-con.mkiv" name="character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="Character"> + <cd:command category="counter" file="core-con.mkiv" name="Character"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="characters"> + <cd:command category="counter" file="core-con.mkiv" 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="Characters"> + <cd:command category="counter" file="core-con.mkiv" name="Characters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5474,7 +5483,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="currentdate"> + <cd:command file="core-con.mkiv" level="document" name="currentdate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="year"/> @@ -5517,7 +5526,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="date"> + <cd:command file="core-con.mkiv" level="document" name="date"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -5542,7 +5551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="currenttime"> + <cd:command file="core-con.mkiv" level="document" name="currenttime"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -5580,7 +5589,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="defineconversion"> + <cd:command category="counter" file="core-con.mkiv" name="defineconversion"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -5593,7 +5602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="defineconversion" variant="list"> + <cd:command category="counter" file="core-con.mkiv" name="defineconversion" variant="list"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -5606,7 +5615,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="convertnumber"> + <cd:command category="counter" file="core-con.mkiv" level="document" name="convertnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="empty"/> @@ -5683,7 +5692,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="uconvertnumber"> + <cd:command category="counter" file="core-con.mkiv" name="uconvertnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:inherit name="convertnumber"/> @@ -5693,7 +5702,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseconversiondefined"> + <cd:command category="counter" file="core-con.mkiv" level="system" name="doifelseconversiondefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5706,7 +5715,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifconversiondefinedelse"> + <cd:command category="counter" file="core-con.mkiv" level="system" name="doifconversiondefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5719,7 +5728,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifelseconversionnumber"> + <cd:command category="counter" file="core-con.mkiv" level="system" name="doifelseconversionnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5735,7 +5744,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="doifconversionnumberelse"> + <cd:command category="counter" file="core-con.mkiv" level="system" name="doifconversionnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5751,7 +5760,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="wordtonumber"> + <cd:command category="counter" file="core-con.mkiv" name="wordtonumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -5786,70 +5795,70 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="verbosenumber"> + <cd:command category="counter" file="core-con.mkiv" name="verbosenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="VerboseNumber"> + <cd:command category="counter" file="core-con.mkiv" name="VerboseNumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="smallcappedromannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="smallcappedromannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="smallcappedcharacters"> + <cd:command category="counter" file="core-con.mkiv" name="smallcappedcharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="sloveniannumerals"> + <cd:command category="counter" file="core-con.mkiv" name="sloveniannumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="slovenianNumerals"> + <cd:command category="counter" file="core-con.mkiv" name="slovenianNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="spanishnumerals"> + <cd:command category="counter" file="core-con.mkiv" name="spanishnumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="spanishNumerals"> + <cd:command category="counter" file="core-con.mkiv" name="spanishNumerals"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="unihex"> + <cd:command category="counter" file="core-con.mkiv" name="unihex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-con.mkiv" name="continuednumber"> + <cd:command category="counter" file="core-con.mkiv" name="continuednumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -5858,7 +5867,7 @@ </cd:command> </cd:interface> <cd:interface file="i-counter.xml"> - <cd:command file="strc-num.mkiv" name="definecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="definecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -5871,7 +5880,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setupcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setupcounter"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -5976,7 +5985,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifelsecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifelsecounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -5989,7 +5998,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifcounterelse"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6002,7 +6011,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6012,7 +6021,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifnotcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifnotcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6022,7 +6031,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6035,7 +6044,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="setcounterown"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="setcounterown"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6048,7 +6057,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="restartcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="restartcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6061,7 +6070,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="resetcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="resetcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6071,7 +6080,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="incrementcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="incrementcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6081,7 +6090,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="decrementcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="decrementcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6091,7 +6100,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6101,7 +6110,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6111,7 +6120,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6121,7 +6130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6131,7 +6140,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6141,7 +6150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="countersubs"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="countersubs"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6151,77 +6160,77 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="savecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="savecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="restorecounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="restorecounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="showcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="showcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="incrementedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="incrementedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="decrementedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="decrementedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="rawsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="rawsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6231,7 +6240,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="lastsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="lastsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6241,7 +6250,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="firstsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="firstsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6251,7 +6260,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="nextsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="nextsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6261,7 +6270,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="prevsubcountervalue"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="prevsubcountervalue"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6271,7 +6280,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="convertedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="convertedcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6281,7 +6290,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="convertedsubcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="convertedsubcounter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6297,7 +6306,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="directconvertedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="directconvertedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6311,7 +6320,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifelsedefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifelsedefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6324,7 +6333,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifdefinedcounterelse"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifdefinedcounterelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6337,7 +6346,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifdefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifdefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6347,7 +6356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-num.mkiv" name="doifundefinedcounter"> + <cd:command category="counter" file="strc-num.mkiv" level="system" name="doifundefinedcounter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6357,7 +6366,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineresetset"> + <cd:command category="counter" file="strc-ini.mkvi" name="defineresetset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6371,7 +6380,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineseparatorset"> + <cd:command category="counter" file="strc-ini.mkvi" name="defineseparatorset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6387,7 +6396,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineconversionset"> + <cd:command category="counter" file="strc-ini.mkvi" name="defineconversionset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6403,7 +6412,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ini.mkvi" name="defineprefixset"> + <cd:command category="counter" file="strc-ini.mkvi" name="defineprefixset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6419,7 +6428,7 @@ </cd:command> </cd:interface> <cd:interface file="i-dataset.xml"> - <cd:command file="core-dat.mkiv" name="definedataset"> + <cd:command file="core-dat.mkiv" level="system" name="definedataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6432,7 +6441,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setupdataset"> + <cd:command file="core-dat.mkiv" level="system" name="setupdataset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6445,7 +6454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setdataset"> + <cd:command file="core-dat.mkiv" level="system" name="setdataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6460,7 +6469,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="datasetvariable"> + <cd:command file="core-dat.mkiv" level="system" name="datasetvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -6477,7 +6486,7 @@ </cd:command> </cd:interface> <cd:interface file="i-define.xml"> - <cd:command file="core-sys.mkiv" name="define"> + <cd:command file="core-sys.mkiv" level="system" name="define"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -6486,7 +6495,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="defineexpandable"> + <cd:command file="core-sys.mkiv" level="system" name="defineexpandable"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -6497,7 +6506,7 @@ </cd:command> </cd:interface> <cd:interface file="i-delimitedtext.xml"> - <cd:command file="typo-del.mkiv" name="definedelimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="definedelimitedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6510,7 +6519,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setupdelimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupdelimitedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6597,9 +6606,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" generated="yes" name="delimitedtext" variant="example"> + <cd:command category="language" file="typo-del.mkiv" generated="yes" level="document" name="delimitedtext" variant="instance"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -6615,9 +6624,9 @@ <cd:constant value="aside"/> </cd:instances> </cd:command> - <cd:command file="typo-del.mkiv" generated="yes" name="delimitedtext" type="environment" variant="example"> + <cd:command category="language" file="typo-del.mkiv" generated="yes" level="document" name="delimitedtext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -6635,7 +6644,7 @@ <cd:constant value="aside"/> </cd:instances> </cd:command> - <cd:command file="typo-del.mkiv" name="delimitedtext"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimitedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6646,7 +6655,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimitedtext" type="environment"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimitedtext" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6659,7 +6668,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimited"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimited"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6670,7 +6679,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="delimited" type="environment"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="delimited" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6683,113 +6692,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="quotation"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quotation" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quote"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="quote" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="blockquote"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="blockquote" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="speech"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="aside" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="aside"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:language"/> - </cd:keywords> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="speech" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="typo-del.mkiv" name="setupquotation"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupquotation"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setupquote"> + <cd:command category="language" file="typo-del.mkiv" level="style" name="setupquote"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="subsentence"> + <cd:command category="language" file="typo-del.mkiv" level="document" name="subsentence"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="subsentence" type="environment"/> + <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" name="definedescription"> + <cd:command file="strc-des.mkvi" level="style" name="definedescription"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -6802,7 +6727,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" name="setupdescription"> + <cd:command file="strc-des.mkvi" level="style" name="setupdescription"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -6893,6 +6818,11 @@ <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="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -6919,7 +6849,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" type="environment" variant="example"> + <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6940,7 +6870,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" type="environment" variant="example:title"> + <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6953,7 +6883,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-des.mkvi" generated="yes" name="description" variant="example"> + <cd:command file="strc-des.mkvi" generated="yes" level="document" name="description" variant="example"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -6991,7 +6921,7 @@ <cd:command file="typo-dig.mkiv" name="dummydigit"/> </cd:interface> <cd:interface file="i-dimension.xml"> - <cd:command file="mult-dim.mkvi" name="assigndimension"> + <cd:command file="mult-dim.mkvi" level="system" name="assigndimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant method="none" prefix="cd:sign" type="small"/> @@ -7012,7 +6942,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignalfadimension"> + <cd:command file="mult-dim.mkvi" level="system" name="assignalfadimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -7033,7 +6963,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignwidth"> + <cd:command file="mult-dim.mkvi" level="system" name="assignwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="fit"/> @@ -7049,7 +6979,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-dim.mkvi" name="assignvalue"> + <cd:command file="mult-dim.mkvi" level="system" name="assignvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -7071,7 +7001,7 @@ </cd:command> </cd:interface> <cd:interface file="i-direction.xml"> - <cd:command file="typo-dir.mkiv" name="setupdirections"> + <cd:command file="typo-dir.mkiv" level="style" name="setupdirections"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -7101,7 +7031,7 @@ </cd:command> <cd:command file="typo-dir.mkiv" name="resetdirection"/> <cd:command file="supp-dir.mkiv" name="showdirsinmargin"/> - <cd:command file="supp-dir.mkiv" name="istltdir"> + <cd:command file="supp-dir.mkiv" level="system" name="istltdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7109,7 +7039,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-dir.mkiv" name="istrtdir"> + <cd:command file="supp-dir.mkiv" level="system" name="istrtdir"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -7119,10 +7049,10 @@ </cd:command> </cd:interface> <cd:interface file="i-document.xml"> - <cd:command file="file-job.mkvi" name="text" type="environment"/> + <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" name="notext" type="environment"/> - <cd:command file="file-job.mkvi" name="environment" 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:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7130,7 +7060,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="environment" type="environment" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="environment" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7138,14 +7068,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="environment"> + <cd:command 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" name="environment" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7159,8 +7089,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentenvironment"/> - <cd:command file="file-job.mkvi" name="project" type="environment"> + <cd:command file="file-job.mkvi" level="system" name="currentenvironment"/> + <cd:command file="file-job.mkvi" level="document" name="project" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7168,7 +7098,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="project" type="environment" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="project" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7176,14 +7106,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="project"> + <cd:command 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" name="project" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="project" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7197,8 +7127,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentproject"/> - <cd:command file="file-job.mkvi" name="product" type="environment"> + <cd:command file="file-job.mkvi" level="system" name="currentproject"/> + <cd:command file="file-job.mkvi" level="document" name="product" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7206,7 +7136,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="product" type="environment" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="product" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7214,14 +7144,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="product"> + <cd:command 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" name="product" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="product" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7235,8 +7165,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentproduct"/> - <cd:command file="file-job.mkvi" name="component" type="environment"> + <cd:command file="file-job.mkvi" level="system" name="currentproduct"/> + <cd:command file="file-job.mkvi" level="document" name="component" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -7244,7 +7174,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="component" type="environment" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="component" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7252,14 +7182,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="component"> + <cd:command 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" name="component" variant="string"> + <cd:command file="file-job.mkvi" level="document" name="component" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -7273,15 +7203,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="currentcomponent"/> - <cd:command file="file-job.mkvi" name="document" type="environment"> + <cd:command file="file-job.mkvi" level="system" name="currentcomponent"/> + <cd:command 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" name="setupdocument"> + <cd:command file="file-job.mkvi" level="style" name="setupdocument"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -7324,7 +7254,7 @@ </cd:command> </cd:interface> <cd:interface file="i-dummy.xml"> - <cd:command file="mult-aux.mkiv" name="getdummyparameters"> + <cd:command file="mult-aux.mkiv" level="system" name="getdummyparameters"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -7333,21 +7263,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="dummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="dummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="directdummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="directdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="setdummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="setdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7357,7 +7287,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="letdummyparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="letdummyparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7365,7 +7295,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="usedummystyleandcolor"> + <cd:command file="mult-aux.mkiv" level="system" name="usedummystyleandcolor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7375,14 +7305,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-aux.mkiv" name="usedummystyleparameter"> + <cd:command 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" name="usedummycolorparameter"> + <cd:command file="mult-aux.mkiv" level="system" name="usedummycolorparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -7391,7 +7321,7 @@ </cd:command> </cd:interface> <cd:interface file="i-effect.xml"> - <cd:command file="attr-eff.mkiv" name="defineeffect"> + <cd:command file="attr-eff.mkiv" level="style" name="defineeffect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7404,7 +7334,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" name="setupeffect"> + <cd:command file="attr-eff.mkiv" level="style" name="setupeffect"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7431,19 +7361,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-eff.mkiv" name="effect" type="environment"> + <cd:command 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" name="effect" type="environment" variant="example"> + <cd:command 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" name="effect"> + <cd:command file="attr-eff.mkiv" level="document" name="effect"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7453,7 +7383,7 @@ </cd:command> </cd:interface> <cd:interface file="i-enumeration.xml"> - <cd:command file="strc-enu.mkvi" name="defineenumeration"> + <cd:command file="strc-enu.mkvi" level="style" name="defineenumeration"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7466,7 +7396,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" name="setupenumeration"> + <cd:command file="strc-enu.mkvi" level="style" name="setupenumeration"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7604,6 +7534,11 @@ <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="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -7631,7 +7566,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" type="environment" variant="example"> + <cd:command file="strc-enu.mkvi" level="style" name="setupenumerations"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupenumeration"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7652,7 +7597,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" type="environment" variant="example:title"> + <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" type="environment" variant="example:title"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7665,7 +7610,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-enu.mkvi" generated="yes" name="enumeration" variant="example"> + <cd:command file="strc-enu.mkvi" generated="yes" level="document" name="enumeration" variant="example"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -7684,7 +7629,7 @@ </cd:command> </cd:interface> <cd:interface file="i-export.xml"> - <cd:command file="back-exp.mkiv" name="setelementexporttag"> + <cd:command file="back-exp.mkiv" level="system" name="setelementexporttag"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7701,7 +7646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-exp.mkiv" name="setupexport"> + <cd:command file="back-exp.mkiv" level="style" name="setupexport"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> @@ -7751,14 +7696,14 @@ </cd:command> </cd:interface> <cd:interface file="i-field.xml"> - <cd:command file="scrn-fld.mkvi" name="presetfieldsymbols"> + <cd:command 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" name="definefieldcategory"> + <cd:command file="scrn-fld.mkvi" level="style" name="definefieldcategory"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7771,7 +7716,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldcategory"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldcategory"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -7886,7 +7831,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doifelsefieldcategory"> + <cd:command file="scrn-fld.mkvi" level="system" name="doifelsefieldcategory"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7899,7 +7844,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="doiffieldcategoryelse"> + <cd:command file="scrn-fld.mkvi" level="system" name="doiffieldcategoryelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -7912,7 +7857,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldbody"> + <cd:command file="scrn-fld.mkvi" level="style" name="definefieldbody"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -7925,7 +7870,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldbody"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldbody"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8066,7 +8011,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldlabelframed"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldlabelframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8076,7 +8021,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldcontentframed"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldcontentframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8087,7 +8032,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfieldtotalframed"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfieldtotalframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8116,7 +8061,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfield"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfield"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8139,7 +8084,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setupfields"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupfields"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -8169,7 +8114,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="definefieldstack"> + <cd:command file="scrn-fld.mkvi" level="style" name="definefieldstack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8197,7 +8142,7 @@ </cd:command> </cd:interface> <cd:interface file="i-figure.xml"> - <cd:command file="grph-fig.mkiv" name="figure" type="environment"> + <cd:command category="graphics" file="grph-fig.mkiv" name="figure" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8263,7 +8208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffile"> + <cd:command file="file-ini.mkvi" level="system" name="doiffile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8273,7 +8218,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifnotfile"> + <cd:command file="file-ini.mkvi" level="system" name="doifnotfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8283,7 +8228,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsefile"> + <cd:command file="file-ini.mkvi" level="system" name="doifelsefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8296,7 +8241,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffileelse"> + <cd:command file="file-ini.mkvi" level="system" name="doiffileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8316,17 +8261,17 @@ <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" name="readingfile" type="environment"/> - <cd:command begin="push" end="pop" file="file-ini.mkvi" name="endofline" type="environment"/> - <cd:command file="file-ini.mkvi" name="restoreendofline"/> - <cd:command file="file-ini.mkvi" name="inputgivenfile"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsepath"> + <cd:command file="file-ini.mkvi" level="system" name="doifelsepath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8339,7 +8284,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifpathelse"> + <cd:command file="file-ini.mkvi" level="system" name="doifpathelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8352,7 +8297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsefileexists"> + <cd:command file="file-ini.mkvi" level="system" name="doifelsefileexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8365,7 +8310,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doiffileexistselse"> + <cd:command file="file-ini.mkvi" level="system" name="doiffileexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8378,7 +8323,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelsepathexists"> + <cd:command file="file-ini.mkvi" level="system" name="doifelsepathexists"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8391,7 +8336,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifpathexistselse"> + <cd:command file="file-ini.mkvi" level="system" name="doifpathexistselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8404,7 +8349,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifelseparentfile"> + <cd:command file="file-ini.mkvi" level="system" name="doifelseparentfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8417,7 +8362,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="doifparentfileelse"> + <cd:command file="file-ini.mkvi" level="system" name="doifparentfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8430,21 +8375,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="splitfilename"> + <cd:command 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" name="splitofffull"/> - <cd:command file="file-ini.mkvi" name="splitoffpath"/> - <cd:command file="file-ini.mkvi" name="splitoffbase"/> - <cd:command file="file-ini.mkvi" name="splitoffname"/> - <cd:command file="file-ini.mkvi" name="splitofftype"/> - <cd:command file="file-ini.mkvi" name="splitoffkind"/> - <cd:command file="file-ini.mkvi" name="splitoffroot"/> - <cd:command file="file-job.mkvi" name="doifelseinputfile"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8457,7 +8402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="doifinputfileelse"> + <cd:command file="file-job.mkvi" level="system" name="doifinputfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8470,21 +8415,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-ini.mkvi" name="processfile"> + <cd:command 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" name="usepath"> + <cd:command 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" name="usesubpath"> + <cd:command file="file-job.mkvi" level="style" name="usesubpath"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:path"/> @@ -8507,8 +8452,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="locatedfilepath"/> - <cd:command file="file-job.mkvi" name="usezipfile"> + <cd:command file="file-job.mkvi" level="system" name="locatedfilepath"/> + <cd:command file="file-job.mkvi" level="style" name="usezipfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -8518,21 +8463,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="processfilemany"> + <cd:command 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" name="processfileonce"> + <cd:command 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" name="processfilenone"> + <cd:command file="file-job.mkvi" level="system" name="processfilenone"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8560,49 +8505,49 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-job.mkvi" name="loadanyfile"> + <cd:command 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" name="loadtexfileonce"> + <cd:command 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" name="loadluafileonce"> + <cd:command 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" name="loadcldfileonce"> + <cd:command 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" name="loadanyfileonce"> + <cd:command 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" name="continueifinputfile"> + <cd:command 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" name="readjobfile"> + <cd:command file="file-res.mkvi" level="system" name="readjobfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8615,7 +8560,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readlocfile"> + <cd:command file="file-res.mkvi" level="system" name="readlocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8628,7 +8573,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readsysfile"> + <cd:command file="file-res.mkvi" level="system" name="readsysfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8641,7 +8586,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readfixfile"> + <cd:command file="file-res.mkvi" level="system" name="readfixfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8657,7 +8602,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readsetfile"> + <cd:command file="file-res.mkvi" level="system" name="readsetfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:path"/> @@ -8673,7 +8618,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readfile"> + <cd:command file="file-res.mkvi" level="system" name="readfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8686,14 +8631,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="ReadFile"> + <cd:command 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" name="readtexfile"> + <cd:command file="file-res.mkvi" level="system" name="readtexfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8706,7 +8651,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="readxmlfile"> + <cd:command file="file-res.mkvi" level="system" name="readxmlfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8719,7 +8664,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="doifelselocfile"> + <cd:command file="file-res.mkvi" level="system" name="doifelselocfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8732,7 +8677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="doiflocfileelse"> + <cd:command file="file-res.mkvi" level="system" name="doiflocfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8745,14 +8690,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-res.mkvi" name="locfilename"> + <cd:command 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" name="definefilesynonym"> + <cd:command file="file-sys.mkvi" level="system" name="definefilesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8762,7 +8707,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" name="definefilefallback"> + <cd:command file="file-sys.mkvi" level="system" name="definefilefallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8772,7 +8717,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-sys.mkvi" name="truefilename"> + <cd:command file="file-sys.mkvi" level="system" name="truefilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -8781,7 +8726,7 @@ </cd:command> </cd:interface> <cd:interface file="i-filler.xml"> - <cd:command file="spac-flr.mkiv" name="definefiller"> + <cd:command file="spac-flr.mkiv" level="style" name="definefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8794,7 +8739,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-flr.mkiv" name="setupfiller"> + <cd:command file="spac-flr.mkiv" level="style" name="setupfiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8886,7 +8831,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="definelinefiller"> + <cd:command file="node-rul.mkiv" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -8899,7 +8844,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefiller"> + <cd:command file="node-rul.mkiv" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8955,7 +8900,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefillers"> + <cd:command file="node-rul.mkiv" level="style" name="setuplinefillers"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -8986,7 +8931,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinline.xml"> - <cd:command file="pack-mrl.mkiv" name="setupfillinlines"> + <cd:command file="pack-mrl.mkiv" level="style" name="setupfillinlines"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9013,7 +8958,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillinline"> + <cd:command file="pack-mrl.mkiv" level="document" name="fillinline"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> @@ -9022,7 +8967,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fillinrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupfillinrules"> + <cd:command file="pack-mrl.mkiv" level="style" name="setupfillinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9061,7 +9006,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillinrules"> + <cd:command file="pack-mrl.mkiv" level="document" name="fillinrules"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9074,7 +9019,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="fillintext"> + <cd:command file="pack-mrl.mkiv" level="document" name="fillintext"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> @@ -9089,7 +9034,7 @@ </cd:command> </cd:interface> <cd:interface file="i-firstline.xml"> - <cd:command file="typo-fln.mkiv" name="definefirstline"> + <cd:command file="typo-fln.mkiv" level="style" name="definefirstline"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9102,7 +9047,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="setupfirstline"> + <cd:command file="typo-fln.mkiv" level="style" name="setupfirstline"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9133,7 +9078,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-fln.mkiv" name="applytofirstcharacter"> + <cd:command file="typo-fln.mkiv" level="system" name="applytofirstcharacter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -9143,7 +9088,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fittingpage.xml"> - <cd:command file="page-app.mkiv" name="definefittingpage"> + <cd:command file="page-app.mkiv" level="style" name="definefittingpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9156,7 +9101,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="setupfittingpage"> + <cd:command file="page-app.mkiv" level="style" name="setupfittingpage"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9184,7 +9129,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="fittingpage" type="environment"> + <cd:command file="page-app.mkiv" level="document" name="fittingpage" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -9194,9 +9139,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" generated="yes" name="fittingpage" type="environment" variant="example"> + <cd:command file="page-app.mkiv" generated="yes" level="document" name="fittingpage" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="fittingpage"/> + <cd:instance value="fittingpage"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -9208,28 +9153,14 @@ <cd:constant value="MPpage"/> </cd:instances> </cd:command> - <cd:command file="page-app.mkiv" name="TEXpage" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="page-app.mkiv" name="setupTEXpage"> + <cd:command 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" name="MPpage" type="environment"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="meta-fig.mkiv" name="setupMPpage"> + <cd:command file="meta-fig.mkiv" level="style" name="setupMPpage"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> @@ -9238,12 +9169,13 @@ </cd:command> </cd:interface> <cd:interface file="i-floats.xml"> - <cd:command file="strc-flt.mkvi" name="definefloat"> + <cd:command 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"> @@ -9258,7 +9190,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="definefloat" variant="name"> + <cd:command file="strc-flt.mkvi" level="style" name="definefloat" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -9278,7 +9210,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupfloat"> + <cd:command file="strc-flt.mkvi" level="style" name="setupfloat"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -9385,6 +9317,26 @@ <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"/> @@ -9438,7 +9390,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupfloatcaption"> + <cd:command 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 file="strc-flt.mkvi" level="style" name="setupfloatcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9552,7 +9514,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setupcaption"> + <cd:command file="strc-flt.mkvi" level="style" name="setupcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -9562,7 +9524,17 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="placefloat" variant="instance"> + <cd:command 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 file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -9620,10 +9592,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <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"/> @@ -9641,7 +9613,7 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" name="placefloat"> + <cd:command file="strc-flt.mkvi" level="document" name="placefloat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -9698,10 +9670,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <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"/> @@ -9712,7 +9684,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="placefloat" type="environment" variant="instance"> + <cd:command file="strc-flt.mkvi" generated="yes" level="document" name="placefloat" type="environment" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -9783,10 +9755,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <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"/> @@ -9806,9 +9778,95 @@ <cd:constant value="graphic"/> </cd:instances> </cd:command> - <cd:command file="strc-flt.mkvi" generated="yes" name="floattext" type="environment" variant="example"> + <cd:command 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 file="strc-flt.mkvi" generated="yes" level="document" name="floattext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="float"/> + <cd:instance value="float"/> <cd:string value="text"/> </cd:sequence> <cd:arguments> @@ -9864,10 +9922,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <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"/> @@ -9876,37 +9934,58 @@ <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 file="strc-flt.mkvi" generated="yes" name="placelistoffloats" variant="example"> + <cd:command file="strc-flt.mkvi" generated="yes" level="document" name="placelistoffloats" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> - <cd:variable value="floats"/> + <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 file="strc-flt.mkvi" generated="yes" name="completelistoffloats" variant="example"> + <cd:command file="strc-flt.mkvi" generated="yes" level="document" name="completelistoffloats" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> - <cd:variable value="floats"/> + <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 file="strc-flt.mkvi" name="floatuserdataparameter"> + <cd:command 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 file="strc-flt.mkvi" name="doifelserightpagefloat"> + <cd:command file="strc-flt.mkvi" level="system" name="doifelserightpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9916,7 +9995,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifrightpagefloatelse"> + <cd:command file="strc-flt.mkvi" level="system" name="doifrightpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9926,7 +10005,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifelseoddpagefloat"> + <cd:command file="strc-flt.mkvi" level="system" name="doifelseoddpagefloat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9936,7 +10015,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifoddpagefloatelse"> + <cd:command file="strc-flt.mkvi" level="system" name="doifoddpagefloatelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9946,7 +10025,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifelsemainfloatbody"> + <cd:command file="strc-flt.mkvi" level="system" name="doifelsemainfloatbody"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9956,7 +10035,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="doifmainfloatbodyelse"> + <cd:command file="strc-flt.mkvi" level="system" name="doifmainfloatbodyelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -9966,7 +10045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-flt.mkvi" name="setuplocalfloats"> + <cd:command file="strc-flt.mkvi" level="style" name="setuplocalfloats"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -9994,7 +10073,7 @@ </cd:arguments> </cd:command> <cd:command file="strc-flt.mkvi" name="forcelocalfloats"/> - <cd:command file="tabl-tsp.mkiv" name="setupfloatsplitting"> + <cd:command file="tabl-tsp.mkiv" level="style" name="setupfloatsplitting"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -10016,7 +10095,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tsp.mkiv" name="splitfloat"> + <cd:command file="tabl-tsp.mkiv" level="system" name="splitfloat"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloatsplitting"/> @@ -10027,14 +10106,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="tabl-tsp.mkiv" name="doifnotinsidesplitfloat"> + <cd:command 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 file="page-flt.mkiv" name="placenamedfloat"> + <cd:command file="page-flt.mkiv" level="document" name="placenamedfloat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10101,10 +10180,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <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"/> @@ -10117,7 +10196,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fontfamily.xml"> - <cd:command file="font-sel.mkvi" name="definefontfamily"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10184,7 +10263,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamily" variant="preset"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily" variant="preset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10218,7 +10297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefallbackfamily"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefallbackfamily"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10301,7 +10380,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefallbackfamily" variant="preset"> + <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefallbackfamily" variant="preset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10335,7 +10414,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamilypreset"> + <cd:command category="fonts" file="font-sel.mkvi" name="definefontfamilypreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10345,7 +10424,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sel.mkvi" name="definefontfamilypreset" variant="name"> + <cd:command category="fonts" file="font-sel.mkvi" name="definefontfamilypreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10357,7 +10436,7 @@ </cd:command> </cd:interface> <cd:interface file="i-fonts.xml"> - <cd:command file="font-col.mkvi" name="definefontfallback"> + <cd:command category="fonts" file="font-col.mkvi" level="style" name="definefontfallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10386,10 +10465,13 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="features"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-col.mkvi" name="resetfontfallback"> + <cd:command category="fonts" file="font-col.mkvi" name="resetfontfallback"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10399,15 +10481,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-emp.mkvi" name="emphasistypeface"/> - <cd:command file="font-emp.mkvi" name="emphasisboldface"/> - <cd:command file="font-emp.mkvi" name="normalboldface"/> - <cd:command file="font-emp.mkvi" name="normaltypeface"/> - <cd:command file="font-emp.mkvi" name="swaptypeface"/> - <cd:command file="font-emp.mkvi" name="typeface"/> - <cd:command file="font-emp.mkvi" name="boldface"/> - <cd:command file="font-emp.mkvi" name="swapface"/> - <cd:command file="font-fea.mkvi" name="definefontfeature"> + <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="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="swapface"/> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="definefontfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10583,10 +10665,14 @@ <cd:parameter name="mathnolimitsmode"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="blockligatures"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="adaptfontfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="adaptfontfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10596,7 +10682,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="fontfeaturelist"> + <cd:command category="fonts" file="font-fea.mkvi" name="fontfeaturelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10606,72 +10692,72 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="addfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="addfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="addfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" name="addfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="subtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="subtractfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="subtractfeature" variant="direct"> + <cd:command category="fonts" 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 file="font-fea.mkvi" name="replacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="replacefeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="replacefeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" name="replacefeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetandaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="resetandaddfeature"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetandaddfeature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" name="resetandaddfeature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="resetfeature"/> - <cd:command file="font-fea.mkvi" name="revivefeature"/> - <cd:command file="font-fea.mkvi" name="setfontfeature"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="feature"> + <cd:command category="fonts" file="font-fea.mkvi" name="feature"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -10693,7 +10779,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="feature" variant="direct"> + <cd:command category="fonts" file="font-fea.mkvi" name="feature" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -10715,7 +10801,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doifelsecurrentfonthasfeature"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doifelsecurrentfonthasfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10728,7 +10814,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doifcurrentfonthasfeatureelse"> + <cd:command category="fonts" file="font-fea.mkvi" level="system" name="doifcurrentfonthasfeatureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10741,35 +10827,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doaddfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="doaddfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="dosubtractfeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="dosubtractfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doreplacefeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="doreplacefeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkvi" name="doresetandafffeature"> + <cd:command category="fonts" file="font-fea.mkvi" name="doresetandafffeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="fontclass" type="environment"> + <cd:command category="fonts" file="font-fil.mkvi" name="fontclass" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -10777,7 +10863,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="classfont"> + <cd:command category="fonts" file="font-fil.mkvi" name="classfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10787,7 +10873,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definefontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definefontsynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10812,7 +10898,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definefontfile"> + <cd:command category="fonts" file="font-fil.mkvi" name="definefontfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10837,14 +10923,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="truefontname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="truefontname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="expandfontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="expandfontsynonym"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -10852,7 +10938,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="doifelsefontsynonym"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="doifelsefontsynonym"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10865,7 +10951,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="doiffontsynonymelse"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="doiffontsynonymelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10878,14 +10964,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="tracedfontname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="tracedfontname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="fontclassname"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="fontclassname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -10895,37 +10981,37 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="loadfontgoodies"> + <cd:command category="fonts" file="font-gds.mkvi" name="loadfontgoodies"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="setfontcolorsheme"> + <cd:command category="fonts" file="font-gds.mkvi" name="setfontcolorsheme"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-gds.mkvi" name="resetfontcolorsheme"/> - <cd:command file="font-ini.mkvi" name="definedfont"> + <cd:command category="fonts" file="font-gds.mkvi" name="resetfontcolorsheme"/> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="definedfont"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="font" type="environment"> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="font" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="bodyfontsize"/> - <cd:command file="font-ini.mkvi" name="normalizebodyfontsize"> + <cd:command category="fonts" file="font-ini.mkvi" name="bodyfontsize"/> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="normalizebodyfontsize"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -10933,14 +11019,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="thenormalizedbodyfontsize"> + <cd:command category="fonts" file="font-ini.mkvi" level="system" name="thenormalizedbodyfontsize"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="mapfontsize"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="mapfontsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:dimension"/> @@ -10950,7 +11036,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontstyle"> + <cd:command category="fonts" file="font-ini.mkvi" name="definefontstyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -10960,21 +11046,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontsize"> + <cd:command category="fonts" file="font-ini.mkvi" name="definefontsize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefontalternative"> + <cd:command category="fonts" file="font-ini.mkvi" name="definefontalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definefont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -10987,7 +11073,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefont" variant="argument"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="definefont" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11000,7 +11086,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definefrozenfont"> + <cd:command category="fonts" file="font-ini.mkvi" name="definefrozenfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11010,7 +11096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definebodyfontenvironment"> + <cd:command category="fonts" file="font-ini.mkvi" name="definebodyfontenvironment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -11079,29 +11165,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="processbodyfontenvironmentlist"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="processbodyfontenvironmentlist"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="bodyfontenvironmentlist"/> - <cd:command file="font-fil.mkvi" name="registerfontclass"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="bodyfontenvironmentlist"/> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="registerfontclass"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="setcurrentfontclass"> + <cd:command category="fonts" file="font-fil.mkvi" level="system" name="setcurrentfontclass"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="tx"/> - <cd:command file="font-ini.mkvi" name="txx"/> - <cd:command file="font-fil.mkvi" name="definebodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="tx"/> + <cd:command category="fonts" file="font-ini.mkvi" level="document" name="txx"/> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definebodyfont"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11161,7 +11247,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fil.mkvi" name="definebodyfont" variant="argument"> + <cd:command category="fonts" file="font-fil.mkvi" level="style" name="definebodyfont" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11183,7 +11269,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="setupfonts"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="setupfonts"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> @@ -11193,7 +11279,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="setupbodyfont"> + <cd:command category="fonts" file="font-ini.mkiv" level="style" name="setupbodyfont"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:dimension"/> @@ -11225,14 +11311,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="switchtobodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" level="style" name="switchtobodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="fastswitchtobodyfont"> + <cd:command category="fonts" file="font-ini.mkiv" name="fastswitchtobodyfont"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -11244,40 +11330,48 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="usebodyfont"> + <cd:command category="fonts" file="font-ini.mkvi" name="usebodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="usebodyfontparameter"> + <cd:command category="fonts" file="font-ini.mkvi" name="usebodyfontparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="fontchar"> + <cd:command category="fonts" file="font-ini.mkvi" name="fontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="fontcharbyindex"> + <cd:command category="fonts" file="font-ini.mkvi" name="fontcharbyindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="tochar"> + <cd:command category="fonts" file="font-ini.mkvi" name="tochar"> <cd:arguments> <cd:keywords delimiters="braces"> - <cd:constant type="cd:name"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="switchstyleonly"> + <cd:command category="fonts" file="font-ini.mkiv" name="switchstyleonly"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -11299,12 +11393,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkiv" name="switchstyleonly" variant="command"> + <cd:command category="fonts" file="font-ini.mkiv" name="switchstyleonly" variant="command"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="definebodyfontswitch"> + <cd:command category="fonts" file="font-ini.mkvi" name="definebodyfontswitch"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11314,11 +11408,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="setsmallbodyfont"/> - <cd:command file="font-ini.mkvi" name="setbigbodyfont"/> - <cd:command file="font-ini.mkvi" name="setmainbodyfont"/> - <cd:command file="font-ini.mkvi" name="restoreglobalbodyfont"/> - <cd:command file="font-ini.mkvi" name="predefinefont"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11328,28 +11422,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="predefinedfont"> + <cd:command category="fonts" file="font-ini.mkvi" name="predefinedfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showbodyfont"> + <cd:command category="fonts" file="font-run.mkiv" name="showbodyfont"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showbodyfontenvironment"> + <cd:command category="fonts" file="font-run.mkiv" name="showbodyfontenvironment"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfont"> + <cd:command category="fonts" file="font-run.mkiv" name="showfont"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> @@ -11359,7 +11453,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontstyle"> + <cd:command category="fonts" file="font-run.mkiv" name="showfontstyle"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -11386,88 +11480,87 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showligature"> + <cd:command category="fonts" file="font-run.mkiv" name="showligature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showligatures"> + <cd:command category="fonts" file="font-run.mkiv" name="showligatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontstrip"> + <cd:command category="fonts" file="font-run.mkiv" name="showfontstrip"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showminimalbaseline"/> - <cd:command file="font-run.mkiv" name="showkerning"> + <cd:command category="fonts" file="font-run.mkiv" name="showminimalbaseline"/> + <cd:command category="fonts" file="font-run.mkiv" name="showkerning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showcharratio"> + <cd:command category="fonts" file="font-run.mkiv" name="showcharratio"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-run.mkiv" name="showfontparameters"/> - <cd:command file="font-pre.mkiv" name="setsmallcaps"/> - <cd:command file="font-pre.mkiv" name="setoldstyle"/> - <cd:command file="font-pre.mkiv" name="settabular"/> - <cd:command file="font-pre.mkiv" name="setfractions"/> - <cd:command file="font-pre.mkiv" name="setsuperiors"/> - <cd:command file="font-pre.mkiv" name="tinyfont"/> - <cd:command file="font-pre.mkiv" name="infofont"/> - <cd:command file="font-pre.mkiv" name="infofontbold"/> - <cd:command file="font-pre.mkiv" name="smallbodyfont"/> - <cd:command file="font-pre.mkiv" name="bigbodyfont"/> - <cd:command file="font-pre.mkiv" name="smaller"/> - <cd:command file="font-pre.mkiv" name="bigger"/> - <cd:command file="font-pre.mkiv" name="normal"/> - <cd:command file="font-pre.mkiv" name="bold"/> - <cd:command file="font-pre.mkiv" name="mono"/> - <cd:command file="font-pre.mkiv" name="monobold"/> - <cd:command file="font-pre.mkiv" name="slanted"/> - <cd:command file="font-pre.mkiv" name="italic"/> - <cd:command file="font-pre.mkiv" name="boldslanted"/> - <cd:command file="font-pre.mkiv" name="slantedbold"/> - <cd:command file="font-pre.mkiv" name="bolditalic"/> - <cd:command file="font-pre.mkiv" name="italicbold"/> - <cd:command file="font-pre.mkiv" name="small"/> - <cd:command file="font-pre.mkiv" name="smallnormal"/> - <cd:command file="font-pre.mkiv" name="smallbold"/> - <cd:command file="font-pre.mkiv" name="smalltype"/> - <cd:command file="font-pre.mkiv" name="smallslanted"/> - <cd:command file="font-pre.mkiv" name="smallboldslanted"/> - <cd:command file="font-pre.mkiv" name="smallslantedbold"/> - <cd:command file="font-pre.mkiv" name="smallbolditalic"/> - <cd:command file="font-pre.mkiv" name="smallitalicbold"/> - <cd:command file="font-pre.mkiv" name="sans"/> - <cd:command file="font-pre.mkiv" name="sansserif"/> - <cd:command file="font-pre.mkiv" name="roman"/> - <cd:command file="font-pre.mkiv" name="serif"/> - <cd:command file="font-pre.mkiv" name="regular"/> - <cd:command file="font-pre.mkiv" name="handwritten"/> - <cd:command file="font-pre.mkiv" name="calligraphic"/> - <cd:command file="font-pre.mkiv" name="sansnormal"/> - <cd:command file="font-pre.mkiv" name="sansbold"/> - <cd:command file="font-pre.mkiv" name="serifnormal"/> - <cd:command file="font-pre.mkiv" name="serifbold"/> - <cd:command file="font-pre.mkiv" name="mononormal"/> - <cd:command file="font-pre.mkiv" name="monobold"/> - <cd:command file="font-sol.mkvi" name="definefontsolution"> + <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-sol.mkvi" level="style" name="definefontsolution"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11480,7 +11573,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="setupfontsolution"> + <cd:command category="fonts" file="font-sol.mkvi" level="style" name="setupfontsolution"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11511,22 +11604,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="setfontsolution"> + <cd:command category="fonts" file="font-sol.mkvi" name="setfontsolution"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sol.mkvi" name="resetfontsolution"/> - <cd:command file="font-sol.mkvi" name="fontsolution" type="environment"> + <cd:command category="fonts" file="font-sol.mkvi" name="resetfontsolution"/> + <cd:command category="fonts" file="font-sol.mkvi" name="fontsolution" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="definealternativestyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definealternativestyle"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -11539,16 +11632,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="applyalternativestyle"> + <cd:command category="fonts" file="font-sty.mkvi" name="applyalternativestyle"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="dontconvertfont"/> - <cd:command file="font-sty.mkvi" name="redoconvertfont"/> - <cd:command file="font-sty.mkvi" name="definestyle"> + <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="definestyle"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11561,7 +11654,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="setupstyle"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="setupstyle"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -11580,14 +11673,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" generated="yes" name="style" type="environment" variant="example"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" name="style" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command file="font-sty.mkvi" generated="yes" name="style" variant="example"> + <cd:command category="fonts" file="font-sty.mkvi" generated="yes" name="style" variant="instance"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> <cd:arguments> <cd:keywords delimiters="braces"> @@ -11595,7 +11688,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" type="environment" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" name="style" type="environment" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11603,14 +11696,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" type="environment"> + <cd:command category="fonts" file="font-sty.mkvi" name="style" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style" variant="argument"> + <cd:command category="fonts" file="font-sty.mkvi" name="style" variant="argument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11621,7 +11714,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="style"> + <cd:command category="fonts" file="font-sty.mkvi" name="style"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -11631,7 +11724,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="definestyleinstance"> + <cd:command category="fonts" file="font-sty.mkvi" level="style" name="definestyleinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11658,14 +11751,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sty.mkvi" name="styleinstance"> + <cd:command category="fonts" file="font-sty.mkvi" name="styleinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifelseitalic"> + <cd:command category="fonts" file="font-sym.mkvi" name="doifelseitalic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11675,7 +11768,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifitalicelse"> + <cd:command category="fonts" file="font-sym.mkvi" name="doifitalicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -11685,28 +11778,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="getprivateslot"> + <cd:command category="fonts" file="font-ini.mkvi" name="getprivateslot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-ini.mkvi" name="getprivatechar"> + <cd:command category="fonts" file="font-ini.mkvi" name="getprivatechar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="glyphfontfile"> + <cd:command category="fonts" file="font-sym.mkvi" name="glyphfontfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getnamedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" name="getnamedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11716,7 +11809,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getnamedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" name="getnamedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11726,7 +11819,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" name="getglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11737,7 +11830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="getglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" name="getglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11748,34 +11841,50 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="resolvedglyphstyled"> + <cd:command category="fonts" file="font-sym.mkvi" name="resolvedglyphstyled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="resolvedglyphdirect"> + <cd:command category="fonts" file="font-sym.mkvi" name="resolvedglyphdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> </cd:keywords> <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> + <cd:constant method="range" prefix="e" type="cd:name"/> + <cd:constant method="range" prefix="x" type="cd:number"/> + <cd:constant method="range" prefix="d" type="cd:number"/> + <cd:constant method="range" prefix="s" type="cd:number"/> + <cd:constant method="range" prefix="i" type="cd:number"/> + <cd:constant method="range" prefix="n" type="cd:name"/> + <cd:constant method="range" prefix="c" type="cd:name"/> + <cd:constant method="range" prefix="u" type="cd:name"/> + <cd:constant method="range" prefix="a" type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="setfont"> + <cd:command category="fonts" file="font-sym.mkvi" name="setfont"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:font"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doifelsefontchar"> + <cd:command category="fonts" file="font-sym.mkvi" name="doifelsefontchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11791,7 +11900,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-sym.mkvi" name="doiffontcharelse"> + <cd:command category="fonts" file="font-sym.mkvi" name="doiffontcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11807,15 +11916,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showchardata"> + <cd:command category="fonts" file="font-tra.mkiv" name="showchardata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showfontdata"/> - <cd:command file="font-tra.mkiv" name="doifelsefontpresent"> + <cd:command category="fonts" file="font-tra.mkiv" name="showfontdata"/> + <cd:command category="fonts" file="font-tra.mkiv" name="doifelsefontpresent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11828,7 +11937,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="doiffontpresentelse"> + <cd:command category="fonts" file="font-tra.mkiv" name="doiffontpresentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11841,7 +11950,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-tra.mkiv" name="showotfcomposition"> + <cd:command category="fonts" file="font-tra.mkiv" name="showotfcomposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -11858,23 +11967,23 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="font-var.mkvi" name="fontclass"/> - <cd:command file="font-var.mkvi" name="fontbody"/> - <cd:command file="font-var.mkvi" name="fontstyle"/> - <cd:command file="font-var.mkvi" name="fontalternative"/> - <cd:command file="font-var.mkvi" name="fontsize"/> - <cd:command file="font-var.mkvi" name="fontface"/> - <cd:command file="type-ini.mkvi" name="typescriptone"/> - <cd:command file="type-ini.mkvi" name="typescripttwo"/> - <cd:command file="type-ini.mkvi" name="typescriptthree"/> - <cd:command file="type-ini.mkvi" name="typescriptcollection" type="environment"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="usetypescriptfile"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="usetypescriptfile"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -11882,7 +11991,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="usetypescript"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="usetypescript"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="serif"/> @@ -11907,15 +12016,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="loadtypescriptfile"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="loadtypescriptfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="quittypescriptscanning"/> - <cd:command file="type-ini.mkvi" name="definetypescriptsynonym"> + <cd:command category="fonts" file="type-ini.mkvi" name="quittypescriptscanning"/> + <cd:command category="fonts" file="type-ini.mkvi" name="definetypescriptsynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11925,7 +12034,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="typescript" type="environment"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="typescript" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="serif"/> @@ -11944,7 +12053,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="definetypescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" name="definetypescriptprefix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -11954,14 +12063,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="typescriptprefix"> + <cd:command category="fonts" file="type-ini.mkvi" name="typescriptprefix"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="type-ini.mkvi" name="definetypeface"> + <cd:command category="fonts" file="type-ini.mkvi" level="style" name="definetypeface"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12013,7 +12122,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="hand-ini.mkiv" name="setupfontexpansion"> + <cd:command category="fonts" file="hand-ini.mkiv" level="style" name="setupfontexpansion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12037,7 +12146,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="hand-ini.mkiv" name="setupfontprotrusion"> + <cd:command category="fonts" file="hand-ini.mkiv" level="style" name="setupfontprotrusion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12058,16 +12167,16 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="font-fea.mkiv" name="blockligatures"> + <cd:command category="fonts" file="font-fea.mkvi" level="style" name="blockligatures"> <cd:arguments> - <cd:keywords> - <cd:constant type="cd:list"/> + <cd:keywords list="yes"> + <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> </cd:interface> <cd:interface file="i-form.xml"> - <cd:command file="scrn-fld.mkvi" name="setupforms"> + <cd:command file="scrn-fld.mkvi" level="style" name="setupforms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -12084,7 +12193,7 @@ </cd:command> </cd:interface> <cd:interface file="i-formula.xml"> - <cd:command file="math-for.mkiv" name="defineformula"> + <cd:command category="mathematics" file="math-for.mkiv" name="defineformula"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12097,7 +12206,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12181,10 +12290,36 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </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:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupformulas"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command file="math-for.mkiv" name="definesubformula"> <cd:arguments> <cd:keywords> @@ -12198,7 +12333,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupsubformula"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupsubformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12212,9 +12347,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" generated="yes" name="formula" type="environment" variant="example"> + <cd:command category="mathematics" file="math-for.mkiv" level="style" name="setupsubformulas"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupsubformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="strc-mat.mkiv" generated="yes" level="document" name="formula" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="formula"/> + <cd:instance value="formula"/> <cd:string value="formula"/> </cd:sequence> <cd:arguments> @@ -12233,18 +12378,7 @@ <cd:constant value="md"/> </cd:instances> </cd:command> - <cd:command file="strc-mat.mkiv" name="formula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="spformula" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="packed"/> @@ -12255,40 +12389,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="sdformula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="mpformula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="mdformula" type="environment"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="packed"/> - <cd:constant type="tight"/> - <cd:constant type="middle"/> - <cd:constant type="frame"/> - <cd:inherit name="setupbodyfont"/> - </cd:keywords> - </cd:arguments> - </cd:command> - <cd:command file="strc-mat.mkiv" name="defineformulaalternative"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="system" name="defineformulaalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12301,7 +12402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="formula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="packed"/> @@ -12313,8 +12414,8 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="displaymath" type="environment"/> - <cd:command file="strc-mat.mkiv" name="formulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="system" name="displaymath" type="environment"/> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="formulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12323,7 +12424,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="subformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" name="subformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12332,7 +12433,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="namedsubformulas" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" name="namedsubformulas" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12344,7 +12445,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12353,7 +12454,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula" type="environment"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="title"> @@ -12370,7 +12471,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placeformula" type="environment" variant="argument"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12379,7 +12480,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placenamedformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placenamedformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12391,7 +12492,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat.mkiv" name="placesubformula"> + <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placesubformula"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> @@ -12400,17 +12501,17 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat" name="formulanumber"> + <cd:command category="mathematics" file="strc-mat" name="formulanumber"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mat" name="placecurrentformulanumber"/> + <cd:command category="mathematics" file="strc-mat" name="placecurrentformulanumber"/> </cd:interface> <cd:interface file="i-fraction.xml"> - <cd:command file="math-frc.mkiv" name="definemathfraction"> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="definemathfraction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12423,7 +12524,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="setupmathfraction"> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="setupmathfraction"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12478,9 +12579,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" generated="yes" name="fraction" variant="example"> + <cd:command category="mathematics" file="math-frc.mkiv" level="style" name="setupmathfractions"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupmathfraction"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="mathematics" file="math-frc.mkiv" generated="yes" level="document" name="fraction" variant="instance"> <cd:sequence> - <cd:variable value="fraction"/> + <cd:instance value="fraction"/> </cd:sequence> <cd:arguments> <cd:content/> @@ -12497,73 +12608,19 @@ <cd:constant value="tbinom"/> </cd:instances> </cd:command> - <cd:command file="math-frc.mkiv" name="frac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="xfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="xxfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="tfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="sfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="dfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="binom"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="dbinom"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="tbinom"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="splitfrac"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="splitfrac"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="splitdfrac"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-frc.mkiv" name="splitdfrac"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-frc.mkiv" name="cfrac"> + <cd:command category="mathematics" file="math-frc.mkiv" level="document" name="cfrac"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="l"/> @@ -12585,7 +12642,7 @@ </cd:command> </cd:interface> <cd:interface file="i-framed.xml"> - <cd:command file="pack-rul.mkiv" name="defineframed"> + <cd:command file="pack-rul.mkiv" level="style" name="defineframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12598,7 +12655,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframed"> + <cd:command file="pack-rul.mkiv" level="style" name="setupframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12808,7 +12865,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framed"> + <cd:command file="pack-rul.mkiv" level="document" name="framed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12816,9 +12873,9 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framed" variant="example"> + <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framed" variant="instance"> <cd:sequence> - <cd:variable value="framed"/> + <cd:instance value="framed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -12839,7 +12896,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="framed" type="environment"> + <cd:command file="pack-rul.mkiv" level="document" name="framed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -12890,7 +12947,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="placeframed"> + <cd:command file="pack-rul.mkiv" level="document" name="placeframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12901,15 +12958,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="inframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="unframed"> + <cd:command file="pack-rul.mkiv" level="document" name="inframed"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -12917,7 +12966,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="definemathframed"> + <cd:command file="pack-rul.mkiv" level="style" name="definemathframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12930,7 +12979,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupmathframed"> + <cd:command file="pack-rul.mkiv" level="style" name="setupmathframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -12940,9 +12989,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="mathframed" variant="example"> + <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="mathframed" variant="instance"> <cd:sequence> - <cd:variable value="mathframed"/> + <cd:instance value="mathframed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -12956,31 +13005,7 @@ <cd:constant value="mcframed"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="mframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="inmframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="mcframed"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="math-for.mkiv" name="defineformulaframed"> + <cd:command file="math-for.mkiv" level="style" name="defineformulaframed"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -12993,7 +13018,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-for.mkiv" name="setupformulaframed"> + <cd:command file="math-for.mkiv" level="style" name="setupformulaframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13003,7 +13028,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="defineframedtext"> + <cd:command file="pack-rul.mkiv" level="style" name="defineframedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13016,7 +13041,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframedtext"> + <cd:command file="pack-rul.mkiv" level="style" name="setupframedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13059,9 +13084,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framedtext" variant="example"> + <cd:command file="pack-rul.mkiv" level="style" name="setupframedtexts"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" variant="instance"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -13073,9 +13108,9 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" generated="yes" name="framedtext" type="environment" variant="example"> + <cd:command file="pack-rul.mkiv" generated="yes" level="document" name="framedtext" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -13092,28 +13127,7 @@ <cd:constant value="framedtext"/> </cd:instances> </cd:command> - <cd:command file="pack-rul.mkiv" name="framedtext"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="framedtext" type="environment"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="middle"/> - <cd:constant type="none"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command file="pack-rul.mkiv" name="defineframedcontent"> + <cd:command file="pack-rul.mkiv" level="style" name="defineframedcontent"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13126,7 +13140,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="setupframedcontent"> + <cd:command file="pack-rul.mkiv" level="style" name="setupframedcontent"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13166,7 +13180,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installleftframerenderer"> + <cd:command file="pack-fen.mkiv" level="system" name="installleftframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13176,7 +13190,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installrightframerenderer"> + <cd:command file="pack-fen.mkiv" level="system" name="installrightframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13186,7 +13200,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installtopframerenderer"> + <cd:command file="pack-fen.mkiv" level="system" name="installtopframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13196,7 +13210,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-fen.mkiv" name="installbottomframerenderer"> + <cd:command file="pack-fen.mkiv" level="system" name="installbottomframerenderer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13208,7 +13222,7 @@ </cd:command> </cd:interface> <cd:interface file="i-graphics.xml"> - <cd:command file="grph-inc.mkiv" name="defineexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="defineexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13221,7 +13235,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkvi" name="setupexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkvi" level="style" name="setupexternalfigure"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -13431,7 +13445,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="useexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="useexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13447,7 +13461,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="externalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13460,7 +13474,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="getfiguredimensions"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="getfiguredimensions"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13470,16 +13484,16 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="figurewidth"/> - <cd:command file="grph-inc.mkiv" name="figureheight"/> - <cd:command file="grph-inc.mkiv" name="figurenaturalwidth"/> - <cd:command file="grph-inc.mkiv" name="figurenaturalheight"/> - <cd:command file="grph-inc.mkiv" name="figurefullname"/> - <cd:command file="grph-inc.mkiv" name="figurefilename"/> - <cd:command file="grph-inc.mkiv" name="figurefilepath"/> - <cd:command file="grph-inc.mkiv" name="figurefiletype"/> - <cd:command file="grph-inc.mkiv" name="noffigurepages"/> - <cd:command file="grph-inc.mkiv" name="definegraphictypesynonym"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurewidth"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figureheight"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurenaturalwidth"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurenaturalheight"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefullname"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefilename"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefilepath"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="figurefiletype"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="noffigurepages"/> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="definegraphictypesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13489,7 +13503,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="doifelsefigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="doifelsefigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13502,7 +13516,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="doiffigureelse"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="doiffigureelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -13515,7 +13529,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="registerexternalfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" level="system" name="registerexternalfigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -13528,7 +13542,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="usefigurebase"> + <cd:command category="graphics" file="grph-inc.mkiv" level="style" name="usefigurebase"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -13536,42 +13550,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollection" type="environment"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="externalfigurecollectionparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" name="externalfigurecollectionparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13581,35 +13595,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcminwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" name="efcminwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcmaxwidth"> + <cd:command category="graphics" file="grph-inc.mkiv" name="efcmaxwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcminheight"> + <cd:command category="graphics" file="grph-inc.mkiv" name="efcminheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcmaxheight"> + <cd:command category="graphics" file="grph-inc.mkiv" name="efcmaxheight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="efcparameter"> + <cd:command category="graphics" file="grph-inc.mkiv" name="efcparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -13619,14 +13633,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="overlayfigure"> + <cd:command category="graphics" file="grph-inc.mkiv" name="overlayfigure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="bitmapimage"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="bitmapimage"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -13652,7 +13666,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="grph-inc.mkiv" name="bitmapimage" type="environment"> + <cd:command category="graphics" file="grph-inc.mkiv" level="document" name="bitmapimage" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -13675,7 +13689,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="typesetbuffer"> + <cd:command file="grph-fig.mkiv" level="document" name="typesetbuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -13686,7 +13700,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="definetypesetting"> + <cd:command file="grph-fig.mkiv" level="style" name="definetypesetting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13699,7 +13713,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-fig.mkiv" name="typesetfile"> + <cd:command file="grph-fig.mkiv" level="document" name="typesetfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13714,7 +13728,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="backgroundimage"> + <cd:command category="graphics" file="pack-box.mkiv" name="backgroundimage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13730,7 +13744,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="backgroundimagefill"> + <cd:command category="graphics" file="pack-box.mkiv" name="backgroundimagefill"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -13748,7 +13762,7 @@ </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> - <cd:command file="page-grd.mkiv" name="showgrid"> + <cd:command category="layout" file="page-grd.mkiv" name="showgrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -13766,7 +13780,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="definegridsnapping"> + <cd:command category="layout" file="spac-ver.mkiv" name="definegridsnapping"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -13803,7 +13817,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="snaptogrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="snaptogrid"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13834,7 +13848,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="snaptogrid" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="snaptogrid" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -13843,7 +13857,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="placeongrid"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="placeongrid"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13873,7 +13887,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="placeongrid" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="placeongrid" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> @@ -13881,7 +13895,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="gridsnapping" type="environment"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="gridsnapping" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="normal"/> @@ -13910,20 +13924,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="gridsnapping" type="environment" variant="list"> + <cd:command category="layout" file="spac-ver.mkiv" level="document" name="gridsnapping" type="environment" variant="list"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="definegridsnapping"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="usegridparameter"> + <cd:command category="layout" file="spac-ver.mkiv" level="system" name="usegridparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="showgridsnapping"/> - <cd:command file="meta-grd.mkiv" name="basegrid"> + <cd:command category="layout" file="spac-ver.mkiv" name="showgridsnapping"/> + <cd:command file="meta-grd.mkiv" level="document" name="basegrid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -13980,7 +13994,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-grd.mkiv" name="grid"> + <cd:command file="meta-grd.mkiv" level="document" name="grid"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> @@ -13989,7 +14003,7 @@ </cd:command> </cd:interface> <cd:interface file="i-help.xml"> - <cd:command file="scrn-hlp.mkvi" name="definehelp"> + <cd:command file="scrn-hlp.mkvi" level="style" name="definehelp"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14002,7 +14016,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="setuphelp"> + <cd:command file="scrn-hlp.mkvi" level="style" name="setuphelp"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14012,9 +14026,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" variant="example"> + <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" variant="instance"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -14031,9 +14045,9 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" type="environment" variant="example"> + <cd:command file="scrn-hlp.mkvi" generated="yes" name="help" type="environment" variant="instance"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -14044,7 +14058,7 @@ <cd:constant value="helptext"/> </cd:instances> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="doifelsehelp"> + <cd:command file="scrn-hlp.mkvi" level="system" name="doifelsehelp"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14054,7 +14068,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-hlp.mkvi" name="doifhelpelse"> + <cd:command file="scrn-hlp.mkvi" level="system" name="doifhelpelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -14097,7 +14111,7 @@ </cd:command> </cd:interface> <cd:interface file="i-highlight.xml"> - <cd:command file="core-sys.mkiv" name="definehighlight"> + <cd:command category="fonts" file="core-sys.mkiv" level="style" name="definehighlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14110,7 +14124,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="setuphighlight"> + <cd:command category="fonts" file="core-sys.mkiv" level="style" name="setuphighlight"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14130,7 +14144,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" generated="yes" name="highlight" variant="example"> + <cd:command category="fonts" file="core-sys.mkiv" generated="yes" level="document" name="highlight" variant="example"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -14140,7 +14154,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="highlight"> + <cd:command category="fonts" file="core-sys.mkiv" level="document" name="highlight"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14150,14 +14164,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="highlight" type="environment"> + <cd:command category="fonts" 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 file="core-sys.mkiv" name="directhighlight"> + <cd:command category="fonts" file="core-sys.mkiv" level="document" name="directhighlight"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14169,7 +14183,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hspace.xml"> - <cd:command file="spac-hor.mkiv" name="definehspace"> + <cd:command file="spac-hor.mkiv" level="style" name="definehspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14223,7 +14237,7 @@ <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" name="setupspacing"> + <cd:command file="spac-hor.mkiv" level="style" name="setupspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -14233,12 +14247,12 @@ </cd:arguments> </cd:command> <cd:command file="spac-hor.mkiv" name="space"/> - <cd:command file="spac-hor.mkiv" name="removelastspace"/> - <cd:command file="spac-hor.mkiv" name="nospace"/> + <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" name="keepunwantedspaces"/> - <cd:command file="spac-hor.mkiv" name="removeunwantedspaces"/> + <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"/> @@ -14253,9 +14267,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="leftskipadaption"/> - <cd:command file="spac-hor.mkiv" name="rightskipadaption"/> - <cd:command file="spac-hor.mkiv" name="dosetleftskipadaption"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14265,7 +14279,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="dosetrightskipadaption"> + <cd:command file="spac-hor.mkiv" level="system" name="dosetrightskipadaption"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14275,7 +14289,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="doadaptleftskip"> + <cd:command file="spac-hor.mkiv" level="system" name="doadaptleftskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14285,7 +14299,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="doadaptrightskip"> + <cd:command file="spac-hor.mkiv" level="system" name="doadaptrightskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -14295,7 +14309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="activatespacehandler"> + <cd:command file="spac-hor.mkiv" level="system" name="activatespacehandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> @@ -14314,7 +14328,7 @@ </cd:command> </cd:interface> <cd:interface file="i-hyphenation.xml"> - <cd:command file="lang-hyp.mkiv" name="setuphyphenation"> + <cd:command file="lang-hyp.mkiv" level="style" name="setuphyphenation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -14342,7 +14356,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="definehypenationfeatures"> + <cd:command file="lang-hyp.mkiv" level="style" name="definehypenationfeatures"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14397,7 +14411,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-hyp.mkiv" name="sethyphenationfeatures"> + <cd:command file="lang-hyp.mkiv" level="style" name="sethyphenationfeatures"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14446,7 +14460,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-del.mkiv" name="setuphyphenmark"> + <cd:command file="typo-del.mkiv" level="style" name="setuphyphenmark"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="sign"> @@ -14456,14 +14470,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="definebreakpoints"> + <cd:command 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" name="definebreakpoint"> + <cd:command file="typo-brk.mkiv" level="style" name="definebreakpoint"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14504,7 +14518,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-brk.mkiv" name="setbreakpoints"> + <cd:command file="typo-brk.mkiv" level="style" name="setbreakpoints"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -14590,7 +14604,7 @@ </cd:command> </cd:interface> <cd:interface file="i-imposition.xml"> - <cd:command file="page-imp.mkiv" name="installshipoutmethod"> + <cd:command file="page-imp.mkiv" level="system" name="installshipoutmethod"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -14600,7 +14614,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="invokepageheandler"> + <cd:command file="page-imp.mkiv" level="system" name="invokepageheandler"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="normal"/> @@ -14610,7 +14624,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="setuparranging"> + <cd:command category="layout" file="page-imp.mkiv" name="setuparranging"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="disable"/> @@ -14655,7 +14669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="installpagearrangement"> + <cd:command category="layout" file="page-imp.mkiv" level="system" name="installpagearrangement"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -14665,10 +14679,10 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="page-imp.mkiv" name="arrangedpages" type="environment"/> + <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" name="defineindenting"> + <cd:command file="spac-hor.mkiv" level="style" name="defineindenting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14694,7 +14708,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="setupindenting"> + <cd:command 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"/> @@ -14718,8 +14732,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="synchronizeindenting"/> - <cd:command file="spac-hor.mkiv" name="useindentingparameter"> + <cd:command file="spac-hor.mkiv" level="system" name="synchronizeindenting"/> + <cd:command file="spac-hor.mkiv" level="system" name="useindentingparameter"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -14727,7 +14741,7 @@ <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" name="checknextindentation"> + <cd:command file="spac-hor.mkiv" level="system" name="checknextindentation"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -14736,16 +14750,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="useindentnextparameter"> + <cd:command file="spac-hor.mkiv" level="system" name="useindentnextparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="dorechecknextindentation"/> - <cd:command begin="push" end="pop" file="spac-hor.mkiv" name="indentation" type="environment"/> + <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:interface> <cd:interface file="i-indentedtext.xml"> - <cd:command file="strc-ind.mkiv" name="defineindentedtext"> + <cd:command file="strc-ind.mkiv" level="style" name="defineindentedtext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14758,7 +14772,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" name="setupindentedtext"> + <cd:command file="strc-ind.mkiv" level="style" name="setupindentedtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14804,12 +14818,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ind.mkiv" generated="yes" name="indentedtext" type="environment" variant="example"> + <cd:command 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" name="indentedtext" type="environment"> + <cd:command file="strc-ind.mkiv" level="document" name="indentedtext" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14818,7 +14832,7 @@ </cd:command> </cd:interface> <cd:interface file="i-initial.xml"> - <cd:command file="typo-drp.mkiv" name="defineinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="style" name="defineinitial"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14831,7 +14845,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="setupinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" level="style" name="setupinitial"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14882,14 +14896,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="placeinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" name="placeinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-drp.mkiv" name="setinitial"> + <cd:command category="fonts" file="typo-drp.mkiv" name="setinitial"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -14958,7 +14972,7 @@ </cd:command> </cd:interface> <cd:interface file="i-insertion.xml"> - <cd:command file="page-ins.mkiv" name="defineinsertion"> + <cd:command file="page-ins.mkiv" level="system" name="defineinsertion"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -14971,7 +14985,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="setupinsertion"> + <cd:command file="page-ins.mkiv" level="system" name="setupinsertion"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -14987,7 +15001,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="doifelseinsertion"> + <cd:command file="page-ins.mkiv" level="system" name="doifelseinsertion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15000,7 +15014,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-ins.mkiv" name="doifinsertionelse"> + <cd:command file="page-ins.mkiv" level="system" name="doifinsertionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15015,7 +15029,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interaction.xml"> - <cd:command file="scrn-ini.mkvi" name="defineinteraction"> + <cd:command file="scrn-ini.mkvi" level="style" name="defineinteraction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15028,7 +15042,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setupinteraction"> + <cd:command file="scrn-ini.mkvi" level="style" name="setupinteraction"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15126,7 +15140,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="setupinteraction" variant="name"> + <cd:command file="scrn-ini.mkvi" level="style" name="setupinteraction" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -15149,7 +15163,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="doifelselocation"> + <cd:command file="scrn-ini.mkvi" level="system" name="doifelselocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15159,7 +15173,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrn-ini.mkvi" name="doiflocationelse"> + <cd:command file="scrn-ini.mkvi" level="system" name="doiflocationelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -15171,7 +15185,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionbar.xml"> - <cd:command file="scrn-bar.mkvi" name="defineinteractionbar"> + <cd:command file="scrn-bar.mkvi" level="style" name="defineinteractionbar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15184,7 +15198,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-bar.mkvi" name="setupinteractionbar"> + <cd:command file="scrn-bar.mkvi" level="style" name="setupinteractionbar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15271,7 +15285,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionmenu.xml"> - <cd:command file="scrn-but.mkvi" name="defineinteractionmenu"> + <cd:command file="scrn-but.mkvi" level="style" name="defineinteractionmenu"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15284,7 +15298,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-but.mkvi" name="setupinteractionmenu"> + <cd:command file="scrn-but.mkvi" level="style" name="setupinteractionmenu"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15467,7 +15481,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interactionscreen.xml"> - <cd:command file="scrn-pag.mkvi" name="setupinteractionscreen"> + <cd:command file="scrn-pag.mkvi" level="style" name="setupinteractionscreen"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> @@ -15528,10 +15542,10 @@ </cd:command> </cd:interface> <cd:interface file="i-interface.xml"> - <cd:command file="mult-ini.mkiv" name="defaultinterface"/> - <cd:command file="mult-ini.mkiv" name="currentinterface"/> - <cd:command file="mult-ini.mkiv" name="currentresponses"/> - <cd:command file="mult-ini.mkiv" name="interface" type="environment"> + <cd:command file="mult-ini.mkiv" level="system" name="defaultinterface"/> + <cd:command file="mult-ini.mkiv" level="system" name="currentinterface"/> + <cd:command file="mult-ini.mkiv" level="system" name="currentresponses"/> + <cd:command file="mult-ini.mkiv" level="system" name="interface" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="all"/> @@ -15539,7 +15553,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfaceconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15549,7 +15563,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfacevariable"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15559,7 +15573,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="defineinterfaceelement"> + <cd:command file="mult-ini.mkiv" level="system" name="defineinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15569,7 +15583,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definefileconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="definefileconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15579,28 +15593,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definesystemconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="definesystemconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definemessageconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="definemessageconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="definesystemvariable"> + <cd:command file="mult-ini.mkiv" level="system" name="definesystemvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfacemessage"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15615,7 +15629,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setmessagetext"> + <cd:command file="mult-ini.mkiv" level="system" name="setmessagetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15626,8 +15640,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="currentmessagetext"/> - <cd:command file="mult-ini.mkiv" name="getmessage"> + <cd:command file="mult-ini.mkiv" level="system" name="currentmessagetext"/> + <cd:command file="mult-ini.mkiv" level="system" name="getmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15638,7 +15652,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="doifelsemessage"> + <cd:command file="mult-ini.mkiv" level="system" name="doifelsemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15655,7 +15669,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="doifmessageelse"> + <cd:command file="mult-ini.mkiv" level="system" name="doifmessageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15672,7 +15686,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="showmessage"> + <cd:command file="mult-ini.mkiv" level="system" name="showmessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15686,7 +15700,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="writestatus"> + <cd:command file="mult-ini.mkiv" level="system" name="writestatus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -15696,28 +15710,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="message"> + <cd:command file="mult-ini.mkiv" level="system" name="message"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="inlinemessage"> + <cd:command file="mult-ini.mkiv" level="system" name="inlinemessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="displaymessage"> + <cd:command file="mult-ini.mkiv" level="system" name="displaymessage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="showwarning"> + <cd:command file="mult-ini.mkiv" level="system" name="showwarning"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15731,7 +15745,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfaceconstant"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceconstant"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15741,7 +15755,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfacevariable"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15751,7 +15765,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfaceelements"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfaceelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15761,7 +15775,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="mult-ini.mkiv" name="setinterfacecommand"> + <cd:command file="mult-ini.mkiv" level="system" name="setinterfacecommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -15773,7 +15787,7 @@ </cd:command> </cd:interface> <cd:interface file="i-interlinespace.xml"> - <cd:command file="spac-ver.mkiv" name="defineinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15786,7 +15800,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15826,7 +15840,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15841,14 +15855,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="name"> + <cd:command 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" name="setuplocalinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -15858,7 +15872,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -15873,7 +15887,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="name"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15912,14 +15926,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace"> + <cd:command 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" name="dosetupcheckedinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -15934,21 +15948,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="name"> + <cd:command 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" name="useinterlinespaceparameter"> + <cd:command 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" name="defineinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="defineinterlinespace"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -15961,7 +15975,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16001,7 +16015,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -16016,14 +16030,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupinterlinespace" variant="name"> + <cd:command 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" name="setuplocalinterlinespace"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16033,7 +16047,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -16048,7 +16062,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setuplocalinterlinespace" variant="name"> + <cd:command file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16087,14 +16101,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace"> + <cd:command 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" name="dosetupcheckedinterlinespace" variant="argument"> + <cd:command file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -16109,21 +16123,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="dosetupcheckedinterlinespace" variant="name"> + <cd:command 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" name="useinterlinespaceparameter"> + <cd:command 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 file="typo-itc.mkvi" name="setitaliccorrection"> + <cd:command category="fonts" file="typo-itc.mkvi" name="setitaliccorrection"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -16132,9 +16146,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-itc.mkvi" name="resetitaliccorrection"/> - <cd:command file="typo-itc.mkvi" name="italiccorrection"/> - <cd:command file="typo-itc.mkvi" name="setupitaliccorrection"> + <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:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> @@ -16146,7 +16160,7 @@ </cd:command> </cd:interface> <cd:interface file="i-itemgroup.xml"> - <cd:command file="strc-itm.mkvi" name="defineitemgroup"> + <cd:command file="strc-itm.mkvi" level="style" name="defineitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16159,7 +16173,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroup"> + <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16361,11 +16375,14 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroup" variant="assignment"> + <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroup" variant="assignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16564,11 +16581,14 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="setupitemgroups"> + <cd:command file="strc-itm.mkvi" level="style" name="setupitemgroups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16579,7 +16599,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" name="setupitemgroup" variant="instance"> + <cd:command file="strc-itm.mkvi" generated="yes" level="style" name="setupitemgroup" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -16600,7 +16620,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" generated="yes" name="itemgroup" type="environment" variant="instance"> + <cd:command file="strc-itm.mkvi" generated="yes" level="document" name="itemgroup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -16616,7 +16636,7 @@ <cd:constant value="itemize"/> </cd:instances> </cd:command> - <cd:command file="strc-itm.mkvi" name="itemgroup" type="environment"> + <cd:command file="strc-itm.mkvi" level="document" name="itemgroup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16629,29 +16649,29 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="item" scope="itemgroup"> + <cd:command 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" name="noitem" scope="itemgroup"/> - <cd:command file="strc-itm.mkvi" name="itemtag" scope="itemgroup"> + <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:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="item" scope="itemgroup" type="environment"> + <cd:command 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" name="head" scope="itemgroup" type="environment"> + <cd:command 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"/> @@ -16661,7 +16681,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="item"> + <cd:command 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"/> @@ -16671,7 +16691,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> + <cd:command file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="symbol"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -16683,7 +16703,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-itm.mkvi" name="specialitem" scope="itemgroup" type="environment" variant="none"> + <cd:command file="strc-itm.mkvi" level="document" name="specialitem" scope="itemgroup" type="environment" variant="none"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> @@ -16693,7 +16713,7 @@ </cd:command> </cd:interface> <cd:interface file="i-items.xml"> - <cd:command file="typo-itm.mkiv" name="defineitems"> + <cd:command file="typo-itm.mkiv" level="style" name="defineitems"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16706,7 +16726,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" name="setupitems"> + <cd:command file="typo-itm.mkiv" level="style" name="setupitems"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16766,7 +16786,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-itm.mkiv" name="items"> + <cd:command file="typo-itm.mkiv" level="document" name="items"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> @@ -16778,7 +16798,7 @@ </cd:command> </cd:interface> <cd:interface file="i-javascript.xml"> - <cd:command file="java-ini.mkiv" name="JScode" type="environment"> + <cd:command file="java-ini.mkiv" level="system" name="JScode" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16791,7 +16811,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="JSpreamble" type="environment"> + <cd:command file="java-ini.mkiv" level="system" name="JSpreamble" type="environment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -16805,7 +16825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="setJSpreamble"> + <cd:command file="java-ini.mkiv" level="system" name="setJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16813,7 +16833,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="addtoJSpreamble"> + <cd:command file="java-ini.mkiv" level="system" name="addtoJSpreamble"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -16821,7 +16841,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="java-ini.mkiv" name="useJSscripts"> + <cd:command file="java-ini.mkiv" level="style" name="useJSscripts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -16833,7 +16853,7 @@ </cd:command> </cd:interface> <cd:interface file="i-kerning.xml"> - <cd:command file="typo-krn.mkiv" name="definecharacterkerning"> + <cd:command file="typo-krn.mkiv" level="style" name="definecharacterkerning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16846,7 +16866,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setupcharacterkerning"> + <cd:command file="typo-krn.mkiv" level="style" name="setupcharacterkerning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -16881,7 +16901,7 @@ </cd:arguments> </cd:command> <cd:command file="typo-krn.mkiv" name="resetcharacterkerning"/> - <cd:command file="typo-krn.mkiv" generated="yes" name="characterkerning" variant="example"> + <cd:command file="typo-krn.mkiv" generated="yes" level="document" name="characterkerning" variant="example"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -16894,7 +16914,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="kerncharacters"> + <cd:command file="typo-krn.mkiv" level="document" name="kerncharacters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16904,7 +16924,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="letterspacing"> + <cd:command file="typo-krn.mkiv" level="document" name="letterspacing"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -16914,7 +16934,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="stretched"> + <cd:command file="typo-krn.mkiv" level="document" name="stretched"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupstretched"/> @@ -16924,7 +16944,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-krn.mkiv" name="setupstretched"> + <cd:command file="typo-krn.mkiv" level="style" name="setupstretched"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> @@ -16933,7 +16953,7 @@ </cd:command> </cd:interface> <cd:interface file="i-label.xml"> - <cd:command file="strc-lab.mkiv" name="definelabel"> + <cd:command file="strc-lab.mkiv" level="style" name="definelabel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -16946,7 +16966,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" name="setuplabel"> + <cd:command file="strc-lab.mkiv" level="style" name="setuplabel"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17117,7 +17137,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" name="label" variant="example"> + <cd:command file="strc-lab.mkiv" generated="yes" level="document" name="label" variant="example"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -17130,7 +17150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lab.mkiv" generated="yes" name="currentlabel" variant="example"> + <cd:command file="strc-lab.mkiv" generated="yes" level="document" name="currentlabel" variant="example"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> @@ -17146,7 +17166,7 @@ </cd:command> </cd:interface> <cd:interface file="i-labeltext.xml"> - <cd:command file="lang-lab.mkiv" name="definelabelclass"> + <cd:command category="language" file="lang-lab.mkiv" level="system" name="definelabelclass"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17156,7 +17176,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="setuplabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" level="style" name="setuplabeltext" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="label"/> @@ -17172,9 +17192,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="presetlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="presetlabeltext" variant="instance"> <cd:sequence> <cd:string value="preset"/> <cd:instance value="label"/> @@ -17190,9 +17220,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="copylabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="copylabeltext" variant="instance"> <cd:sequence> <cd:string value="copy"/> <cd:instance value="label"/> @@ -17208,9 +17248,19 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltext" type="environment" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltext" type="environment" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -17223,16 +17273,36 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labellanguage" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labellanguage" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="language"/> </cd:sequence> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltext" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="text"/> @@ -17242,9 +17312,19 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="labeltexts" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="labeltexts" variant="instance"> <cd:sequence> <cd:instance value="label"/> <cd:string value="texts"/> @@ -17257,9 +17337,13 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="leftlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="leftlabeltext" variant="instance"> <cd:sequence> <cd:string value="left"/> <cd:instance value="label"/> @@ -17270,9 +17354,13 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> - <cd:command file="lang-lab.mkiv" generated="yes" name="rightlabeltext" variant="instance"> + <cd:command category="language" file="lang-lab.mkiv" generated="yes" name="rightlabeltext" variant="instance"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> @@ -17283,11 +17371,15 @@ <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-language.xml"> - <cd:command file="lang-ini.mkiv" name="installlanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="installlanguage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17297,7 +17389,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="installlanguage" variant="name"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="installlanguage" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17307,7 +17399,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="setuplanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="setuplanguage"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:language"/> @@ -17410,7 +17502,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifelselanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifelselanguage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17423,7 +17515,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doiflanguageelse"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="doiflanguageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17436,7 +17528,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifelsepatterns"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifelsepatterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17449,7 +17541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="doifpatternselse"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="doifpatternselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:language"/> @@ -17462,40 +17554,40 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" generated="yes" name="language" variant="example"> + <cd:command category="language" file="lang-ini.mkiv" generated="yes" level="document" name="language" variant="example"> <cd:sequence> <cd:variable value="language"/> </cd:sequence> </cd:command> - <cd:command file="lang-ini.mkiv" name="language"> + <cd:command category="language" file="lang-ini.mkiv" level="document" name="language"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="mainlanguage"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="mainlanguage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="uselanguageparameter"> + <cd:command category="language" file="lang-ini.mkiv" level="system" name="uselanguageparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="exceptions" type="environment"> + <cd:command category="language" file="lang-ini.mkiv" level="style" name="exceptions" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:language"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-ini.mkiv" name="currentlanguage"/> - <cd:command file="lang-ini.mkiv" name="currentmainlanguage"/> - <cd:command file="lang-lab.mkiv" name="commalistsentence"> + <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-lab.mkiv" level="document" name="commalistsentence"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -17507,7 +17599,7 @@ </cd:command> </cd:interface> <cd:interface file="i-layer.xml"> - <cd:command file="pack-box.mkiv" name="setuplayeredtext"> + <cd:command file="pack-box.mkiv" level="style" name="setuplayeredtext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17609,7 +17701,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayer"> + <cd:command file="pack-lyr.mkiv" level="style" name="definelayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17622,7 +17714,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="setuplayer"> + <cd:command file="pack-lyr.mkiv" level="style" name="setuplayer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -17804,7 +17896,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayerpreset"> + <cd:command file="pack-lyr.mkiv" level="system" name="definelayerpreset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17814,7 +17906,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="definelayerpreset" variant="name"> + <cd:command file="pack-lyr.mkiv" level="system" name="definelayerpreset" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17824,7 +17916,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="doifelselayerdata"> + <cd:command file="pack-lyr.mkiv" level="system" name="doifelselayerdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17837,7 +17929,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-lyr.mkiv" name="doiflayerdataelse"> + <cd:command file="pack-lyr.mkiv" level="system" name="doiflayerdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -17879,7 +17971,7 @@ </cd:command> </cd:interface> <cd:interface file="i-layout.xml"> - <cd:command file="page-lay.mkiv" name="definelayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="definelayout"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -17892,7 +17984,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuplayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuplayout"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18090,7 +18182,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuplayout" variant="name"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="setuplayout" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -18098,7 +18190,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifelselayoutdefined"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifelselayoutdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -18111,7 +18203,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doiflayoutdefinedelse"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doiflayoutdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -18124,7 +18216,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="adaptlayout"> + <cd:command category="layout" file="page-lay.mkiv" level="style" name="adaptlayout"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number"/> @@ -18140,14 +18232,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="layout" type="environment"> + <cd:command category="layout" file="page-lay.mkiv" name="layout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifelseoddpage"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifelseoddpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18157,7 +18249,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifoddpageelse"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifoddpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18167,7 +18259,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifbothsidesoverruled"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifbothsidesoverruled"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18180,7 +18272,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="doifbothsides"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="doifbothsides"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18193,7 +18285,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="rightorleftpageaction"> + <cd:command category="layout" file="page-lay.mkiv" level="system" name="rightorleftpageaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -18203,7 +18295,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showprint"> + <cd:command category="layout" file="page-run.mkiv" name="showprint"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setuppapersize"/> @@ -18216,7 +18308,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showframe"> + <cd:command category="layout" file="page-run.mkiv" name="showframe"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="top"/> @@ -18234,7 +18326,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showsetups"> + <cd:command category="layout" file="page-run.mkiv" name="showsetups"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -18251,7 +18343,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showlayout"> + <cd:command category="layout" file="page-run.mkiv" name="showlayout"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant default="yes" type="pt"/> @@ -18268,11 +18360,11 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-run.mkiv" name="showmargins"/> - <cd:command file="page-spr.mkiv" name="spread" type="environment"/> + <cd:command category="layout" file="page-run.mkiv" name="showmargins"/> + <cd:command category="layout" file="page-spr.mkiv" name="spread" type="environment"/> </cd:interface> <cd:interface file="i-linenumber.xml"> - <cd:command file="page-lin.mkvi" name="definelinenumbering"> + <cd:command file="page-lin.mkvi" level="style" name="definelinenumbering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18285,7 +18377,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="setuplinenumbering"> + <cd:command file="page-lin.mkvi" level="style" name="setuplinenumbering"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18362,7 +18454,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="linenumbering" type="environment"> + <cd:command file="page-lin.mkvi" level="document" name="linenumbering" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18386,7 +18478,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="linenumbering" type="environment" variant="argument"> + <cd:command file="page-lin.mkvi" level="document" name="linenumbering" type="environment" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -18397,28 +18489,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="someline"> + <cd:command 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" name="startline"> + <cd:command 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" name="stopline"> + <cd:command 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" name="doifelsesamelinereference"> + <cd:command file="page-lin.mkvi" level="system" name="doifelsesamelinereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18431,7 +18523,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="doifsamelinereferenceelse"> + <cd:command file="page-lin.mkvi" level="system" name="doifsamelinereferenceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -18444,7 +18536,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="inline"> + <cd:command file="page-lin.mkvi" level="document" name="inline"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -18454,7 +18546,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lin.mkvi" name="inlinerange"> + <cd:command file="page-lin.mkvi" level="document" name="inlinerange"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -18463,34 +18555,34 @@ </cd:command> </cd:interface> <cd:interface file="i-lines.xml"> - <cd:command file="supp-box.mkiv" name="noflines"/> - <cd:command file="supp-box.mkiv" name="getnoflines"> + <cd:command file="supp-box.mkiv" level="system" name="noflines"/> + <cd:command file="supp-box.mkiv" level="system" name="getnoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getroundednoflines"> + <cd:command file="supp-box.mkiv" level="system" name="getroundednoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="getrawnoflines"> + <cd:command file="supp-box.mkiv" level="system" name="getrawnoflines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="determinenoflines"> + <cd:command file="supp-box.mkiv" level="system" name="determinenoflines"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" name="definelines"> + <cd:command file="spac-lin.mkiv" level="style" name="definelines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18503,7 +18595,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" name="setuplines"> + <cd:command file="spac-lin.mkiv" level="style" name="setuplines"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -18553,7 +18645,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-lin.mkiv" generated="yes" name="lines" type="environment" variant="instance"> + <cd:command file="spac-lin.mkiv" generated="yes" level="document" name="lines" type="environment" variant="instance"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -18562,9 +18654,11 @@ <cd:inherit name="setuplines"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="lines"/> + </cd:instances> </cd:command> - <cd:command file="spac-lin.mkiv" name="emptylines"> + <cd:command file="spac-lin.mkiv" level="document" name="emptylines"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -18573,7 +18667,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linetable.xml"> - <cd:command file="tabl-ltb.mkiv" name="setuplinetable"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="style" name="setuplinetable"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="r"/> @@ -18665,24 +18759,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="linetablecell" type="environment"> + <cd:command category="tables" file="tabl-ltb.mkiv" name="linetablecell" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuplinetable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="linetable" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="linetablehead" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="linetablebody" type="environment"/> - <cd:command file="tabl-ltb.mkiv" name="processlinetablebuffer"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-ltb.mkiv" name="processlinetablefile"> + <cd:command category="tables" file="tabl-ltb.mkiv" level="document" name="processlinetablefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -18691,7 +18785,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linewidth.xml"> - <cd:command file="pack-rul.mkiv" name="setuplinewidth"> + <cd:command file="pack-rul.mkiv" level="style" name="setuplinewidth"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> @@ -18704,7 +18798,7 @@ <cd:command file="pack-rul.mkiv" name="linewidth"/> </cd:interface> <cd:interface file="i-list.xml"> - <cd:command file="strc-lst.mkvi" name="definelist"> + <cd:command file="strc-lst.mkvi" level="style" name="definelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -18717,7 +18811,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplist"> + <cd:command file="strc-lst.mkvi" level="style" name="setuplist"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:list"/> @@ -18978,7 +19072,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelselist"> + <cd:command file="strc-lst.mkvi" level="system" name="doifelselist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -18991,7 +19085,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doiflistelse"> + <cd:command file="strc-lst.mkvi" level="system" name="doiflistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:list"/> @@ -19048,7 +19142,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placelist"> + <cd:command file="strc-lst.mkvi" level="document" name="placelist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:list"/> @@ -19068,7 +19162,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="completelist"> + <cd:command file="strc-lst.mkvi" level="document" name="completelist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19078,7 +19172,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definecombinedlist"> + <cd:command file="strc-lst.mkvi" level="style" name="definecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19091,7 +19185,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setupcombinedlist"> + <cd:command file="strc-lst.mkvi" level="style" name="setupcombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19101,7 +19195,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="placecombinedlist"> + <cd:command file="strc-lst.mkvi" level="document" name="placecombinedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:list"/> @@ -19121,9 +19215,11 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="placecombinedlist" variant="instance"> + <cd:command file="strc-lst.mkvi" generated="yes" level="document" name="placecombinedlist" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="combinedlist"/> @@ -19133,9 +19229,11 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> - <cd:command file="strc-lst.mkvi" generated="yes" name="completecombinedlist" variant="instance"> + <cd:command file="strc-lst.mkvi" generated="yes" level="document" name="completecombinedlist" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -19145,7 +19243,9 @@ <cd:inherit name="setuplist"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="content"/> + </cd:instances> </cd:command> <cd:command file="strc-lst.mkvi" name="structurelistuservariable"> <cd:arguments> @@ -19161,7 +19261,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelsestructurelisthaspage"> + <cd:command file="strc-lst.mkvi" level="system" name="doifelsestructurelisthaspage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19171,7 +19271,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifstructurelisthaspageelse"> + <cd:command file="strc-lst.mkvi" level="system" name="doifstructurelisthaspageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19181,7 +19281,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifelsestructurelisthasnumber"> + <cd:command file="strc-lst.mkvi" level="system" name="doifelsestructurelisthasnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19191,7 +19291,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="doifstructurelisthasnumberelse"> + <cd:command file="strc-lst.mkvi" level="system" name="doifstructurelisthasnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19201,7 +19301,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definelistextra"> + <cd:command file="strc-lst.mkvi" level="style" name="definelistextra"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19214,7 +19314,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplistextra"> + <cd:command file="strc-lst.mkvi" level="style" name="setuplistextra"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19229,7 +19329,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="definelistalternative"> + <cd:command file="strc-lst.mkvi" level="style" name="definelistalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19242,7 +19342,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="setuplistalternative"> + <cd:command file="strc-lst.mkvi" level="style" name="setuplistalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19292,7 +19392,7 @@ <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" name="currentlistentryreferenceattribute"> + <cd:command file="strc-lst.mkvi" level="system" name="currentlistentryreferenceattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="number"/> @@ -19302,8 +19402,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lst.mkvi" name="currentlistentrydestinationattribute"/> - <cd:command file="strc-lst.mkvi" name="currentlistentrylimitedtext"> + <cd:command file="strc-lst.mkvi" level="system" name="currentlistentrydestinationattribute"/> + <cd:command file="strc-lst.mkvi" level="system" name="currentlistentrylimitedtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -19363,7 +19463,7 @@ <cd:command file="cont-log.mkiv" name="XETEX"/> </cd:interface> <cd:interface file="i-lohi.xml"> - <cd:command file="typo-scr.mkiv" name="definelow"> + <cd:command file="typo-scr.mkiv" level="style" name="definelow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19376,7 +19476,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplow"> + <cd:command file="typo-scr.mkiv" level="style" name="setuplow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19398,21 +19498,23 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="low" variant="instance"> + <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="low" variant="instance"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unitslow"/> + </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" name="low"> + <cd:command file="typo-scr.mkiv" level="document" name="low"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definehigh"> + <cd:command file="typo-scr.mkiv" level="style" name="definehigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19425,7 +19527,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuphigh"> + <cd:command file="typo-scr.mkiv" level="style" name="setuphigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19447,21 +19549,23 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="high" variant="instance"> + <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="high" variant="instance"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unitshigh"/> + </cd:instances> </cd:command> - <cd:command file="typo-scr.mkiv" name="high"> + <cd:command file="typo-scr.mkiv" level="document" name="high"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definelowhigh"> + <cd:command file="typo-scr.mkiv" level="style" name="definelowhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19474,7 +19578,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplowhigh"> + <cd:command file="typo-scr.mkiv" level="style" name="setuplowhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19499,7 +19603,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="lowhigh" variant="instance"> + <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="lowhigh" variant="instance"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -19512,7 +19616,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="lohi"> + <cd:command file="typo-scr.mkiv" level="document" name="lohi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19522,7 +19626,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="hilo"> + <cd:command file="typo-scr.mkiv" level="document" name="hilo"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="left"/> @@ -19532,7 +19636,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="definelowmidhigh"> + <cd:command file="typo-scr.mkiv" level="style" name="definelowmidhigh"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19545,7 +19649,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="setuplowmidhigh"> + <cd:command file="typo-scr.mkiv" level="style" name="setuplowmidhigh"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19567,7 +19671,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" generated="yes" name="lowmidhigh" variant="instance"> + <cd:command file="typo-scr.mkiv" generated="yes" level="document" name="lowmidhigh" variant="instance"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -19577,14 +19681,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="typo-scr.mkiv" name="lomihi"> + <cd:command 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" name="himilo"> + <cd:command file="typo-scr.mkiv" level="document" name="himilo"> <cd:arguments> <cd:content/> <cd:content/> @@ -19593,127 +19697,127 @@ </cd:command> </cd:interface> <cd:interface file="i-lua.xml"> - <cd:command file="back-exp.mkiv" name="taggedctxcommand"> + <cd:command 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" name="luafunction"> + <cd:command 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" name="cldprocessfile"> + <cd:command 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" name="cldloadfile"> + <cd:command 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" name="cldcontext"> + <cd:command 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" name="cldcommand"> + <cd:command 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" name="ctxdirectlua"> + <cd:command 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" name="ctxlatelua"> + <cd:command 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" name="ctxsprint"> + <cd:command 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" name="ctxcommand"> + <cd:command 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" name="ctxdirectcommand"> + <cd:command 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" name="ctxlatecommand"> + <cd:command 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" name="ctxreport"> + <cd:command 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" name="ctxlua"> + <cd:command 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" name="luacode"> + <cd:command 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" name="lateluacode"> + <cd:command 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" name="directluacode"> + <cd:command 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" name="luaversion"/> - <cd:command file="luat-cod.mkiv" name="registerctxluafile"> + <cd:command file="luat-cod.mkiv" level="system" name="luaversion"/> + <cd:command file="luat-cod.mkiv" level="system" name="registerctxluafile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -19723,32 +19827,32 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-cod.mkiv" name="ctxloadluafile"> + <cd:command 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" name="lua" type="environment"/> - <cd:command file="luat-ini.mkiv" name="luacode" type="environment"/> - <cd:command file="luat-ini.mkiv" name="luamajorversion"/> - <cd:command file="luat-ini.mkiv" name="luaminorversion"/> - <cd:command file="luat-ini.mkiv" name="luaexpanded"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="luaparameterset" type="environment"> + <cd:command 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" name="luaparameterset"> + <cd:command file="luat-ini.mkiv" level="system" name="luaparameterset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -19756,52 +19860,52 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="luaconditional"> + <cd:command file="luat-ini.mkiv" level="system" name="luaconditional"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="ctxluacode"> + <cd:command 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" name="ctxfunctiondefinition" type="environment"> + <cd:command 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" name="ctxfunctiondefinition" variant="example"> + <cd:command 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" name="ctxfunction" type="environment"> + <cd:command 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" name="ctxfunction"> + <cd:command 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" name="ctxfunction" variant="example"> + <cd:command 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" name="definemakeup"> + <cd:command file="page-mak.mkvi" level="style" name="definemakeup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19814,7 +19918,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" name="setupmakeup"> + <cd:command file="page-mak.mkvi" level="style" name="setupmakeup"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19914,7 +20018,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" name="makeup" type="environment"> + <cd:command file="page-mak.mkvi" level="document" name="makeup" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19924,7 +20028,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mak.mkvi" generated="yes" name="makeup" type="environment" variant="instance"> + <cd:command file="page-mak.mkvi" generated="yes" level="document" name="makeup" type="environment" variant="instance"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> @@ -19934,11 +20038,16 @@ <cd:inherit name="setupmakeup"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="standard"/> + <cd:constant value="page"/> + <cd:constant value="text"/> + <cd:constant value="middle"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-marginblock.xml"> - <cd:command file="page-mbk.mkvi" name="definemarginblock"> + <cd:command file="page-mbk.mkvi" level="style" name="definemarginblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19951,7 +20060,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mbk.mkvi" name="setupmarginblock"> + <cd:command file="page-mbk.mkvi" level="style" name="setupmarginblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20013,7 +20122,7 @@ </cd:command> </cd:interface> <cd:interface file="i-margindata.xml"> - <cd:command file="typo-mar.mkiv" name="definemargindata"> + <cd:command file="typo-mar.mkiv" level="style" name="definemargindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20026,7 +20135,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" name="setupmargindata"> + <cd:command file="typo-mar.mkiv" level="style" name="setupmargindata"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20121,7 +20230,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" name="setupmarginframed"> + <cd:command file="typo-mar.mkiv" level="style" name="setupmarginframed"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20131,7 +20240,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-mar.mkiv" generated="yes" name="margindata" variant="instance"> + <cd:command file="typo-mar.mkiv" generated="yes" level="document" name="margindata" variant="instance"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -20147,9 +20256,27 @@ </cd:assignments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="inleftmargin"/> + <cd:constant value="inrightmargin"/> + <cd:constant value="inoutermargin"/> + <cd:constant value="ininnermargin"/> + <cd:constant value="inleftedge"/> + <cd:constant value="inrightedge"/> + <cd:constant value="inouteredge"/> + <cd:constant value="ininneredge"/> + <cd:constant value="atleftmargin"/> + <cd:constant value="atrightmargin"/> + <cd:constant value="inleft"/> + <cd:constant value="inright"/> + <cd:constant value="inouter"/> + <cd:constant value="ininner"/> + <cd:constant value="inmargin"/> + <cd:constant value="inother"/> + <cd:constant value="margintext"/> + </cd:instances> </cd:command> - <cd:command file="typo-mar.mkiv" name="margindata"> + <cd:command file="typo-mar.mkiv" level="document" name="margindata"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20168,14 +20295,14 @@ </cd:command> </cd:interface> <cd:interface file="i-marker.xml"> - <cd:command file="attr-mkr.mkiv" name="definemarker"> + <cd:command 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" name="setmarker"> + <cd:command file="attr-mkr.mkiv" level="system" name="setmarker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20185,14 +20312,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="attr-mkr.mkiv" name="resetmarker"> + <cd:command 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" name="boxmarker"> + <cd:command file="attr-mkr.mkiv" level="system" name="boxmarker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20204,7 +20331,7 @@ </cd:command> </cd:interface> <cd:interface file="i-marking.xml"> - <cd:command file="strc-mar.mkiv" name="definemarking"> + <cd:command file="strc-mar.mkiv" level="style" name="definemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20217,7 +20344,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="setupmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="setupmarking"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:mark"/> @@ -20240,7 +20367,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="relatemarking"> + <cd:command file="strc-mar.mkiv" level="system" name="relatemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20267,7 +20394,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="synchronizemarking"> + <cd:command file="strc-mar.mkiv" level="system" name="synchronizemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20280,7 +20407,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="doifelsemarking"> + <cd:command file="strc-mar.mkiv" level="system" name="doifelsemarking"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -20293,7 +20420,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="doifmarkingelse"> + <cd:command file="strc-mar.mkiv" level="system" name="doifmarkingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:mark"/> @@ -20306,7 +20433,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="getmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="getmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20335,7 +20462,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchonemark"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchonemark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20360,21 +20487,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchtwomarks"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarks"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchallmarks"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarks"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchmark"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchmark"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20399,7 +20526,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchmarking"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchmarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20428,7 +20555,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchonemarking"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchonemarking"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20457,7 +20584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchtwomarkings"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchtwomarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20468,7 +20595,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-mar.mkiv" name="fetchallmarkings"> + <cd:command file="strc-mar.mkiv" level="style" name="fetchallmarkings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:mark"/> @@ -20481,7 +20608,7 @@ </cd:command> </cd:interface> <cd:interface file="i-math.xml"> - <cd:command category="mathematics" file="math-ini.mkiv" name="definemathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathematics"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20494,7 +20621,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="setupmathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="setupmathematics"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -20589,13 +20716,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="inlineordisplaymath"> + <cd:command file="math-ini.mkiv" level="system" name="inlineordisplaymath"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathematics"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathematics"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20603,7 +20730,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="math"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="math"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20611,7 +20738,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="m"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="m"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -20619,7 +20746,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="definemathcommand"> + <cd:command category="mathematics" file="math-ini.mkiv" level="style" name="definemathcommand"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -20650,7 +20777,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" generated="yes" name="mathcommand" variant="example"> + <cd:command category="mathematics" file="math-ini.mkiv" generated="yes" name="mathcommand" variant="example"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -20663,7 +20790,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathcommand"> + <cd:command category="mathematics" file="math-ini.mkiv" name="mathcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20685,17 +20812,17 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mathfunction"> + <cd:command file="math-ini.mkiv" name="mathfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command category="mathematics" file="math-ini.mkiv" name="mfunction"> + <cd:command file="math-ini.mkiv" name="mfunction"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mfunctionlabeltext"> + <cd:command file="math-ini.mkiv" level="system" name="mfunctionlabeltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -20784,18 +20911,18 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="math-ini.mkiv" name="mathstyle" type="environment"/> - <cd:command file="math-ini.mkiv" name="usemathstyleparameter"> + <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:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="usemathstyleparameter" type="environment"> + <cd:command file="math-ini.mkiv" level="system" name="usemathstyleparameter" type="environment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtext"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtext"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20805,7 +20932,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtexttf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtexttf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20815,7 +20942,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextit"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextit"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20825,7 +20952,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextsl"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextsl"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20835,7 +20962,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20845,7 +20972,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbi"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbi"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20855,7 +20982,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathtextbs"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtextbs"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20865,7 +20992,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathword"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathword"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20875,7 +21002,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordtf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordtf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20885,7 +21012,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordit"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordit"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20895,7 +21022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordsl"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordsl"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20905,7 +21032,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbf"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbf"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20915,7 +21042,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbi"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbi"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20925,7 +21052,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathwordbs"> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathwordbs"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -20935,21 +21062,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ini.mkiv" name="mathrm"/> - <cd:command file="math-ini.mkiv" name="mathss"/> - <cd:command file="math-ini.mkiv" name="mathtt"/> - <cd:command file="math-ini.mkiv" name="mathtf"/> - <cd:command file="math-ini.mkiv" name="mathsl"/> - <cd:command file="math-ini.mkiv" name="mathit"/> - <cd:command file="math-ini.mkiv" name="mathbf"/> - <cd:command file="math-ini.mkiv" name="mathbi"/> - <cd:command file="math-ini.mkiv" name="mathbs"/> - <cd:command file="math-ini.mkiv" name="mathitalic"/> - <cd:command file="math-ini.mkiv" name="mathupright"/> - <cd:command file="math-ini.mkiv" name="mathdefault"/> - <cd:command file="math-ini.mkiv" name="mathscript"/> - <cd:command file="math-ini.mkiv" name="mathfraktur"/> - <cd:command file="math-ini.mkiv" name="mathblackboard"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathrm"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathss"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtt"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathtf"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathsl"/> + <cd:command category="mathematics" file="math-ini.mkiv" level="document" name="mathit"/> + <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:arguments> <cd:content/> @@ -21008,9 +21135,22 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command file="math-del.mkiv" name="autointegral"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-mathalignment.xml"> - <cd:command file="math-ali.mkiv" name="definemathalignment"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathalignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21023,7 +21163,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathalignment"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathalignment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21047,7 +21187,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathalignment" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathalignment" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> @@ -21056,11 +21196,14 @@ <cd:inherit name="setupmathalignment"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="align"/> + <cd:constant value="mathalignment"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-mathcases.xml"> - <cd:command file="math-ali.mkiv" name="definemathcases"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathcases"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21073,7 +21216,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathcases"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathcases"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21102,7 +21245,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathcases" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathcases" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> @@ -21111,11 +21254,14 @@ <cd:inherit name="setupmathcases"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="cases"/> + <cd:constant value="mathcases"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-mathfence.xml"> - <cd:command file="math-fen.mkiv" name="definemathfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="definemathfence"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21128,7 +21274,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="setupmathfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="style" name="setupmathfence"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21166,14 +21312,14 @@ <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="factor"> - <cd:constant default="yes" type="auto"/> <cd:constant type="none"/> - <cd:constant type="number"/> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" generated="yes" name="fence" variant="example"> + <cd:command category="mathematics" file="math-fen.mkiv" generated="yes" level="document" name="fence" variant="example"> <cd:sequence> <cd:variable value="fence"/> </cd:sequence> @@ -21181,7 +21327,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="fenced"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fenced"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21189,165 +21335,165 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="fence"/> - <cd:command file="math-fen.mkiv" name="left"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="fence"/> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="left"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="middle"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="middle"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="right"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="right"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="big"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="big"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Big"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Big"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigg"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigg"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigg"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigg"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="bigr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="bigr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Bigr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Bigr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="biggr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="biggr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggl"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggl"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggm"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggm"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="Biggr"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="Biggr"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="lfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="lfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="mfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="mfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="rfence"> + <cd:command category="mathematics" file="math-fen.mkiv" level="document" name="rfence"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-fen.mkiv" name="checkedfences" type="environment"/> + <cd:command category="mathematics" file="math-fen.mkiv" name="checkedfences" type="environment"/> </cd:interface> <cd:interface file="i-mathmatrix.xml"> - <cd:command file="math-ali.mkiv" name="definemathmatrix"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="definemathmatrix"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21360,7 +21506,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="setupmathmatrix"> + <cd:command category="mathematics" file="math-ali.mkiv" level="style" name="setupmathmatrix"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21401,7 +21547,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" generated="yes" name="mathmatrix" type="environment" variant="instance"> + <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -21410,25 +21556,28 @@ <cd:inherit name="setupmathmatrix"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="matrix"/> + <cd:constant value="mathmatrix"/> + </cd:instances> </cd:command> - <cd:command file="math-ali.mkiv" name="matrices" type="environment"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="intertext" type="environment"/> - <cd:command file="math-ali.mkiv" name="intertext"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="intertext" type="environment"/> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="intertext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="substack" type="environment"/> - <cd:command file="math-ali.mkiv" name="overset"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="substack" type="environment"/> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="overset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -21438,7 +21587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-ali.mkiv" name="underset"> + <cd:command category="mathematics" file="math-ali.mkiv" level="document" name="underset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -21450,7 +21599,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathornament.xml"> - <cd:command file="math-rad.mkvi" name="definemathornament"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathornament"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21463,7 +21612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="setupmathornament"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="setupmathornament"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21484,7 +21633,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" generated="yes" name="mathornament" variant="example"> + <cd:command category="mathematics" file="math-rad.mkvi" generated="yes" level="document" name="mathornament" variant="example"> <cd:sequence> <cd:variable value="mathornament"/> </cd:sequence> @@ -21494,7 +21643,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathradical.xml"> - <cd:command file="math-rad.mkvi" name="definemathradical"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="definemathradical"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21507,7 +21656,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="setupmathradical"> + <cd:command category="mathematics" file="math-rad.mkvi" level="style" name="setupmathradical"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21530,7 +21679,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" generated="yes" name="mathradical" variant="example"> + <cd:command category="mathematics" file="math-rad.mkvi" generated="yes" level="document" name="mathradical" variant="example"> <cd:sequence> <cd:variable value="mathradical"/> </cd:sequence> @@ -21541,7 +21690,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="math-rad.mkvi" name="sqrt"> + <cd:command category="mathematics" file="math-rad.mkvi" level="document" name="sqrt"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -21551,7 +21700,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mathstackers.xml"> - <cd:command file="math-stc.mkvi" name="definemathstackers"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="definemathstackers"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -21564,7 +21713,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="setupmathstackers"> + <cd:command category="mathematics" file="math-stc.mkvi" level="style" name="setupmathstackers"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -21658,7 +21807,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -21674,7 +21823,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathextensible" variant="example"> <cd:sequence> <cd:variable value="mathextensible"/> </cd:sequence> @@ -21693,7 +21842,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathoverextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathoverextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -21707,7 +21856,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathoverextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathoverextensible" variant="example"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -21717,7 +21866,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathunderextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathunderextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bottom"/> @@ -21731,7 +21880,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathunderextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathunderextensible" variant="example"> <cd:sequence> <cd:variable value="mathunderextensible"/> </cd:sequence> @@ -21741,7 +21890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathdoubleextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathdoubleextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="both"/> @@ -21758,7 +21907,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathdoubleextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathdoubleextensible" variant="example"> <cd:sequence> <cd:variable value="mathdoubleextensible"/> </cd:sequence> @@ -21768,7 +21917,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathovertextextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathovertextextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bothtext"/> @@ -21781,7 +21930,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathovertextextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathovertextextensible" variant="example"> <cd:sequence> <cd:variable value="mathovertextextensible"/> </cd:sequence> @@ -21794,7 +21943,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathundertextextensible"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathundertextextensible"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bothtext"/> @@ -21807,7 +21956,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathundertextextensible" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathundertextextensible" variant="example"> <cd:sequence> <cd:variable value="mathundertextextensible"/> </cd:sequence> @@ -21820,7 +21969,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-sty.mkvi" name="definemathtriplet"> + <cd:command category="mathematics" file="math-sty.mkvi" name="definemathtriplet"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -21833,7 +21982,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathtriplet" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathtriplet" variant="example"> <cd:sequence> <cd:variable value="mathtriplet"/> </cd:sequence> @@ -21852,7 +22001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mathtriplet"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mathtriplet"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -21868,7 +22017,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21878,7 +22027,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xequal"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xequal"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21888,7 +22037,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21898,7 +22047,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21908,7 +22057,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xleftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xleftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21918,7 +22067,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xLeftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xLeftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21928,7 +22077,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xRightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xRightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21938,7 +22087,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xLeftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xLeftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21948,7 +22097,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xtwoheadleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xtwoheadleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21958,7 +22107,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xtwoheadrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xtwoheadrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21968,7 +22117,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xmapsto"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xmapsto"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21978,7 +22127,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xhookleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xhookleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21988,7 +22137,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xhookrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xhookrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -21998,7 +22147,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xleftharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xleftharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22008,7 +22157,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xleftharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xleftharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22018,7 +22167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrightharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrightharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22028,7 +22177,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrightharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrightharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22038,7 +22187,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrightoverleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrightoverleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22048,7 +22197,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xleftrightharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xleftrightharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22058,7 +22207,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xrightleftharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xrightleftharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22068,7 +22217,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="xtriplerel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="xtriplerel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22078,7 +22227,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22088,7 +22237,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mequal"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mequal"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22098,7 +22247,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22108,7 +22257,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22118,7 +22267,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mleftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mleftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22128,7 +22277,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mLeftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mLeftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22138,7 +22287,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mRightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mRightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22148,7 +22297,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mLeftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mLeftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22158,7 +22307,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mtwoheadleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mtwoheadleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22168,7 +22317,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mtwoheadrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mtwoheadrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22178,7 +22327,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mmapsto"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mmapsto"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22188,7 +22337,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mhookleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mhookleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22198,7 +22347,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mhookrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mhookrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22208,7 +22357,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mleftharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mleftharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22218,7 +22367,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mleftharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mleftharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22228,7 +22377,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrightharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrightharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22238,7 +22387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrightharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrightharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22248,7 +22397,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrightoverleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrightoverleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22258,7 +22407,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mleftrightharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mleftrightharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22268,7 +22417,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mrightleftharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mrightleftharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22278,7 +22427,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="mtriplerel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="mtriplerel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22288,7 +22437,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eleftarrowfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eleftarrowfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22298,7 +22447,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="erightarrowfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="erightarrowfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22308,7 +22457,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eleftrightarrowfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eleftrightarrowfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22318,7 +22467,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="etwoheadrightarrowfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="etwoheadrightarrowfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22328,7 +22477,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eleftharpoondownfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eleftharpoondownfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22338,7 +22487,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eleftharpoonupfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eleftharpoonupfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22348,7 +22497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="erightharpoondownfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="erightharpoondownfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22358,7 +22507,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="erightharpoonupfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="erightharpoonupfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22368,7 +22517,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbarfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbarfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22378,7 +22527,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbarfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbarfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22388,7 +22537,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbracefill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbracefill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22398,7 +22547,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbracefill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbracefill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22408,7 +22557,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eoverparentfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eoverparentfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22418,7 +22567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eunderparentfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eunderparentfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22428,7 +22577,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eoverbracketfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eoverbracketfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22438,7 +22587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="eunderbracketfill"> + <cd:command category="mathematics" file="math-stc.mkvi" name="eunderbracketfill"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22448,7 +22597,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22458,7 +22607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tequal"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tequal"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22468,7 +22617,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tmapsto"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tmapsto"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22478,7 +22627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22488,7 +22637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22498,7 +22647,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tleftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tleftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22508,7 +22657,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tLeftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tLeftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22518,7 +22667,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tRightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tRightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22528,7 +22677,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tLeftrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tLeftrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22538,7 +22687,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="ttwoheadleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="ttwoheadleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22548,7 +22697,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="ttwoheadrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="ttwoheadrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22558,7 +22707,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="thookleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="thookleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22568,7 +22717,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="thookrightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="thookrightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22578,7 +22727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tleftharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tleftharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22588,7 +22737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tleftharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tleftharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22598,7 +22747,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trightharpoondown"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trightharpoondown"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22608,7 +22757,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trightharpoonup"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trightharpoonup"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22618,7 +22767,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trightoverleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trightoverleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22628,7 +22777,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="tleftrightharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="tleftrightharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22638,7 +22787,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="trightleftharpoons"> + <cd:command category="mathematics" file="math-stc.mkvi" name="trightleftharpoons"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22648,7 +22797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="ttriplerel"> + <cd:command category="mathematics" file="math-stc.mkvi" name="ttriplerel"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22658,7 +22807,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="cleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="cleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22668,7 +22817,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="crightarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="crightarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22678,7 +22827,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="crightoverleftarrow"> + <cd:command category="mathematics" file="math-stc.mkvi" name="crightoverleftarrow"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -22688,245 +22837,245 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underleftarrow"> + <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 file="math-stc.mkvi" name="underrightarrow"> + <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 file="math-stc.mkvi" name="underleftrightarrow"> + <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 file="math-stc.mkvi" name="undertwoheadleftarrow"> + <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 file="math-stc.mkvi" name="undertwoheadrightarrow"> + <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 file="math-stc.mkvi" name="underleftharpoondown"> + <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 file="math-stc.mkvi" name="underleftharpoonup"> + <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 file="math-stc.mkvi" name="underrightharpoondown"> + <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 file="math-stc.mkvi" name="underrightharpoonup"> + <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 file="math-stc.mkvi" name="underbar"> + <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 file="math-stc.mkvi" name="underbrace"> + <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 file="math-stc.mkvi" name="underparent"> + <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 file="math-stc.mkvi" name="underbracket"> + <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 file="math-stc.mkvi" name="overleftarrow"> + <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 file="math-stc.mkvi" name="overrightarrow"> + <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 file="math-stc.mkvi" name="overleftrightarrow"> + <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 file="math-stc.mkvi" name="overtwoheadleftarrow"> + <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 file="math-stc.mkvi" name="overtwoheadrightarrow"> + <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 file="math-stc.mkvi" name="overleftharpoondown"> + <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 file="math-stc.mkvi" name="overleftharpoonup"> + <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 file="math-stc.mkvi" name="overrightharpoondown"> + <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 file="math-stc.mkvi" name="overrightharpoonup"> + <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 file="math-stc.mkvi" name="overbar"> + <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 file="math-stc.mkvi" name="overbrace"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbrace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overparent"> + <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 file="math-stc.mkvi" name="overbracket"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbracket"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="doublebar"> + <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 file="math-stc.mkvi" name="doublebrace"> + <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 file="math-stc.mkvi" name="doubleparent"> + <cd:command category="mathematics" file="math-stc.mkvi" name="doubleparent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="doublebracket"> + <cd:command category="mathematics" file="math-stc.mkvi" name="doublebracket"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbarunderbar"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbarunderbar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbraceunderbrace"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbraceunderbrace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overparentunderparent"> + <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:command> - <cd:command file="math-stc.mkvi" name="overbracketunderbracket"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbracketunderbracket"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbartext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbartext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22936,7 +23085,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbracetext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbracetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22946,7 +23095,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overparenttext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overparenttext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22956,7 +23105,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="overbrackettext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="overbrackettext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22966,7 +23115,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underbartext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="underbartext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22976,7 +23125,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underbracetext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="underbracetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22986,7 +23135,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underparenttext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="underparenttext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -22996,7 +23145,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" name="underbrackettext"> + <cd:command category="mathematics" file="math-stc.mkvi" name="underbrackettext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -23009,7 +23158,7 @@ <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 file="math-stc.mkvi" name="definemathunstacked"> + <cd:command category="mathematics" file="math-stc.mkvi" name="definemathunstacked"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -23022,7 +23171,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="math-stc.mkvi" generated="yes" name="mathunstacked" variant="example"> + <cd:command category="mathematics" file="math-stc.mkvi" generated="yes" name="mathunstacked" variant="example"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> @@ -23033,22 +23182,22 @@ <cd:command file="math-stc.mkvi" name="iff"/> </cd:interface> <cd:interface file="i-metapost.xml"> - <cd:command file="meta-ini.mkiv" name="MPdefinitions" type="environment"> + <cd:command category="graphics" 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 file="meta-ini.mkiv" name="MPextensions" type="environment"> + <cd:command category="graphics" 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 file="meta-ini.mkiv" name="MPinitializations" type="environment"/> - <cd:command file="meta-ini.mkiv" name="MPinclusions" type="environment"> + <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:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -23058,7 +23207,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPinclusions"> + <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="MPinclusions"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="+"/> @@ -23069,7 +23218,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="defineMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="defineMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23082,7 +23231,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setupMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" level="style" name="setupMPinstance"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23120,43 +23269,43 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPinstance"> + <cd:command category="graphics" file="meta-ini.mkiv" name="resetMPinstance"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="processMPfigurefile"> + <cd:command category="graphics" file="meta-ini.mkiv" name="processMPfigurefile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPdrawing" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPdrawing" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPdrawing"/> - <cd:command file="meta-ini.mkiv" name="getMPdrawing"/> - <cd:command begin="push" end="pop" file="meta-ini.mkiv" name="MPdrawing" type="environment"/> - <cd:command file="meta-ini.mkiv" name="MPdrawing"> + <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:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPclip" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPclip" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPfontsizehskip"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPfontsizehskip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:font"/> @@ -23233,7 +23382,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23243,7 +23392,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23255,7 +23404,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="useMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23265,7 +23414,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="useMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23277,7 +23426,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="usableMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="usableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23287,7 +23436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reuseMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="reuseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23299,7 +23448,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reusableMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="reusableMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23309,7 +23458,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="reusableMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="reusableMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23321,7 +23470,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPpagegraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPpagegraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23331,7 +23480,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="uniqueMPpagegraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="uniqueMPpagegraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23343,21 +23492,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="processMPbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" name="processMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="runMPbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" name="runMPbuffer"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPenvironment" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPenvironment" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -23366,22 +23515,22 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="resetMPenvironment"/> - <cd:command file="meta-ini.mkiv" name="useMPenvironmentbuffer"> + <cd:command category="graphics" file="meta-ini.mkiv" name="resetMPenvironment"/> + <cd:command category="graphics" file="meta-ini.mkiv" name="useMPenvironmentbuffer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPcode" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="MPcode"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPcode"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:name"/> @@ -23389,14 +23538,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPrun" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" 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 file="meta-ini.mkiv" name="useMPrun"> + <cd:command category="graphics" file="meta-ini.mkiv" name="useMPrun"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23406,14 +23555,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="useMPlibrary"> + <cd:command category="graphics" file="meta-ini.mkiv" name="useMPlibrary"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setMPtext"> + <cd:command category="graphics" file="meta-ini.mkiv" name="setMPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23423,28 +23572,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPtext"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPstring"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="MPbetex"> + <cd:command category="graphics" file="meta-ini.mkiv" name="MPbetex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="doifelseMPgraphic"> + <cd:command category="graphics" file="meta-ini.mkiv" name="doifelseMPgraphic"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23457,7 +23606,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="doifMPgraphicelse"> + <cd:command category="graphics" file="meta-ini.mkiv" name="doifMPgraphicelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23470,14 +23619,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="staticMPfigure" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="staticMPfigure" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="staticMPgraphic" type="environment"> + <cd:command category="graphics" file="meta-ini.mkiv" name="staticMPgraphic" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23487,7 +23636,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="usestaticMPfigure"> + <cd:command category="graphics" file="meta-ini.mkiv" name="usestaticMPfigure"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupscale"/> @@ -23497,7 +23646,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="meta-ini.mkiv" name="setupMPgraphics"> + <cd:command category="graphics" file="meta-ini.mkiv" name="setupMPgraphics"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -23512,7 +23661,7 @@ </cd:command> </cd:interface> <cd:interface file="i-mixedcolumns.xml"> - <cd:command file="page-mix.mkiv" name="definemixedcolumns"> + <cd:command file="page-mix.mkiv" level="style" name="definemixedcolumns"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -23525,7 +23674,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" name="setupmixedcolumns"> + <cd:command file="page-mix.mkiv" level="style" name="setupmixedcolumns"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -23608,7 +23757,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" name="mixedcolumns" type="environment"> + <cd:command file="page-mix.mkiv" level="document" name="mixedcolumns" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -23618,7 +23767,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-mix.mkiv" generated="yes" name="mixedcolumns" type="environment" variant="instance"> + <cd:command file="page-mix.mkiv" generated="yes" level="document" name="mixedcolumns" type="environment" variant="instance"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> @@ -23627,46 +23776,49 @@ <cd:inherit name="setupmixedcolumns"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="itemgroupcolumns"/> + <cd:constant value="boxedcolumns"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-modes.xml"> - <cd:command file="core-env.mkiv" name="newmode"> + <cd:command 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" name="setmode"> + <cd:command 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" name="resetmode"> + <cd:command 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" name="newsystemmode"> + <cd:command 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" name="setsystemmode"> + <cd:command 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" name="resetsystemmode"> + <cd:command file="core-env.mkiv" level="system" name="resetsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23694,21 +23846,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="globalpreventmode"> + <cd:command 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" name="globalenablemode"> + <cd:command 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" name="globaldisablemode"> + <cd:command file="core-env.mkiv" level="system" name="globaldisablemode"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -23727,7 +23879,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="booleanmodevalue"> + <cd:command file="core-env.mkiv" level="system" name="booleanmodevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23869,28 +24021,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="pushmode"> + <cd:command 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" name="popmode"> + <cd:command 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" name="pushsystemmode"> + <cd:command 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" name="popsystemmode"> + <cd:command file="core-env.mkiv" level="system" name="popsystemmode"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -23899,7 +24051,7 @@ </cd:command> </cd:interface> <cd:interface file="i-modules.xml"> - <cd:command file="file-mod.mkvi" name="usemodule"> + <cd:command file="file-mod.mkvi" level="style" name="usemodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -23937,21 +24089,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="module" type="environment"> + <cd:command file="file-mod.mkvi" level="system" name="module" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="module" type="environment" variant="string"> + <cd:command file="file-mod.mkvi" level="system" name="module" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="setupmodule"> + <cd:command file="file-mod.mkvi" level="system" name="setupmodule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:file"/> @@ -23967,7 +24119,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="moduleparameter"> + <cd:command file="file-mod.mkvi" level="system" name="moduleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -23977,15 +24129,15 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="currentmoduleparameter"> + <cd:command file="file-mod.mkvi" level="system" name="currentmoduleparameter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="moduletestsection" type="environment"/> - <cd:command file="file-mod.mkvi" name="fetchruntinecommand"> + <cd:command file="file-mod.mkvi" level="system" name="moduletestsection" type="environment"/> + <cd:command file="file-mod.mkvi" level="system" name="fetchruntinecommand"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -23993,14 +24145,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="luaenvironment"> + <cd:command file="file-mod.mkvi" level="system" name="luaenvironment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="useluamodule"> + <cd:command file="file-mod.mkvi" level="system" name="useluamodule"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -24009,7 +24161,7 @@ </cd:command> </cd:interface> <cd:interface file="i-narrow.xml"> - <cd:command file="spac-hor.mkiv" name="definenarrower"> + <cd:command file="spac-hor.mkiv" level="style" name="definenarrower"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24022,7 +24174,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="setupnarrower"> + <cd:command file="spac-hor.mkiv" level="style" name="setupnarrower"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24055,7 +24207,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrower" type="environment"> + <cd:command 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"/> @@ -24068,7 +24220,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" generated="yes" name="narrower" type="environment" variant="example"> + <cd:command file="spac-hor.mkiv" generated="yes" level="document" name="narrower" type="environment" variant="example"> <cd:sequence> <cd:variable value="narrower"/> </cd:sequence> @@ -24084,7 +24236,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment"> + <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24094,7 +24246,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment" variant="name"> + <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24110,7 +24262,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-hor.mkiv" name="narrow" type="environment" variant="assignment"> + <cd:command file="spac-hor.mkiv" level="document" name="narrow" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> @@ -24128,7 +24280,7 @@ </cd:command> </cd:interface> <cd:interface file="i-naturaltable.xml"> - <cd:command file="tabl-ntb.mkiv" name="setupTABLE"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="setupTABLE"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="r"/> @@ -24248,14 +24400,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLE" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TD" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TD" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="nx"> @@ -24283,77 +24435,77 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TR" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TR" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TC" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TC" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TX" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TX" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TY" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TY" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TH" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TH" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TN" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TN" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="bTD"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLEhead" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLEnext" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLEbody" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TABLEfoot" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="defineTABLEsetup"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="style" name="defineTABLEsetup"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24363,49 +24515,49 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TDs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" name="TDs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="tabl-ntb.mkiv" name="TRs" type="environment"> + <cd:command begin="b" category="tables" end="e" file="tabl-ntb.mkiv" name="TRs" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLE" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLE" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLEhead" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEhead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLEnext" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEnext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLEbody" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEbody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-ntb.mkiv" name="TABLEfoot" type="environment"> + <cd:command category="tables" file="tabl-ntb.mkiv" level="document" name="TABLEfoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> @@ -24414,7 +24566,7 @@ </cd:command> </cd:interface> <cd:interface file="i-note.xml"> - <cd:command file="strc-not.mkvi" name="setupnotation"> + <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24588,7 +24740,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnotations"> + <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotations"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24598,7 +24750,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" type="environment" variant="instance:assignment"> + <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24618,9 +24770,12 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" type="environment" variant="instance"> + <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" type="environment" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24629,9 +24784,12 @@ <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" variant="instance"> + <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24643,9 +24801,12 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" generated="yes" name="note" variant="instance:assignment"> + <cd:command category="notes" file="strc-not.mkvi" generated="yes" level="document" name="note" variant="instance:assignment"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -24665,9 +24826,12 @@ </cd:parameter> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> + </cd:instances> </cd:command> - <cd:command file="strc-not.mkvi" name="definenote"> + <cd:command category="notes" file="strc-not.mkvi" level="style" name="definenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24680,7 +24844,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnote"> + <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24813,11 +24977,17 @@ <cd:parameter name="anchor"> <cd:constant type="next"/> </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setupnotes"> + <cd:command category="notes" file="strc-not.mkvi" level="style" name="setupnotes"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -24827,7 +24997,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnote"> + <cd:command category="notes" file="strc-not.mkvi" name="setnote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24840,7 +25010,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnote" variant="assignment"> + <cd:command category="notes" file="strc-not.mkvi" name="setnote" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24861,7 +25031,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnotetext"> + <cd:command category="notes" file="strc-not.mkvi" name="setnotetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24874,7 +25044,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="setnotetext" variant="assignment"> + <cd:command category="notes" file="strc-not.mkvi" name="setnotetext" variant="assignment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24895,7 +25065,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="placenotes"> + <cd:command category="notes" file="strc-not.mkvi" level="document" name="placenotes"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -24905,14 +25075,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="localnotes" type="environment"> + <cd:command category="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 file="strc-not.mkvi" name="placelocalnotes"> + <cd:command category="notes" file="strc-not.mkvi" level="document" name="placelocalnotes"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24922,9 +25092,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="postponenotes"/> - <cd:command file="strc-not.mkvi" name="flushnotes"/> - <cd:command file="strc-not.mkvi" name="doifelsenoteonsamepage"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24937,7 +25107,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="doifnoteonsamepageelse"> + <cd:command category="notes" file="strc-not.mkvi" level="system" name="doifnoteonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24950,7 +25120,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="doifnotescollected"> + <cd:command category="notes" file="strc-not.mkvi" level="system" name="doifnotescollected"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -24960,7 +25130,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="notesymbol"> + <cd:command category="notes" file="strc-not.mkvi" name="notesymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -24970,7 +25140,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="note"> + <cd:command category="notes" file="strc-not.mkvi" level="document" name="note"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -24980,7 +25150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="footnotetext"> + <cd:command category="notes" file="strc-not.mkvi" name="footnotetext"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:reference"/> @@ -24990,7 +25160,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="footnotetext" variant="assignment"> + <cd:command category="notes" file="strc-not.mkvi" name="footnotetext" variant="assignment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -25008,22 +25178,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="placefootnotes"> + <cd:command category="notes" file="strc-not.mkvi" name="placefootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-not.mkvi" name="localfootnotes" type="environment"/> - <cd:command file="strc-not.mkvi" name="placelocalfootnotes"> + <cd:command category="notes" file="strc-not.mkvi" name="localfootnotes" type="environment"/> + <cd:command category="notes" file="strc-not.mkvi" name="placelocalfootnotes"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="definelinenote"> + <cd:command category="notes" file="strc-lnt.mkvi" level="style" name="definelinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25036,7 +25206,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="setuplinenote"> + <cd:command category="notes" file="strc-lnt.mkvi" level="style" name="setuplinenote"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25061,7 +25231,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="linenote" variant="instance"> + <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="linenote" variant="instance"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -25070,9 +25240,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="startlinenote" variant="instance"> + <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="startlinenote" variant="instance"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -25085,9 +25257,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" generated="yes" name="stoplinenote" variant="instance"> + <cd:command category="notes" file="strc-lnt.mkvi" generated="yes" level="document" name="stoplinenote" variant="instance"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -25097,9 +25271,11 @@ <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="linenote"/> + </cd:instances> </cd:command> - <cd:command file="strc-lnt.mkvi" name="fromlinenote"> + <cd:command category="notes" file="strc-lnt.mkvi" level="document" name="fromlinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -25109,7 +25285,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lnt.mkvi" name="tolinenote"> + <cd:command category="notes" file="strc-lnt.mkvi" level="document" name="tolinenote"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> @@ -25118,7 +25294,7 @@ </cd:command> </cd:interface> <cd:interface file="i-object.xml"> - <cd:command file="pack-obj.mkiv" name="ifinobject"> + <cd:command file="pack-obj.mkiv" level="system" name="ifinobject"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -25130,11 +25306,11 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="objectmargin"/> - <cd:command file="pack-obj.mkiv" name="objectwidth"/> - <cd:command file="pack-obj.mkiv" name="objectheight"/> - <cd:command file="pack-obj.mkiv" name="objectdepth"/> - <cd:command file="pack-obj.mkiv" name="setreferencedobject"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25146,7 +25322,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightreferencedobject"> + <cd:command file="pack-obj.mkiv" level="system" name="settightreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25158,7 +25334,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="setunreferencedobject"> + <cd:command file="pack-obj.mkiv" level="system" name="setunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25170,7 +25346,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightunreferencedobject"> + <cd:command file="pack-obj.mkiv" level="system" name="settightunreferencedobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25182,7 +25358,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="setobject"> + <cd:command file="pack-obj.mkiv" level="system" name="setobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25194,7 +25370,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="settightobject"> + <cd:command file="pack-obj.mkiv" level="system" name="settightobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25206,7 +25382,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="getobject"> + <cd:command file="pack-obj.mkiv" level="system" name="getobject"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25216,7 +25392,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="getobjectdimensions"> + <cd:command file="pack-obj.mkiv" level="system" name="getobjectdimensions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25226,9 +25402,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="defaultobjectreference"/> - <cd:command file="pack-obj.mkiv" name="defaultobjectpage"/> - <cd:command file="pack-obj.mkiv" name="doifelseobjectfound"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25244,7 +25420,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifobjectfoundelse"> + <cd:command file="pack-obj.mkiv" level="system" name="doifobjectfoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25260,7 +25436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifelseobjectreferencefound"> + <cd:command file="pack-obj.mkiv" level="system" name="doifelseobjectreferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25276,7 +25452,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-obj.mkiv" name="doifobjectreferencefoundelse"> + <cd:command file="pack-obj.mkiv" level="system" name="doifobjectreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25294,7 +25470,7 @@ </cd:command> </cd:interface> <cd:interface file="i-offset.xml"> - <cd:command file="pack-box.mkiv" name="setupoffsetbox"> + <cd:command file="pack-box.mkiv" level="style" name="setupoffsetbox"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="x"> @@ -25345,7 +25521,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="setupoffset"> + <cd:command file="pack-box.mkiv" level="style" name="setupoffset"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> @@ -25361,7 +25537,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="offset"> + <cd:command file="pack-box.mkiv" level="document" name="offset"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> @@ -25371,7 +25547,7 @@ </cd:command> </cd:interface> <cd:interface file="i-opposite.xml"> - <cd:command file="page-fac.mkiv" name="setupoppositeplacing"> + <cd:command file="page-fac.mkiv" level="style" name="setupoppositeplacing"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -25390,7 +25566,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-fac.mkiv" name="opposite" type="environment"/> + <cd:command 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"> @@ -25447,7 +25623,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="defineornament" variant="collector"> + <cd:command file="pack-box.mkiv" level="style" name="defineornament" variant="collector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25471,7 +25647,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-box.mkiv" name="defineornament" variant="layer"> + <cd:command file="pack-box.mkiv" level="style" name="defineornament" variant="layer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25501,7 +25677,7 @@ </cd:command> </cd:interface> <cd:interface file="i-output.xml"> - <cd:command file="page-otr.mkvi" name="defineoutputroutine"> + <cd:command file="page-otr.mkvi" level="system" name="defineoutputroutine"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25514,7 +25690,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="setupoutputroutine"> + <cd:command file="page-otr.mkvi" level="system" name="setupoutputroutine"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25526,22 +25702,22 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-otr.mkvi" name="setupoutputroutine" variant="name"> + <cd:command 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" name="defineoutputroutinecommand"> + <cd:command 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" name="traceoutputroutines"/> - <cd:command file="page-otr.mkvi" name="installoutputroutine"> + <cd:command file="page-otr.mkvi" level="system" name="traceoutputroutines"/> + <cd:command file="page-otr.mkvi" level="system" name="installoutputroutine"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -25551,7 +25727,7 @@ </cd:command> </cd:interface> <cd:interface file="i-overlay.xml"> - <cd:command file="pack-lyr.mkiv" name="defineoverlay"> + <cd:command file="pack-lyr.mkiv" level="style" name="defineoverlay"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -25571,7 +25747,7 @@ <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" name="doifelseoverlay"> + <cd:command file="pack-rul.mkiv" level="system" name="doifelseoverlay"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25584,7 +25760,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-rul.mkiv" name="doifoverlayelse"> + <cd:command file="pack-rul.mkiv" level="system" name="doifoverlayelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -25599,7 +25775,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagebreak.xml"> - <cd:command file="page-brk.mkiv" name="definepagebreak"> + <cd:command file="page-brk.mkiv" level="style" name="definepagebreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25633,7 +25809,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="pagebreak"> + <cd:command file="page-brk.mkiv" level="document" name="pagebreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="empty"/> @@ -25665,14 +25841,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="page"> + <cd:command file="page-brk.mkiv" level="document" name="page"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="pagebreak"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="definecolumnbreak"> + <cd:command file="page-brk.mkiv" level="style" name="definecolumnbreak"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25689,7 +25865,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="columnbreak"> + <cd:command file="page-brk.mkiv" level="document" name="columnbreak"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="yes"/> @@ -25704,14 +25880,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="column"> + <cd:command file="page-brk.mkiv" level="document" name="column"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="columnbreak"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="definepagechecker"> + <cd:command file="page-brk.mkiv" level="style" name="definepagechecker"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25724,7 +25900,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="setuppagechecker"> + <cd:command file="page-brk.mkiv" level="style" name="setuppagechecker"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25754,7 +25930,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="checkpage"> + <cd:command file="page-brk.mkiv" level="document" name="checkpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25764,7 +25940,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testpage"> + <cd:command file="page-brk.mkiv" level="document" name="testpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25794,7 +25970,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-brk.mkiv" name="testcolumn"> + <cd:command file="page-brk.mkiv" level="document" name="testcolumn"> <cd:arguments> <cd:keywords> <cd:constant type="cd:number"/> @@ -25806,7 +25982,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagecomment.xml"> - <cd:command file="page-com.mkiv" name="setuppagecomment"> + <cd:command file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -25839,7 +26015,7 @@ <cd:command file="page-com.mkiv" name="pagecomment" type="environment"/> </cd:interface> <cd:interface file="i-pagefigure.xml"> - <cd:command file="page-app.mkiv" name="pagefigure"> + <cd:command category="graphics" file="page-app.mkiv" level="document" name="pagefigure"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -25849,7 +26025,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-app.mkiv" name="pagefigure" type="environment"> + <cd:command category="graphics" file="page-app.mkiv" level="document" name="pagefigure" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -25861,7 +26037,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command file="page-cst.mkiv" name="definepagegrid"> + <cd:command file="page-cst.mkiv" level="style" name="definepagegrid"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25874,7 +26050,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegrid"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegrid"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25916,7 +26092,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" generated="yes" name="pagegrid" type="environment" variant="example"> + <cd:command file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> <cd:sequence> <cd:variable value="pagegrid"/> </cd:sequence> @@ -25926,7 +26102,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegrid" type="environment"> + <cd:command file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -25952,7 +26128,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="definepagegridspan"> + <cd:command file="page-cst.mkiv" level="style" name="definepagegridspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -25965,7 +26141,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridspan"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegridspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -25991,7 +26167,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="pagegridspan" type="environment"> + <cd:command file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26008,7 +26184,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="definepagegridarea"> + <cd:command file="page-cst.mkiv" level="style" name="definepagegridarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26021,7 +26197,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridarea"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegridarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26061,7 +26237,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridareatext"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegridareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26071,7 +26247,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridlines"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegridlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26087,7 +26263,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-cst.mkiv" name="setuppagegridstart"> + <cd:command file="page-cst.mkiv" level="style" name="setuppagegridstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26105,7 +26281,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageinjection.xml"> - <cd:command file="page-inj.mkvi" name="definepageinjection"> + <cd:command file="page-inj.mkvi" level="style" name="definepageinjection"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26118,7 +26294,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="setuppageinjection"> + <cd:command file="page-inj.mkvi" level="style" name="setuppageinjection"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26154,7 +26330,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="pageinjection"> + <cd:command file="page-inj.mkvi" level="document" name="pageinjection"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26166,7 +26342,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="pageinjection" variant="assignment"> + <cd:command file="page-inj.mkvi" level="document" name="pageinjection" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppageinjection"/> @@ -26178,7 +26354,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="definepageinjectionalternative"> + <cd:command file="page-inj.mkvi" level="style" name="definepageinjectionalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26191,7 +26367,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-inj.mkvi" name="setuppageinjectionalternative"> + <cd:command file="page-inj.mkvi" level="style" name="setuppageinjectionalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26205,7 +26381,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagelayout.xml"> - <cd:command file="page-plg.mkiv" name="pagearea"> + <cd:command category="layout" file="page-plg.mkiv" name="pagearea"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -26228,7 +26404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-plg.mkiv" name="pagelayout" type="environment"> + <cd:command category="layout" file="page-plg.mkiv" name="pagelayout" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> @@ -26239,14 +26415,14 @@ </cd:command> </cd:interface> <cd:interface file="i-pagenumber.xml"> - <cd:command file="strc-pag.mkiv" name="setuprealpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" name="setuprealpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setupuserpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupuserpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="viewerprefix"> @@ -26263,24 +26439,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setupsubpagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setupsubpagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="setuppagenumber"> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="setuppagenumber"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupuserpagenumber"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="resetuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="resetsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="resetpagenumber"/> - <cd:command file="strc-pag.mkiv" name="setuppagenumbering"> + <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="style" name="setuppagenumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="alternative"> @@ -26333,44 +26509,44 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-pag.mkiv" name="firstrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="lastsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="prevsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextrealpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextuserpagenumber"/> - <cd:command file="strc-pag.mkiv" name="nextsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="firstrealpage"/> - <cd:command file="strc-pag.mkiv" name="firstuserpage"/> - <cd:command file="strc-pag.mkiv" name="firstsubpage"/> - <cd:command file="strc-pag.mkiv" name="prevrealpage"/> - <cd:command file="strc-pag.mkiv" name="prevuserpage"/> - <cd:command file="strc-pag.mkiv" name="prevsubpage"/> - <cd:command file="strc-pag.mkiv" name="nextrealpage"/> - <cd:command file="strc-pag.mkiv" name="nextuserpage"/> - <cd:command file="strc-pag.mkiv" name="nextsubpage"/> - <cd:command file="strc-pag.mkiv" name="lastrealpage"/> - <cd:command file="strc-pag.mkiv" name="lastuserpage"/> - <cd:command file="strc-pag.mkiv" name="lastsubpage"/> - <cd:command file="strc-pag.mkiv" name="realpagenumber"/> - <cd:command file="strc-pag.mkiv" name="userpagenumber"/> - <cd:command file="strc-pag.mkiv" name="subpagenumber"/> - <cd:command file="strc-pag.mkiv" name="pagenumber"/> - <cd:command file="strc-pag.mkiv" name="prefixedpagenumber"/> - <cd:command file="strc-pag.mkiv" name="incrementpagenumber"/> - <cd:command file="strc-pag.mkiv" name="incrementsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="decrementpagenumber"/> - <cd:command file="strc-pag.mkiv" name="decrementsubpagenumber"/> - <cd:command file="strc-pag.mkiv" name="completepagenumber"/> - <cd:command file="strc-pag.mkiv" name="placepagenumber"/> + <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="completepagenumber"/> + <cd:command category="counter" file="strc-pag.mkiv" level="style" name="placepagenumber"/> </cd:interface> <cd:interface file="i-pageselection.xml"> - <cd:command file="page-sel.mkvi" name="insertpages"> + <cd:command file="page-sel.mkvi" level="document" name="insertpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26391,7 +26567,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="filterpages"> + <cd:command file="page-sel.mkvi" level="document" name="filterpages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26415,7 +26591,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="copypages"> + <cd:command file="page-sel.mkvi" level="document" name="copypages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26437,7 +26613,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="combinepages"> + <cd:command file="page-sel.mkvi" level="document" name="combinepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26504,7 +26680,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-sel.mkvi" name="slicepages"> + <cd:command file="page-sel.mkvi" level="document" name="slicepages"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -26553,7 +26729,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pageshift.xml"> - <cd:command file="page-imp.mkiv" name="definepageshift"> + <cd:command file="page-imp.mkiv" level="style" name="definepageshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26567,7 +26743,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-imp.mkiv" name="setuppageshift"> + <cd:command file="page-imp.mkiv" level="style" name="setuppageshift"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="page"/> @@ -26583,7 +26759,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagestate.xml"> - <cd:command file="core-dat.mkiv" name="definepagestate"> + <cd:command file="core-dat.mkiv" level="system" name="definepagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26596,7 +26772,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setuppagestate"> + <cd:command file="core-dat.mkiv" level="system" name="setuppagestate"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26609,7 +26785,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setpagestate"> + <cd:command file="core-dat.mkiv" level="system" name="setpagestate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26620,7 +26796,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="pagestaterealpage"> + <cd:command file="core-dat.mkiv" level="system" name="pagestaterealpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26631,7 +26807,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-dat.mkiv" name="setpagestaterealpageno"> + <cd:command file="core-dat.mkiv" level="system" name="setpagestaterealpageno"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -26644,7 +26820,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pairedbox.xml"> - <cd:command file="pack-com.mkiv" name="definepairedbox"> + <cd:command file="pack-com.mkiv" level="style" name="definepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26657,7 +26833,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="setuppairedbox"> + <cd:command file="pack-com.mkiv" level="style" name="setuppairedbox"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26715,7 +26891,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placepairedbox"> + <cd:command file="pack-com.mkiv" level="document" name="placepairedbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26729,7 +26905,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" name="placepairedbox" type="environment"> + <cd:command file="pack-com.mkiv" level="document" name="placepairedbox" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26739,7 +26915,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="setuppairedbox" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="style" name="setuppairedbox" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="pairedbox"/> @@ -26749,9 +26925,11 @@ <cd:inherit name="setuppairedbox"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="placepairedbox" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -26765,9 +26943,11 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> - <cd:command file="pack-com.mkiv" generated="yes" name="placepairedbox" type="environment" variant="instance"> + <cd:command file="pack-com.mkiv" generated="yes" level="document" name="placepairedbox" type="environment" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -26777,7 +26957,9 @@ <cd:inherit name="setuppairedbox"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + </cd:instances> </cd:command> <cd:command file="pack-com.mkiv" name="placeontopofeachother"> <cd:arguments> @@ -26793,7 +26975,7 @@ </cd:command> </cd:interface> <cd:interface file="i-papersize.xml"> - <cd:command file="page-lay.mkiv" name="definepapersize"> + <cd:command file="page-lay.mkiv" level="style" name="definepapersize"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26829,7 +27011,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="definepapersize" variant="name"> + <cd:command file="page-lay.mkiv" level="style" name="definepapersize" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26842,7 +27024,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppapersize" variant="name"> + <cd:command file="page-lay.mkiv" level="style" name="setuppapersize" variant="name"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -26868,7 +27050,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppapersize"> + <cd:command file="page-lay.mkiv" level="style" name="setuppapersize"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -26953,14 +27135,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-lay.mkiv" name="setuppaper"> + <cd:command 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" name="adaptpapersize"> + <cd:command file="page-lay.mkiv" level="style" name="adaptpapersize"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> @@ -26972,7 +27154,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraph.xml"> - <cd:command file="strc-tag.mkiv" name="defineparagraph"> + <cd:command file="strc-tag.mkiv" level="style" name="defineparagraph"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26985,7 +27167,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="setupparagraph"> + <cd:command file="strc-tag.mkiv" level="style" name="setupparagraph"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -27007,7 +27189,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="paragraph" type="environment"> + <cd:command file="strc-tag.mkiv" level="document" name="paragraph" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27017,7 +27199,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="par" type="environment"> + <cd:command file="strc-tag.mkiv" level="document" name="par" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27027,8 +27209,8 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="b" end="e" file="strc-tag.mkiv" name="par" type="environment"/> - <cd:command file="spac-par.mkiv" name="setupparagraphintro"> + <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:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> @@ -27043,7 +27225,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphnumber.xml"> - <cd:command file="page-par.mkiv" name="setupparagraphnumbering"> + <cd:command file="page-par.mkiv" level="style" name="setupparagraphnumbering"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -27067,7 +27249,7 @@ </cd:command> </cd:interface> <cd:interface file="i-paragraphs.xml"> - <cd:command file="tabl-mis.mkiv" name="defineparagraphs"> + <cd:command file="tabl-mis.mkiv" level="style" name="defineparagraphs"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27080,7 +27262,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="setupparagraphs"> + <cd:command file="tabl-mis.mkiv" level="style" name="setupparagraphs"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -27144,7 +27326,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="setupparagraphs" variant="assignment"> + <cd:command 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"/> @@ -27204,34 +27386,34 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-mis.mkiv" name="paragraphs" type="environment"> + <cd:command 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" name="nextparagraphs"/> - <cd:command file="tabl-mis.mkiv" generated="yes" name="paragraphs" type="environment" variant="example"> + <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:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command file="tabl-mis.mkiv" generated="yes" name="paragraphs" variant="example"> + <cd:command 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" name="nextparagraphs" variant="example"> + <cd:command 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" name="paragraphscell" type="environment"/> + <cd:command file="tabl-mis.mkiv" level="document" name="paragraphscell" type="environment"/> </cd:interface> <cd:interface file="i-parallel.xml"> - <cd:command file="buff-par.mkvi" name="defineparallel"> + <cd:command file="buff-par.mkvi" level="style" name="defineparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27241,7 +27423,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-par.mkvi" name="setupparallel"> + <cd:command file="buff-par.mkvi" level="style" name="setupparallel"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27330,14 +27512,14 @@ </cd:command> </cd:interface> <cd:interface file="i-parbuilder.xml"> - <cd:command file="typo-bld.mkiv" name="defineparbuilder"> + <cd:command 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" name="parbuilder" type="environment"> + <cd:command file="typo-bld.mkiv" level="system" name="parbuilder" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27347,7 +27529,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="typo-bld.mkiv" name="setmainparbuilder"> + <cd:command file="typo-bld.mkiv" level="system" name="setmainparbuilder"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -27359,7 +27541,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pdf.xml"> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetcatalog"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27369,7 +27551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetinfo"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27379,7 +27561,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetname"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27389,7 +27571,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpageattribute"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpageattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27399,7 +27581,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpagesattribute"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpagesattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27409,7 +27591,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpageresource"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpageresource"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27419,7 +27601,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetextgstate"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetextgstate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27429,7 +27611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetcolorspace"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetcolorspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27439,7 +27621,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetpattern"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetpattern"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27449,7 +27631,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendsetshade"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendsetshade"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27459,24 +27641,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="back-pdf.mkiv" name="pdfbackendcurrentresources"/> - <cd:command file="back-pdf.mkiv" name="pdfcolor"> + <cd:command file="back-pdf.mkiv" level="system" name="pdfbackendcurrentresources"/> + <cd:command 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" name="PDFcolor"> + <cd:command 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" name="TransparencyHack"/> - <cd:command file="pack-obj.mkiv" name="lastpredefinedsymbol"/> - <cd:command file="pack-obj.mkiv" name="predefinesymbol"> + <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:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27501,7 +27683,7 @@ </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" name="setuppagetransitions"> + <cd:command file="scrn-pag.mkvi" level="style" name="setuppagetransitions"> <cd:arguments> <cd:keywords> <cd:constant default="yes" type="reset"/> @@ -27540,7 +27722,7 @@ <cd:command file="spac-ver.mkiv" name="setdefaultpenalties"/> </cd:interface> <cd:interface file="i-periods.xml"> - <cd:command file="enco-ini.mkiv" name="setupperiods"> + <cd:command file="enco-ini.mkiv" level="style" name="setupperiods"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> @@ -27559,21 +27741,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="enco-ini.mkiv" name="periods"> + <cd:command 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" name="periods" variant="assignment"> + <cd:command 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" name="unknown"/> + <cd:command file="enco-ini.mkiv" level="document" name="unknown"/> </cd:interface> <cd:interface file="i-phantom.xml"> <cd:command file="supp-box.mkiv" name="phantom"> @@ -27682,7 +27864,7 @@ </cd:command> </cd:interface> <cd:interface file="i-position.xml"> - <cd:command file="anch-pgr.mkiv" name="doifpositionaction"> + <cd:command file="anch-pgr.mkiv" level="system" name="doifpositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27695,7 +27877,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="doifelsepositionaction"> + <cd:command file="anch-pgr.mkiv" level="system" name="doifelsepositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27708,7 +27890,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="doifpositionactionelse"> + <cd:command file="anch-pgr.mkiv" level="system" name="doifpositionactionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -27721,7 +27903,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pgr.mkiv" name="dopositionaction"> + <cd:command file="anch-pgr.mkiv" level="system" name="dopositionaction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28078,21 +28260,21 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiononly"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiononly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setposition"> + <cd:command file="anch-pos.mkiv" level="system" name="setposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiondata"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiondata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28108,7 +28290,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionbox"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionbox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28117,14 +28299,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionstrut"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionstrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositiondataplus"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositiondataplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28143,7 +28325,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="setpositionplus"> + <cd:command file="anch-pos.mkiv" level="system" name="setpositionplus"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28155,7 +28337,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="copyposition"> + <cd:command file="anch-pos.mkiv" level="system" name="copyposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28165,7 +28347,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifposition"> + <cd:command file="anch-pos.mkiv" level="system" name="doifposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28178,7 +28360,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelseposition"> + <cd:command file="anch-pos.mkiv" level="system" name="doifelseposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28191,7 +28373,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifpositionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28204,7 +28386,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositiononpage"> + <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositiononpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28220,7 +28402,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositiononpageelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifpositiononpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28236,14 +28418,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="xypos"> + <cd:command file="anch-pos.mkiv" level="system" name="xypos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="hpos"> + <cd:command file="anch-pos.mkiv" level="system" name="hpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28251,7 +28433,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="vpos"> + <cd:command file="anch-pos.mkiv" level="system" name="vpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28259,14 +28441,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="bpos"> + <cd:command file="anch-pos.mkiv" level="system" name="bpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="epos"> + <cd:command file="anch-pos.mkiv" level="system" name="epos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28274,9 +28456,9 @@ </cd:arguments> </cd:command> <cd:command file="anch-pos.mkiv" name="tracepositions"/> - <cd:command file="anch-pos.mkiv" name="enableparpositions"/> - <cd:command file="anch-pos.mkiv" name="disableparpositions"/> - <cd:command file="anch-pos.mkiv" name="doifelseoverlapping"> + <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:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28292,7 +28474,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifoverlappingelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifoverlappingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28308,7 +28490,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsonsamepage"> + <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsonsamepage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28321,7 +28503,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsonsamepageelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsonsamepageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28334,7 +28516,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsonthispage"> + <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsonthispage"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28347,7 +28529,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsonthispageelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsonthispageelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -28360,7 +28542,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifelsepositionsused"> + <cd:command file="anch-pos.mkiv" level="system" name="doifelsepositionsused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28370,7 +28552,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="anch-pos.mkiv" name="doifpositionsusedelse"> + <cd:command file="anch-pos.mkiv" level="system" name="doifpositionsusedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -28382,7 +28564,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positionbar.xml"> - <cd:command file="pack-bar.mkiv" name="setuppositionbar"> + <cd:command file="pack-bar.mkiv" level="style" name="setuppositionbar"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -28446,7 +28628,7 @@ </cd:command> </cd:interface> <cd:interface file="i-positioning.xml"> - <cd:command file="pack-pos.mkiv" name="definepositioning"> + <cd:command file="pack-pos.mkiv" level="style" name="definepositioning"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28459,7 +28641,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="setuppositioning"> + <cd:command file="pack-pos.mkiv" level="style" name="setuppositioning"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28522,7 +28704,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="positioning" type="environment"> + <cd:command file="pack-pos.mkiv" level="document" name="positioning" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28532,7 +28714,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-pos.mkiv" name="position"> + <cd:command file="pack-pos.mkiv" level="document" name="position"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> @@ -28543,7 +28725,7 @@ </cd:command> </cd:interface> <cd:interface file="i-postponing.xml"> - <cd:command file="page-pst.mkiv" name="postponing" type="environment"> + <cd:command 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"/> @@ -28552,7 +28734,7 @@ </cd:command> </cd:interface> <cd:interface file="i-processor.xml"> - <cd:command file="typo-prc.mkvi" name="defineprocessor"> + <cd:command file="typo-prc.mkvi" level="style" name="defineprocessor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28565,7 +28747,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" name="setupprocessor"> + <cd:command file="typo-prc.mkvi" level="style" name="setupprocessor"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28594,7 +28776,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="typo-prc.mkvi" name="applyprocessor"> + <cd:command file="typo-prc.mkvi" level="system" name="applyprocessor"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -28604,7 +28786,7 @@ </cd:command> </cd:interface> <cd:interface file="i-profile.xml"> - <cd:command file="spac-prf.mkvi" name="defineprofile"> + <cd:command file="spac-prf.mkvi" level="style" name="defineprofile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28617,7 +28799,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="setupprofile"> + <cd:command file="spac-prf.mkvi" level="style" name="setupprofile"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28660,12 +28842,12 @@ </cd:arguments> </cd:command> <cd:command file="spac-prf.mkvi" name="resetprofile"/> - <cd:command file="spac-prf.mkvi" name="useprofileparameter"> + <cd:command file="spac-prf.mkvi" level="system" name="useprofileparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="profiledbox"> + <cd:command file="spac-prf.mkvi" level="system" name="profiledbox"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="none"/> @@ -28682,7 +28864,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-prf.mkvi" name="profilegivenbox"> + <cd:command file="spac-prf.mkvi" level="system" name="profilegivenbox"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> @@ -28701,28 +28883,28 @@ </cd:command> </cd:interface> <cd:interface file="i-publication.xml"> - <cd:command file="publ-ini.mkiv" name="btxrenderingdefinitions" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxrenderingdefinitions" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="loadbtxdefinitionfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="loadbtxdefinitionfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="loadbtxreplacementfile"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="loadbtxreplacementfile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="definebtx"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28735,7 +28917,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtx"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtx"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -28823,21 +29005,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtx" variant="name"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtx" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usingbtxspecification" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="usingbtxspecification" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="definebtxdataset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28850,7 +29032,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxdataset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28862,7 +29044,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="definebtxregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28875,7 +29057,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxregister"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="setupbtxregister"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -28914,7 +29096,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="definebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="definebtxrendering"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -28927,7 +29109,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxrendering"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -29002,7 +29184,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="usebtxdataset"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29017,7 +29199,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="publication" type="environment"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="publication" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29038,7 +29220,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="setupbtxlist"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="style" name="setupbtxlist"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29048,7 +29230,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="completebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="completebtxrendering"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29058,7 +29240,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placebtxrendering"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placebtxrendering"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29068,7 +29250,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="completelistofpublications"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="completelistofpublications"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29078,7 +29260,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placelistofpublications"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="placelistofpublications"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -29088,7 +29270,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29130,7 +29312,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29174,7 +29356,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29198,14 +29380,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxhybridcite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxhybridcite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29247,7 +29429,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29291,7 +29473,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxlistcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxlistcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29315,7 +29497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29357,7 +29539,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29401,7 +29583,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxtextcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxtextcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29425,7 +29607,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29467,7 +29649,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29511,7 +29693,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxalwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxalwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29535,14 +29717,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="bthiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="bthiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29584,7 +29766,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29628,7 +29810,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29652,7 +29834,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29694,7 +29876,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29738,7 +29920,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="listcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="listcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29762,7 +29944,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29804,7 +29986,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29848,7 +30030,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29872,7 +30054,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -29914,7 +30096,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -29958,7 +30140,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="textcite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="textcite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -29982,7 +30164,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30024,7 +30206,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30068,7 +30250,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscitation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscitation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30092,7 +30274,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30134,7 +30316,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30178,7 +30360,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="alwayscite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="alwayscite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30202,21 +30384,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="hiddencitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="hiddencitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="hiddencite"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="hiddencite"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30258,7 +30440,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30302,7 +30484,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30326,14 +30508,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="citation" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="citation" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="reference"> @@ -30375,7 +30557,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="userdata"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="userdata"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="reference"> @@ -30419,7 +30601,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="alternative"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="alternative"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="default"/> @@ -30443,42 +30625,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="cite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="cite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocitation" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocitation" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocite"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocite"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="nocite" variant="direct"> + <cd:command category="bibliography" file="publ-ini.mkiv" level="document" name="nocite" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="savebtxdataset"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="savebtxdataset"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -30516,21 +30698,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="placecitation"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="placecitation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="usebtxdefinitions"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="usebtxdefinitions"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30567,7 +30749,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdetail"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdetail"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30604,7 +30786,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflush"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30641,7 +30823,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdirect"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdirect"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30678,7 +30860,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfieldname"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfieldname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30715,7 +30897,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfieldtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfieldtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30752,7 +30934,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfoundname"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfoundname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30789,7 +30971,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfoundtype"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfoundtype"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30826,7 +31008,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxauthorfield"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxauthorfield"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -30837,7 +31019,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30880,7 +31062,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoif"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30920,7 +31102,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifnot"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -30960,14 +31142,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsetup"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsesameaspreviouschecked"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsesameaspreviouschecked"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -31014,7 +31196,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsesameasprevious"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsesameasprevious"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -31057,7 +31239,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelsecombiinlist"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelsecombiinlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31073,7 +31255,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifsameaspreviouscheckedelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifsameaspreviouscheckedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -31120,7 +31302,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifsameaspreviouselse"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifsameaspreviouselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="address"/> @@ -31163,7 +31345,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifcombiinlistelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifcombiinlistelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31179,14 +31361,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="currentbtxuservariable"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="currentbtxuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifelseuservariable"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifelseuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31199,7 +31381,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxdoifuservariableelse"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxdoifuservariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -31212,7 +31394,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxremapauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxremapauthor"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -31222,7 +31404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthor"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthor"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -31237,8 +31419,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushsuffix"/> - <cd:command file="publ-ini.mkiv" name="btxflushauthorname"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushsuffix"/> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31246,7 +31428,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthornormal"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthornormal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31254,7 +31436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthornormalshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthornormalshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31262,7 +31444,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthorinverted"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorinverted"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31270,7 +31452,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxflushauthorinvertedshort"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxflushauthorinvertedshort"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="author"/> @@ -31278,7 +31460,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsingularplural"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsingularplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31293,7 +31475,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsingularorplural"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsingularorplural"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -31308,7 +31490,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxoneorrange"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxoneorrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31322,7 +31504,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxfirstofrange"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxfirstofrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -31330,21 +31512,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxloadjournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxloadjournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxsavejournalist"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxsavejournalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxaddjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxaddjournal"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -31354,21 +31536,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxexpandedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxexpandedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-ini.mkiv" name="btxabbreviatedjournal"> + <cd:command category="bibliography" file="publ-ini.mkiv" name="btxabbreviatedjournal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31413,14 +31595,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetcompleteness"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetcompleteness"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31465,14 +31647,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetcompleteness" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetcompleteness" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetauthors"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -31517,21 +31699,21 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxdatasetauthors" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxdatasetauthors" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxhashedauthors"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxhashedauthors"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxfields"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxfields"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -31543,14 +31725,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxfields" variant="argument"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxfields" variant="argument"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="publ-tra.mkiv" name="showbtxtables"> + <cd:command category="bibliography" file="publ-tra.mkiv" name="showbtxtables"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -31559,7 +31741,7 @@ </cd:command> </cd:interface> <cd:interface file="i-random.xml"> - <cd:command file="supp-ran.mkiv" name="getrandomcount"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomcount"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31570,7 +31752,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomdimen"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomdimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31581,7 +31763,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomnumber"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomnumber"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31592,7 +31774,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomfloat"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomfloat"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -31610,13 +31792,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-ran.mkiv" name="getrandomseed"> + <cd:command file="supp-ran.mkiv" level="system" name="getrandomseed"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="supp-ran.mkiv" name="randomseed" type="environment"/> - <cd:command file="supp-ran.mkiv" name="reuserandomseed"/> + <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:arguments> <cd:keywords delimiters="braces"> @@ -31630,7 +31812,7 @@ <cd:command file="supp-ran.mkiv" name="mprandomnumber"/> </cd:interface> <cd:interface file="i-references.xml"> - <cd:command file="strc-ref.mkvi" name="setupreferencing"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencing"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -31680,7 +31862,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="textreference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="textreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31690,14 +31872,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="pagereference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="pagereference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="reference"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="reference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31707,7 +31889,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setreference"> + <cd:command category="references" file="strc-ref.mkvi" name="setreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31719,12 +31901,12 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="usereferenceparameter"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="usereferenceparameter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="boxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="boxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31733,7 +31915,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="hboxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="hboxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31741,7 +31923,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="vboxreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="vboxreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31749,7 +31931,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="contentreference"> + <cd:command category="references" file="strc-ref.mkvi" name="contentreference"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:reference"/> @@ -31760,7 +31942,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definereference"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="definereference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -31770,14 +31952,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="resetreference"> + <cd:command category="references" file="strc-ref.mkvi" name="resetreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setpagereference"> + <cd:command category="references" file="strc-ref.mkvi" name="setpagereference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -31787,7 +31969,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelsereferencefound"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelsereferencefound"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31800,7 +31982,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifreferencefoundelse"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifreferencefoundelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31813,7 +31995,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferenceprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferenceprefix"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -31822,7 +32004,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupglobalreferenceprefix"> + <cd:command category="references" file="strc-ref.mkvi" name="setupglobalreferenceprefix"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -31831,7 +32013,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="push" end="pop" file="strc-ref.mkvi" name="referenceprefix" type="environment"> + <cd:command begin="push" category="references" end="pop" file="strc-ref.mkvi" level="system" name="referenceprefix" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -31840,7 +32022,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command begin="globalpush" end="globalpop" file="strc-ref.mkvi" name="referenceprefix" type="environment"> + <cd:command begin="globalpush" category="references" end="globalpop" file="strc-ref.mkvi" level="system" name="referenceprefix" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -31849,8 +32031,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="referenceprefix"/> - <cd:command file="strc-ref.mkvi" name="in"> + <cd:command category="references" file="strc-ref.mkvi" name="referenceprefix"/> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="in"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -31863,7 +32045,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="at"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="at"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="cd:text"/> @@ -31876,28 +32058,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="about"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="about"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="from"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="from"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="over"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="over"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="filterreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="filterreference"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="default"/> @@ -31909,7 +32091,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="getreferenceentry"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="getreferenceentry"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="default"/> @@ -31921,7 +32103,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="getreference"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="getreference"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -31936,7 +32118,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="ref"> + <cd:command category="references" file="strc-ref.mkvi" name="ref"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -31951,7 +32133,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="somewhere"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="somewhere"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -31964,7 +32146,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="docheckedpagestate"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="docheckedpagestate"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:reference"/> @@ -31989,7 +32171,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="someplace"> + <cd:command category="references" file="strc-ref.mkvi" name="someplace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -32011,21 +32193,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="atpage"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="atpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="symbolreference"> + <cd:command category="references" file="strc-ref.mkvi" name="symbolreference"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definereferenceformat"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="definereferenceformat"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32038,7 +32220,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferenceformat"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferenceformat"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32082,7 +32264,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" generated="yes" name="referenceformat" variant="example"> + <cd:command category="references" file="strc-ref.mkvi" generated="yes" level="document" name="referenceformat" variant="example"> <cd:sequence> <cd:variable value="referenceformat"/> </cd:sequence> @@ -32098,7 +32280,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="goto"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="goto"> <cd:arguments> <cd:content/> <cd:keywords> @@ -32106,14 +32288,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="goto" type="environment"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="goto" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:reference"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="gotobox"> + <cd:command category="references" file="strc-ref.mkvi" name="gotobox"> <cd:arguments> <cd:content/> <cd:keywords> @@ -32121,7 +32303,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useurl"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useurl"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32137,7 +32319,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useURL"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useURL"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32153,7 +32335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="usefile"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="usefile"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32166,7 +32348,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="useexternaldocument"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="useexternaldocument"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32179,7 +32361,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelseurldefined"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelseurldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32192,7 +32374,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifurldefinedelse"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifurldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32205,7 +32387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doifelsefiledefined"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doifelsefiledefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32218,7 +32400,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="doiffiledefinedelse"> + <cd:command category="references" file="strc-ref.mkvi" level="system" name="doiffiledefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -32231,7 +32413,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupurl"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupurl"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -32244,14 +32426,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="url"> + <cd:command category="references" file="strc-ref.mkvi" level="document" name="url"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="defineprogram"> + <cd:command category="references" file="strc-ref.mkvi" name="defineprogram"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32264,7 +32446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupprograms"> + <cd:command category="references" file="strc-ref.mkvi" name="setupprograms"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> @@ -32277,14 +32459,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="program"> + <cd:command category="references" file="strc-ref.mkvi" name="program"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="definepage"> + <cd:command category="references" file="strc-ref.mkvi" name="definepage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32294,7 +32476,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="gotopage"> + <cd:command category="references" file="strc-ref.mkvi" name="gotopage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -32304,7 +32486,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-ref.mkvi" name="setupreferencestructureprefix"> + <cd:command category="references" file="strc-ref.mkvi" level="style" name="setupreferencestructureprefix"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32382,7 +32564,7 @@ <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" name="enableregime"> + <cd:command file="regi-ini.mkiv" level="style" name="enableregime"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> @@ -32459,7 +32641,7 @@ </cd:command> </cd:interface> <cd:interface file="i-register.xml"> - <cd:command file="strc-reg.mkiv" name="defineregister"> + <cd:command file="strc-reg.mkiv" level="style" name="defineregister"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -32472,7 +32654,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregister" variant="argument"> + <cd:command file="strc-reg.mkiv" level="style" name="setupregister" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32521,6 +32703,7 @@ <cd:constant type="yes"/> <cd:constant default="yes" type="no"/> <cd:constant type="all"/> + <cd:constant type="packed"/> </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> @@ -32677,7 +32860,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregister"> + <cd:command file="strc-reg.mkiv" level="style" name="setupregister"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32880,7 +33063,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregisters" variant="argument"> + <cd:command file="strc-reg.mkiv" level="style" name="setupregisters" variant="argument"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -32893,7 +33076,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="setupregisters"> + <cd:command file="strc-reg.mkiv" level="style" name="setupregisters"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -32904,7 +33087,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="register" variant="instance"> + <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32915,9 +33098,11 @@ </cd:keywords> <cd:index list="yes"/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="register" variant="instance:ownnumber"> + <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="register" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -32931,9 +33116,11 @@ </cd:keywords> <cd:index list="yes"/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="seeregister" variant="instance"> + <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="seeregister" variant="instance"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -32949,9 +33136,11 @@ <cd:constant method="apply" prefix="cd:processor" type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="placeregister" variant="instance"> + <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="placeregister" variant="instance"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -32961,9 +33150,11 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="completeregister" variant="instance"> + <cd:command file="strc-reg.mkiv" generated="yes" level="document" name="completeregister" variant="instance"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -32973,9 +33164,11 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> - <cd:command file="strc-reg.mkiv" generated="yes" name="setupregister" variant="instance"> + <cd:command file="strc-reg.mkiv" generated="yes" level="style" name="setupregister" variant="instance"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -32988,7 +33181,9 @@ <cd:inherit name="setupregister"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="index"/> + </cd:instances> </cd:command> <cd:command file="strc-reg.mkiv" name="startregister"> <cd:arguments> @@ -33270,7 +33465,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-reg.mkiv" name="currentregisterpageuserdata"> + <cd:command file="strc-reg.mkiv" level="system" name="currentregisterpageuserdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -33308,7 +33503,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="definerenderingwindow"> + <cd:command file="scrn-wid.mkvi" level="style" name="definerenderingwindow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33321,7 +33516,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="setuprenderingwindow"> + <cd:command file="scrn-wid.mkvi" level="style" name="setuprenderingwindow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33349,7 +33544,7 @@ </cd:command> </cd:interface> <cd:interface file="i-replacement.xml"> - <cd:command file="lang-rep.mkiv" name="replaceword"> + <cd:command file="lang-rep.mkiv" level="style" name="replaceword"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33362,7 +33557,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="lang-rep.mkiv" name="setreplacement"> + <cd:command file="lang-rep.mkiv" level="style" name="setreplacement"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -33373,12 +33568,12 @@ <cd:command file="lang-rep.mkiv" name="resetreplacement"/> </cd:interface> <cd:interface file="i-rotatation.xml"> - <cd:command file="grph-trf.mkiv" name="mirror"> + <cd:command file="grph-trf.mkiv" level="document" name="mirror"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="setuprotate"> + <cd:command file="grph-trf.mkiv" level="style" name="setuprotate"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> @@ -33401,7 +33596,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="rotate"> + <cd:command file="grph-trf.mkiv" level="document" name="rotate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuprotate"/> @@ -33409,7 +33604,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="dorotatebox"> + <cd:command file="grph-trf.mkiv" level="system" name="dorotatebox"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -33420,7 +33615,7 @@ </cd:command> </cd:interface> <cd:interface file="i-scale.xml"> - <cd:command file="grph-trf.mkiv" name="definescale"> + <cd:command file="grph-trf.mkiv" level="style" name="definescale"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33433,7 +33628,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="setupscale"> + <cd:command file="grph-trf.mkiv" level="style" name="setupscale"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33513,7 +33708,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="grph-trf.mkiv" name="scale"> + <cd:command file="grph-trf.mkiv" level="document" name="scale"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -33545,7 +33740,7 @@ </cd:command> </cd:interface> <cd:interface file="i-script.xml"> - <cd:command file="scrp-ini.mkvi" name="definescript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="definescript"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33558,7 +33753,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setupscript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setupscript"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33581,7 +33776,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setupscripts"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setupscripts"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -33591,7 +33786,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="setscript"> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setscript"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -33604,8 +33799,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" name="resetscript"/> - <cd:command file="scrp-ini.mkvi" name="script" type="environment"> + <cd:command category="language" file="scrp-ini.mkvi" name="resetscript"/> + <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -33618,15 +33813,23 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="scrp-ini.mkvi" generated="yes" name="script" varianet="instance"> + <cd:command category="language" file="scrp-ini.mkvi" generated="yes" name="script" variant="instance"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> - <cd:instances/> + <cd:instances> + <cd:constant value="hangul"/> + <cd:constant value="hanzi"/> + <cd:constant value="nihongo"/> + <cd:constant value="ethiopic"/> + <cd:constant value="thai"/> + <cd:constant value="latin"/> + <cd:constant value="test"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-section.xml"> - <cd:command file="strc-sec.mkiv" name="definehead"> + <cd:command file="strc-sec.mkiv" level="style" name="definehead"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -33639,7 +33842,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setuphead"> + <cd:command file="strc-sec.mkiv" level="style" name="setuphead"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33884,9 +34087,6 @@ <cd:constant type="margintext"/> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="location"> - <cd:constant type="cd:name"/> - </cd:parameter> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -33923,10 +34123,13 @@ <cd:parameter name="deepnumbercommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="setupheads"> + <cd:command file="strc-sec.mkiv" level="style" name="setupheads"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:section"/> @@ -33936,7 +34139,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance"> + <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33949,6 +34152,7 @@ </cd:keywords> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -33963,7 +34167,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance:ownnumber"> + <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:ownnumber"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -33979,6 +34183,7 @@ </cd:keywords> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -33993,7 +34198,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" variant="instance:assignment"> + <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" variant="instance:assignment"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -34020,6 +34225,7 @@ </cd:assignments> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -34034,7 +34240,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" generated="yes" name="section" type="environment" variant="instance"> + <cd:command file="strc-sec.mkiv" generated="yes" level="document" name="section" type="environment" variant="instance"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -34066,6 +34272,7 @@ </cd:assignments> </cd:arguments> <cd:instances> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -34080,7 +34287,7 @@ <cd:constant value="subsubsubsubsubject"/> </cd:instances> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedsection" type="environment"> + <cd:command file="strc-sec.mkiv" level="document" name="namedsection" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:section"/> @@ -34200,7 +34407,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructureheadlocation"> + <cd:command file="strc-sec.mkiv" level="system" name="namedstructureheadlocation"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34223,7 +34430,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructurevariable"> + <cd:command file="strc-sec.mkiv" level="system" name="namedstructurevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34233,7 +34440,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-sec.mkiv" name="namedstructureuservariable"> + <cd:command file="strc-sec.mkiv" level="system" name="namedstructureuservariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:section"/> @@ -34253,7 +34460,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="sectionlevel" type="environment"> + <cd:command file="strc-lev.mkvi" level="document" name="sectionlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34285,7 +34492,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-lev.mkvi" name="subjectlevel" type="environment"> + <cd:command file="strc-lev.mkvi" level="document" name="subjectlevel" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34317,7 +34524,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="defineheadalternative"> + <cd:command file="strc-ren.mkiv" level="style" name="defineheadalternative"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34330,7 +34537,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="setupheadalternative"> + <cd:command file="strc-ren.mkiv" level="style" name="setupheadalternative"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34348,7 +34555,7 @@ </cd:arguments> </cd:command> <cd:command file="strc-ren.mkiv" name="localheadsetup" type="environment"/> - <cd:command file="strc-ren.mkiv" name="headhbox"> + <cd:command file="strc-ren.mkiv" level="system" name="headhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34356,7 +34563,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="headvbox"> + <cd:command file="strc-ren.mkiv" level="system" name="headvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34364,7 +34571,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-ren.mkiv" name="headreferenceattributes"/> + <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"/> @@ -34375,7 +34582,7 @@ <cd:command file="strc-ren.mkiv" name="headsetupspacing"/> </cd:interface> <cd:interface file="i-sectionblock.xml"> - <cd:command file="strc-sbe.mkiv" name="definesectionblock"> + <cd:command file="strc-sbe.mkiv" level="style" name="definesectionblock"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34388,7 +34595,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="setupsectionblock"> + <cd:command file="strc-sbe.mkiv" level="style" name="setupsectionblock"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34422,7 +34629,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" name="sectionblock" type="environment"> + <cd:command file="strc-sbe.mkiv" level="document" name="sectionblock" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34435,7 +34642,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-sbe.mkiv" generated="yes" name="sectionblock" type="environment" variant="instance"> + <cd:command file="strc-sbe.mkiv" generated="yes" level="document" name="sectionblock" type="environment" variant="instance"> <cd:sequence> <cd:instance value="sectionblock"/> </cd:sequence> @@ -34447,9 +34654,14 @@ <cd:inherit name="setupsectionblock"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="frontmatter"/> + <cd:constant value="bodymatter"/> + <cd:constant value="appendices"/> + <cd:constant value="backmatter"/> + </cd:instances> </cd:command> - <cd:command file="strc-sbe.mkiv" name="sectionblockenvironment" type="environment"> + <cd:command file="strc-sbe.mkiv" level="style" name="sectionblockenvironment" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34458,7 +34670,7 @@ </cd:command> </cd:interface> <cd:interface file="i-selector.xml"> - <cd:command file="core-env.mkiv" name="defineselector"> + <cd:command file="core-env.mkiv" level="style" name="defineselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34468,7 +34680,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupselector"> + <cd:command file="core-env.mkiv" level="style" name="setupselector"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34483,7 +34695,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="select"> + <cd:command file="core-env.mkiv" level="document" name="select"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34586,7 +34798,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupwithargument"> + <cd:command file="core-env.mkiv" level="system" name="setupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34594,7 +34806,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="fastsetupwithargument"> + <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34602,7 +34814,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="setupwithargumentswapped"> + <cd:command file="core-env.mkiv" level="system" name="setupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -34610,7 +34822,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="fastsetupwithargumentswapped"> + <cd:command file="core-env.mkiv" level="system" name="fastsetupwithargumentswapped"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -34618,7 +34830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="usesetupsparameter"> + <cd:command file="core-env.mkiv" level="system" name="usesetupsparameter"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -34630,14 +34842,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doprocesslocalsetups"> + <cd:command file="core-env.mkiv" level="system" name="doprocesslocalsetups"> <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="doifelsesetups"> + <cd:command file="core-env.mkiv" level="system" name="doifelsesetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34650,7 +34862,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifsetupselse"> + <cd:command file="core-env.mkiv" level="system" name="doifsetupselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34663,7 +34875,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifsetups"> + <cd:command file="core-env.mkiv" level="system" name="doifsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34673,7 +34885,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotsetups"> + <cd:command file="core-env.mkiv" level="system" name="doifnotsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -34717,7 +34929,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="rawsetups" type="environment"> + <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -34727,7 +34939,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="rawsetups" type="environment" variant="string"> + <cd:command file="core-env.mkiv" level="system" name="rawsetups" type="environment" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -34770,7 +34982,7 @@ </cd:command> </cd:interface> <cd:interface file="i-shift.xml"> - <cd:command file="node.rul.mkiv" name="defineshift"> + <cd:command file="node.rul.mkiv" level="style" name="defineshift"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34783,7 +34995,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setupshift"> + <cd:command file="node-rul.mkiv" level="style" name="setupshift"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34826,16 +35038,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" generated="yes" name="shift" variant="instance"> + <cd:command file="node-rul.mkiv" generated="yes" level="document" name="shift" variant="instance"> <cd:sequence> <cd:instance value="shift"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="shiftup"/> + <cd:constant value="shiftdown"/> + </cd:instances> </cd:command> - <cd:command file="node-rul.mkiv" name="shift" type="environment"> + <cd:command file="node-rul.mkiv" level="document" name="shift" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34844,7 +35059,7 @@ </cd:command> </cd:interface> <cd:interface file="i-sidebar.xml"> - <cd:command file="anch-bar.mkiv" name="definesidebar"> + <cd:command file="anch-bar.mkiv" level="style" name="definesidebar"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -34857,7 +35072,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupsidebar"> + <cd:command file="anch-bar.mkiv" level="style" name="setupsidebar"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -34890,7 +35105,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="sidebar" type="environment"> + <cd:command file="anch-bar.mkiv" level="document" name="sidebar" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -34900,7 +35115,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupmarginrule"> + <cd:command file="anch-bar.mkiv" level="style" name="setupmarginrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34910,7 +35125,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="setupmarginrules"> + <cd:command file="anch-bar.mkiv" level="style" name="setupmarginrules"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number"/> @@ -34920,14 +35135,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bar.mkiv" name="marginrule" type="environment"> + <cd:command 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" name="marginrule" type="environment" variant="assignment"> + <cd:command file="anch-bar.mkiv" level="document" name="marginrule" type="environment" variant="assignment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> @@ -34936,7 +35151,7 @@ </cd:command> </cd:interface> <cd:interface file="i-smash.xml"> - <cd:command file="supp-box.mkiv" name="smashbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34944,7 +35159,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashboxed"> + <cd:command file="supp-box.mkiv" level="system" name="smashboxed"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34952,7 +35167,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmashbox"> + <cd:command file="supp-box.mkiv" level="system" name="hsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34960,7 +35175,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmashbox"> + <cd:command file="supp-box.mkiv" level="system" name="vsmashbox"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:csname"/> @@ -34968,27 +35183,27 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmash"> + <cd:command file="supp-box.mkiv" level="system" name="hsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmash"> + <cd:command file="supp-box.mkiv" level="system" name="vsmash"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="hsmashed"> + <cd:command file="supp-box.mkiv" level="system" name="hsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="vsmashed"> + <cd:command file="supp-box.mkiv" level="system" name="vsmashed"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashedhbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashedhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -34996,7 +35211,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smashedvbox"> + <cd:command file="supp-box.mkiv" level="system" name="smashedvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -35004,7 +35219,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="supp-box.mkiv" name="smash"> + <cd:command file="supp-box.mkiv" level="document" name="smash"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> @@ -35018,7 +35233,7 @@ </cd:command> </cd:interface> <cd:interface file="i-sort.xml"> - <cd:command file="strc-syn.mkiv" name="definesorting"> + <cd:command category="language" file="strc-syn.mkiv" level="style" name="definesorting"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35032,7 +35247,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="setupsorting"> + <cd:command category="language" file="strc-syn.mkiv" level="style" name="setupsorting"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -35120,7 +35335,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="sorting" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="sorting" variant="instance"> <cd:sequence> <cd:instance value="sorting"/> </cd:sequence> @@ -35130,9 +35345,11 @@ </cd:keywords> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logo"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="definesort"> + <cd:command category="language" file="strc-syn.mkiv" name="definesort"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35147,7 +35364,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="placelistofsorts" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsorts" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="sorts"/> @@ -35157,9 +35374,11 @@ <cd:inherit name="setupsorting"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logos"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="completelistofsorts" variant="instance"> + <cd:command category="language" file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsorts" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="sorts"/> @@ -35169,9 +35388,11 @@ <cd:inherit name="setupsorting"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="logos"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsortingused"> + <cd:command category="language" file="strc-syn.mkiv" level="system" name="doifelsecurrentsortingused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35181,14 +35402,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="resetusedsortings"> + <cd:command category="language" file="strc-syn.mkiv" name="resetusedsortings"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="registersort"> + <cd:command category="language" file="strc-syn.mkiv" name="registersort"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35198,7 +35419,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="placelistofsorts"> + <cd:command category="language" file="strc-syn.mkiv" level="document" name="placelistofsorts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35208,7 +35429,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="completelistofsorts"> + <cd:command category="language" file="strc-syn.mkiv" level="document" name="completelistofsorts"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35220,7 +35441,7 @@ </cd:command> </cd:interface> <cd:interface file="i-soundtrack.xml"> - <cd:command file="scrn-wid.mkvi" name="setupexternalsoundtracks"> + <cd:command file="scrn-wid.mkvi" level="style" name="setupexternalsoundtracks"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -35229,7 +35450,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-wid.mkvi" name="useexternalsoundtrack"> + <cd:command file="scrn-wid.mkvi" level="style" name="useexternalsoundtrack"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35248,7 +35469,7 @@ </cd:command> </cd:interface> <cd:interface file="i-spellchecking.xml"> - <cd:command file="lang-wrd.mkiv" name="setupspellchecking"> + <cd:command category="language" file="lang-wrd.mkiv" level="style" name="setupspellchecking"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -35266,7 +35487,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-wrd.mkiv" name="loadspellchecklist"> + <cd:command category="language" file="lang-wrd.mkiv" level="style" name="loadspellchecklist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35278,7 +35499,7 @@ </cd:command> </cd:interface> <cd:interface file="i-startstop.xml"> - <cd:command file="core-sys.mkiv" name="definestartstop"> + <cd:command file="core-sys.mkiv" level="style" name="definestartstop"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35291,7 +35512,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="setupstartstop"> + <cd:command file="core-sys.mkiv" level="style" name="setupstartstop"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -35350,8 +35571,8 @@ </cd:command> </cd:interface> <cd:interface file="i-stream.xml"> - <cd:command file="page-str.mkiv" name="currentoutputstream"/> - <cd:command file="page-str.mkiv" name="ifinoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="currentoutputstream"/> + <cd:command file="page-str.mkiv" level="system" name="ifinoutputstream"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -35363,64 +35584,64 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="enableoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="enableoutputstream"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="disableoutputstream"/> - <cd:command file="page-str.mkiv" name="outputstream" type="environment"> + <cd:command file="page-str.mkiv" level="system" name="disableoutputstream"/> + <cd:command file="page-str.mkiv" level="system" name="outputstream" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="flushoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="flushoutputstream"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="outputstreambox"> + <cd:command file="page-str.mkiv" level="system" name="outputstreambox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="outputstreamcopy"> + <cd:command file="page-str.mkiv" level="system" name="outputstreamcopy"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="outputstreamunvbox"> + <cd:command file="page-str.mkiv" level="system" name="outputstreamunvbox"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="outputstreamunvcopy"> + <cd:command file="page-str.mkiv" level="system" name="outputstreamunvcopy"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="synchronizeoutputstreams"> + <cd:command file="page-str.mkiv" level="system" name="synchronizeoutputstreams"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-str.mkiv" name="pushoutputstream"> + <cd:command file="page-str.mkiv" level="system" name="pushoutputstream"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35429,70 +35650,70 @@ </cd:command> </cd:interface> <cd:interface file="i-string.xml"> - <cd:command file="blob-ini.mkiv" name="wdofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="wdofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="htofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="htofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="dpofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="dpofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="hdofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="hdofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="htdpofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="htdpofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="widthofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="widthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="heightofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="heightofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="depthofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="depthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="heightanddepthofstring"> + <cd:command file="blob-ini.mkiv" level="system" name="heightanddepthofstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="blob-ini.mkiv" name="setwidthof"> + <cd:command file="blob-ini.mkiv" level="system" name="setwidthof"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> @@ -35519,7 +35740,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="synchronizestrut"> + <cd:command file="spac-ver.mkiv" level="system" name="synchronizestrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="yes"/> @@ -35534,23 +35755,23 @@ </cd:arguments> </cd:command> <cd:command file="spac-ver.mkiv" name="strut"/> - <cd:command file="spac-ver.mkiv" name="setstrut"/> - <cd:command file="spac-ver.mkiv" name="setcharstrut"> + <cd:command file="spac-ver.mkiv" level="system" name="setstrut"/> + <cd:command file="spac-ver.mkiv" level="system" name="setcharstrut"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setfontstrut"/> - <cd:command file="spac-ver.mkiv" name="setcapstrut"/> - <cd:command file="spac-ver.mkiv" name="setnostrut"/> + <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 begin="beg" end="end" file="spac-ver.mkiv" name="strut" type="environment"/> + <cd:command begin="beg" end="end" file="spac-ver.mkiv" level="system" name="strut" type="environment"/> </cd:interface> <cd:interface file="i-symbol.xml"> - <cd:command file="symb-ini.mkiv" name="definesymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definesymbol"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35563,7 +35784,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelseinsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelseinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35579,7 +35800,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifinsymbolsetelse"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifinsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35595,7 +35816,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifinsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifinsymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35611,7 +35832,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelsesymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelsesymbolset"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35624,7 +35845,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifsymbolsetelse"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifsymbolsetelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35637,7 +35858,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="symbol"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -35647,14 +35868,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbol" variant="direct"> + <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="symbol" variant="direct"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="directsymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" name="directsymbol"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35664,7 +35885,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="definefiguresymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="definefiguresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35678,7 +35899,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="figuresymbol"> + <cd:command category="symbols" file="symb-ini.mkiv" level="document" name="figuresymbol"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> @@ -35689,7 +35910,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifelsesymboldefined"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifelsesymboldefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35702,7 +35923,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="doifsymboldefinedelse"> + <cd:command category="symbols" file="symb-ini.mkiv" level="system" name="doifsymboldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35715,29 +35936,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="symbolset" type="environment"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="symbolset" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="setupsymbolset"> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbolset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-ini.mkiv" name="resetsymbolset"/> - <cd:command file="symb-ini.mkiv" name="usesymbols"> + <cd:command category="symbols" file="symb-ini.mkiv" name="resetsymbolset"/> + <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="usesymbols"> <cd:arguments> <cd:keywords> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="symb-run.mkiv" name="showsymbolset"> + <cd:command category="symbols" file="symb-run.mkiv" level="document" name="showsymbolset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -35746,7 +35967,7 @@ </cd:command> </cd:interface> <cd:interface file="i-synonym.xml"> - <cd:command file="strc-syn.mkiv" name="definesynonyms"> + <cd:command file="strc-syn.mkiv" level="style" name="definesynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35762,7 +35983,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="setupsynonyms"> + <cd:command file="strc-syn.mkiv" level="style" name="setupsynonyms"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:singular"/> @@ -35850,7 +36071,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="synonym" variant="instance"> + <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="synonym" variant="instance"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -35863,9 +36084,11 @@ </cd:keywords> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviation"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" name="definesynonym"> + <cd:command file="strc-syn.mkiv" level="style" name="definesynonym"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -35883,7 +36106,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="placelistofsynonyms" variant="instance"> + <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="placelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="placelistof"/> <cd:instance value="synonyms"/> @@ -35893,9 +36116,11 @@ <cd:inherit name="setupsynonyms"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviations"/> + </cd:instances> </cd:command> - <cd:command file="strc-syn.mkiv" generated="yes" name="completelistofsynonyms" variant="instance"> + <cd:command file="strc-syn.mkiv" generated="yes" level="document" name="completelistofsynonyms" variant="instance"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -35905,7 +36130,9 @@ <cd:inherit name="setupsynonyms"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="abbreviations"/> + </cd:instances> </cd:command> <cd:command file="strc-syn.mkiv" name="registersynonym"> <cd:arguments> @@ -35917,7 +36144,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsynonymused"> + <cd:command file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymused"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35927,7 +36154,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="doifelsecurrentsynonymshown"> + <cd:command file="strc-syn.mkiv" level="system" name="doifelsecurrentsynonymshown"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -35951,7 +36178,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="placelistofsynonyms"> + <cd:command file="strc-syn.mkiv" level="document" name="placelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35961,7 +36188,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="completelistofsynonyms"> + <cd:command file="strc-syn.mkiv" level="document" name="completelistofsynonyms"> <cd:arguments> <cd:keywords> <cd:constant type="cd:singular"/> @@ -35971,7 +36198,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-syn.mkiv" name="infull"> + <cd:command file="strc-syn.mkiv" level="document" name="infull"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -35980,31 +36207,31 @@ </cd:command> </cd:interface> <cd:interface file="i-system.xml"> - <cd:command file="syst-aux.mkiv" name="expanded"> + <cd:command file="syst-aux.mkiv" level="system" name="expanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="expanded" type="environment"/> - <cd:command file="syst-aux.mkiv" name="gobbleoneargument"> + <cd:command file="syst-aux.mkiv" level="system" name="expanded" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneargument"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbletwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletwoarguments"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblethreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblethreearguments"> <cd:arguments> <cd:content/> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefourarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36012,7 +36239,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefivearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36021,7 +36248,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblesixarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36031,7 +36258,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesevenarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblesevenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36042,7 +36269,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleeightarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleeightarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36054,7 +36281,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleninearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleninearguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36067,7 +36294,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbletenarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletenarguments"> <cd:arguments> <cd:content/> <cd:content/> @@ -36081,14 +36308,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleoneoptional"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleoneoptional"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbletwooptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbletwooptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36098,7 +36325,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblethreeoptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblethreeoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36111,7 +36338,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefouroptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefouroptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36127,7 +36354,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblefiveoptionals"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblefiveoptionals"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -36146,8 +36373,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="donothing"/> - <cd:command file="syst-aux.mkiv" name="doifelsenextchar"> + <cd:command file="syst-aux.mkiv" level="system" name="donothing"/> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -36160,7 +36387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextcharelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -36173,7 +36400,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextoptional"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36183,7 +36410,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextoptionalelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36193,19 +36420,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextoptionalcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextoptionalcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextoptionalcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextoptionalcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextbgroup"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36215,7 +36442,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextbgroupelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36225,19 +36452,19 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextbgroupcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextbgroupcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextbgroupcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextbgroupcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenextparenthesis"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenextparenthesis"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36247,7 +36474,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnextparenthesiselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnextparenthesiselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36257,7 +36484,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefastoptionalcheck"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheck"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36267,7 +36494,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffastoptionalcheckelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36277,25 +36504,25 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefastoptionalcheckcs"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefastoptionalcheckcs"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffastoptionalcheckcselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffastoptionalcheckcselse"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="assumelongusagecs"> + <cd:command file="syst-aux.mkiv" level="system" name="assumelongusagecs"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36303,7 +36530,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36311,7 +36538,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36319,7 +36546,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setxvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36327,14 +36554,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="getvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="letvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36342,7 +36569,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="letgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36350,28 +36577,28 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="resetvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="resetvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="undefinevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="undefinevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ignorevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="ignorevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setuvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36379,7 +36606,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setuevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36387,7 +36614,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setugvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setugvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36395,7 +36622,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setuxvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="setuxvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36403,14 +36630,14 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getuvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="getuvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36423,7 +36650,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifundefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifundefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36436,7 +36663,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36449,7 +36676,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdefinedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36462,7 +36689,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36472,7 +36699,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -36482,28 +36709,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letbeundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="letbeundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localundefine"> + <cd:command file="syst-aux.mkiv" level="system" name="localundefine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalundefine"> + <cd:command file="syst-aux.mkiv" level="system" name="globalundefine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsealldefined"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsealldefined"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -36516,7 +36743,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifalldefinedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifalldefinedelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:name"/> @@ -36529,7 +36756,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doif"> + <cd:command file="syst-aux.mkiv" level="system" name="doif"> <cd:arguments> <cd:content/> <cd:content/> @@ -36538,7 +36765,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnot"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnot"> <cd:arguments> <cd:content/> <cd:content/> @@ -36547,7 +36774,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelse"> <cd:arguments> <cd:content/> <cd:content/> @@ -36559,7 +36786,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36570,7 +36797,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyelse"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36581,7 +36808,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36589,7 +36816,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotempty"> <cd:arguments> <cd:content/> <cd:keywords delimiters="braces"> @@ -36597,11 +36824,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36611,11 +36840,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinsetelse"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36625,35 +36856,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotinset"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsecommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36663,13 +36898,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifcommonelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -36679,33 +36914,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36713,9 +36948,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="quitcommalist"/> - <cd:command file="syst-aux.mkiv" name="quitprevcommalist"/> - <cd:command file="syst-aux.mkiv" name="processcommacommand"> + <cd:command file="syst-aux.mkiv" level="system" name="quitcommalist"/> + <cd:command file="syst-aux.mkiv" level="system" name="quitprevcommalist"/> + <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36723,7 +36958,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalistwithparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommalistwithparameters"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36731,22 +36966,22 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommalist" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommalist" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcommacommand" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processcommacommand" type="environment"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="currentcommalistitem"/> - <cd:command file="syst-aux.mkiv" name="processaction"> + <cd:command file="syst-aux.mkiv" level="system" name="currentcommalistitem"/> + <cd:command file="syst-aux.mkiv" level="system" name="processaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36754,7 +36989,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processfirstactioninset"> + <cd:command file="syst-aux.mkiv" level="system" name="processfirstactioninset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36762,7 +36997,7 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processallactionsinset"> + <cd:command file="syst-aux.mkiv" level="system" name="processallactionsinset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -36770,17 +37005,17 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="commalistelement"/> - <cd:command file="syst-aux.mkiv" name="firstcharacter"/> - <cd:command file="syst-aux.mkiv" name="remainingcharacters"/> - <cd:command file="syst-aux.mkiv" name="getfirstcharacter"> + <cd:command file="syst-aux.mkiv" level="system" name="commalistelement"/> + <cd:command file="syst-aux.mkiv" level="system" name="firstcharacter"/> + <cd:command file="syst-aux.mkiv" level="system" name="remainingcharacters"/> + <cd:command file="syst-aux.mkiv" level="system" name="getfirstcharacter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsefirstchar"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsefirstchar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36796,7 +37031,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doiffirstcharelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doiffirstcharelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36812,21 +37047,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thefirstcharacter"> + <cd:command file="syst-aux.mkiv" level="system" name="thefirstcharacter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="theremainingcharacters"> + <cd:command file="syst-aux.mkiv" level="system" name="theremainingcharacters"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36842,7 +37077,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36858,7 +37093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36871,7 +37106,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36884,7 +37119,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseincsname"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseincsname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36900,7 +37135,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifincsnameelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifincsnameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36916,7 +37151,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36929,7 +37164,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnumberelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnumberelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36942,7 +37177,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36952,7 +37187,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotnumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -36962,7 +37197,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="percentdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="percentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -36974,7 +37209,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setpercentdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="setpercentdimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -36986,7 +37221,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="makerawcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="makerawcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -36994,7 +37229,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocesscommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37002,7 +37237,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocesscommacommand"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocesscommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37010,11 +37245,13 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifelseinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -37024,11 +37261,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinsetelse"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -37038,18 +37277,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawdoifinset"> + <cd:command file="syst-aux.mkiv" level="system" name="rawdoifinset"> <cd:arguments> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawprocessaction"> + <cd:command file="syst-aux.mkiv" level="system" name="rawprocessaction"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -37057,8 +37298,8 @@ <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="currentvalue"/> - <cd:command file="syst-aux.mkiv" name="getparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="currentvalue"/> + <cd:command file="syst-aux.mkiv" level="system" name="getparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37070,7 +37311,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="geteparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="geteparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37082,7 +37323,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getgparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37094,7 +37335,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getxparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37106,7 +37347,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="forgetparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="forgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37118,7 +37359,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getexpandedparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getexpandedparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37130,7 +37371,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doassign"> + <cd:command file="syst-aux.mkiv" level="system" name="doassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37142,7 +37383,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doeassign"> + <cd:command file="syst-aux.mkiv" level="system" name="doeassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37154,7 +37395,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="undoassign"> + <cd:command file="syst-aux.mkiv" level="system" name="undoassign"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37166,7 +37407,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doassignempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doassignempty"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37178,7 +37419,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37188,7 +37429,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37198,7 +37439,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentlist" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentlist" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37207,7 +37448,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignmentcommand" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignmentcommand" type="environment"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:key"> @@ -37216,9 +37457,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="currentassignmentlistkey"/> - <cd:command file="syst-aux.mkiv" name="currentassignmentlistvalue"/> - <cd:command file="syst-aux.mkiv" name="getemptyparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistkey"/> + <cd:command file="syst-aux.mkiv" level="system" name="currentassignmentlistvalue"/> + <cd:command file="syst-aux.mkiv" level="system" name="getemptyparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37230,7 +37471,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="copyparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="copyparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -37243,14 +37484,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="checkparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ifparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="ifparameters"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -37262,22 +37503,22 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="commalistsize"/> - <cd:command file="syst-aux.mkiv" name="getcommalistsize"> + <cd:command file="syst-aux.mkiv" level="system" name="commalistsize"/> + <cd:command file="syst-aux.mkiv" level="system" name="getcommalistsize"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getcommacommandsize"> + <cd:command file="syst-aux.mkiv" level="system" name="getcommacommandsize"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getfromcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="getfromcommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37287,7 +37528,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getfromcommacommand"> + <cd:command file="syst-aux.mkiv" level="system" name="getfromcommacommand"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> @@ -37297,7 +37538,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dogetcommacommandelement"> + <cd:command file="syst-aux.mkiv" level="system" name="dogetcommacommandelement"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:number"/> @@ -37310,7 +37551,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosingleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dosingleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37318,7 +37559,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37329,7 +37570,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37343,7 +37584,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadrupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37360,7 +37601,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37380,7 +37621,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosixtupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37403,7 +37644,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doseventupleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doseventupleempty"> <cd:arguments> <cd:csname/> <cd:keywords optional="yes"> @@ -37429,7 +37670,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosingleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dosingleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37437,7 +37678,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37448,7 +37689,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37462,7 +37703,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadrupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadrupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37479,7 +37720,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37499,7 +37740,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dosixtupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dosixtupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37522,7 +37763,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doseventupleargument"> + <cd:command file="syst-aux.mkiv" level="system" name="doseventupleargument"> <cd:arguments> <cd:csname/> <cd:keywords> @@ -37548,24 +37789,24 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strippedcsname"> + <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strippedcsname" variant="string"> + <cd:command file="syst-aux.mkiv" level="system" name="strippedcsname" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimple"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimple" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37573,12 +37814,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimpleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="complexorsimpleempty" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="complexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37586,12 +37827,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimple"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimple" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimple" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37599,12 +37840,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimpleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="definecomplexorsimpleempty" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="definecomplexorsimpleempty" variant="argument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37612,9 +37853,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="permitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" name="dontpermitspacesbetweengroups"/> - <cd:command file="syst-aux.mkiv" name="dosinglegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="permitspacesbetweengroups"/> + <cd:command file="syst-aux.mkiv" level="system" name="dontpermitspacesbetweengroups"/> + <cd:command file="syst-aux.mkiv" level="system" name="dosinglegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37622,7 +37863,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoublegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoublegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37633,7 +37874,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotriplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dotriplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37647,7 +37888,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquadruplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquadruplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37664,7 +37905,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doquintuplegroupempty"> + <cd:command file="syst-aux.mkiv" level="system" name="doquintuplegroupempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces" optional="yes"> @@ -37684,14 +37925,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofoneargument"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofoneargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoftwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37701,7 +37942,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoftwoarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoftwoarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37711,7 +37952,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37724,7 +37965,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37737,7 +37978,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofthreearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37750,7 +37991,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37766,7 +38007,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37782,7 +38023,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37798,7 +38039,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthoffourarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthoffourarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37814,7 +38055,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37833,7 +38074,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37852,7 +38093,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37871,7 +38112,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37890,7 +38131,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fifthoffivearguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fifthoffivearguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37909,7 +38150,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37931,7 +38172,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37953,7 +38194,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37975,7 +38216,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fourthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fourthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -37997,7 +38238,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fifthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="fifthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38019,7 +38260,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="sixthofsixarguments"> + <cd:command file="syst-aux.mkiv" level="system" name="sixthofsixarguments"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38041,14 +38282,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofoneunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofoneunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstoftwounexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="firstoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38058,7 +38299,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondoftwounexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="secondoftwounexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38068,7 +38309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="firstofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="firstofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38081,7 +38322,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="secondofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="secondofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38094,7 +38335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="thirdofthreeunexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="thirdofthreeunexpanded"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38107,52 +38348,52 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letempty"> + <cd:command file="syst-aux.mkiv" level="system" name="letempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalletempty"> + <cd:command file="syst-aux.mkiv" level="system" name="globalletempty"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letvalueempty"> + <cd:command file="syst-aux.mkiv" level="system" name="letvalueempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letgvalueempty"> + <cd:command file="syst-aux.mkiv" level="system" name="letgvalueempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letvaluerelax"> + <cd:command file="syst-aux.mkiv" level="system" name="letvaluerelax"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letgvalurelax"> + <cd:command file="syst-aux.mkiv" level="system" name="letgvalurelax"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="relaxvalueifundefined"> + <cd:command file="syst-aux.mkiv" level="system" name="relaxvalueifundefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="rawgetparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="rawgetparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -38164,7 +38405,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="texdefinition" type="environment"> + <cd:command file="syst-aux.mkiv" level="system" name="texdefinition" type="environment"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -38179,6 +38420,20 @@ <cd:keywords delimiters="none" optional="yes"> <cd:constant type="expanded"/> </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="singleempty"/> + <cd:constant type="doubleempty"/> + <cd:constant type="tripleempty"/> + <cd:constant type="quadrupleempty"/> + <cd:constant type="quintupleempty"/> + <cd:constant type="sixtupleempty"/> + <cd:constant type="singleargument"/> + <cd:constant type="doubleargument"/> + <cd:constant type="tripleargument"/> + <cd:constant type="quadrupleargument"/> + <cd:constant type="quintupleargument"/> + <cd:constant type="sixtupleargument"/> + </cd:keywords> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> @@ -38187,35 +38442,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="texdefinition"> + <cd:command file="syst-aux.mkiv" level="system" name="texdefinition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="texcode" type="environment"/> - <cd:command file="syst-aux.mkiv" name="newcounter"> + <cd:command file="syst-aux.mkiv" level="system" name="texcode" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="newcounter"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fastincrement"> + <cd:command file="syst-aux.mkiv" level="system" name="fastincrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="fastdecrement"> + <cd:command file="syst-aux.mkiv" level="system" name="fastdecrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="increment"> + <cd:command file="syst-aux.mkiv" level="system" name="increment"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="increment" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -38223,12 +38478,12 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="decrement"> + <cd:command file="syst-aux.mkiv" level="system" name="decrement"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="decrement" variant="argument"> + <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -38236,45 +38491,46 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="incrementvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="incrementvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="decrementvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="decrementvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="newsignal"> + <cd:command file="syst-aux.mkiv" level="system" name="newsignal"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkedstrippedcsname"> + <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="checkedstrippedcsname" variant="string"> + <cd:command file="syst-aux.mkiv" level="system" name="checkedstrippedcsname" variant="string"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="savenormalmeaning"> + <cd:command file="syst-aux.mkiv" level="system" name="savenormalmeaning"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="recursedepth"/> - <cd:command file="syst-aux.mkiv" name="recurselevel"/> - <cd:command file="syst-aux.mkiv" name="dostepwiserecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="recursedepth"/> + <cd:command file="syst-aux.mkiv" level="system" name="recurselevel"/> + <cd:command file="syst-aux.mkiv" level="system" name="resetrecurselevel"/> + <cd:command file="syst-aux.mkiv" level="system" name="dostepwiserecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38290,7 +38546,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dorecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="dorecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38300,7 +38556,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doexpandedrecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="doexpandedrecurse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38310,7 +38566,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowith"> + <cd:command file="syst-aux.mkiv" level="system" name="dowith"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:command"/> @@ -38320,16 +38576,16 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doloop"> + <cd:command file="syst-aux.mkiv" level="system" name="doloop"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="exitloop"/> - <cd:command file="syst-aux.mkiv" name="exitloopnow"/> - <cd:command file="syst-aux.mkiv" name="dorecurse"> + <cd:command file="syst-aux.mkiv" level="system" name="exitloop"/> + <cd:command file="syst-aux.mkiv" level="system" name="exitloopnow"/> + <cd:command file="syst-aux.mkiv" level="system" name="dofastloopcs"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -38337,7 +38593,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doloopoverlist"> + <cd:command file="syst-aux.mkiv" level="system" name="fastloopindex"/> + <cd:command file="syst-aux.mkiv" level="system" name="fastloopfinal"/> + <cd:command file="syst-aux.mkiv" level="system" name="doloopoverlist"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> @@ -38347,29 +38605,29 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="recursestring"/> - <cd:command file="syst-aux.mkiv" name="newevery"> + <cd:command file="syst-aux.mkiv" level="system" name="recursestring"/> + <cd:command file="syst-aux.mkiv" level="system" name="newevery"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="EveryPar"> + <cd:command file="syst-aux.mkiv" level="system" name="EveryPar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="EveryLine"> + <cd:command file="syst-aux.mkiv" level="system" name="EveryLine"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="forgeteverypar"/> - <cd:command file="syst-aux.mkiv" name="convertvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="forgeteverypar"/> + <cd:command file="syst-aux.mkiv" level="system" name="convertvalue"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> @@ -38378,7 +38636,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="defconvertedvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedvalue"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38386,7 +38644,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseassignment"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseassignment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38399,7 +38657,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifassignmentelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifassignmentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38412,14 +38670,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="docheckassignment"> + <cd:command file="syst-aux.mkiv" level="system" name="docheckassignment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ifassignment"> + <cd:command file="syst-aux.mkiv" level="system" name="ifassignment"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -38431,7 +38689,7 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="convertargument"> + <cd:command file="syst-aux.mkiv" level="system" name="convertargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38440,14 +38698,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="convertcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="convertcommand"> <cd:arguments> <cd:csname/> <cd:delimiter name="to"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="defconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38455,13 +38713,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="defconvertedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="defconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="edefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="edefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38469,7 +38727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gdefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38477,13 +38735,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gdefconvertedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="gdefconvertedcommand"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="xdefconvertedargument"> + <cd:command file="syst-aux.mkiv" level="system" name="xdefconvertedargument"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38491,14 +38749,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="showvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="showvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsemeaning"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsemeaning"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -38510,7 +38768,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifmeaningelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifmeaningelse"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -38522,7 +38780,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38538,7 +38796,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsamestringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsamestringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38554,7 +38812,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38567,7 +38825,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotsamestring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotsamestring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38580,7 +38838,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ConvertToConstant"> + <cd:command file="syst-aux.mkiv" level="system" name="ConvertToConstant"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38591,7 +38849,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ConvertConstantAfter"> + <cd:command file="syst-aux.mkiv" level="system" name="ConvertConstantAfter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38602,7 +38860,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="assignifempty"> + <cd:command file="syst-aux.mkiv" level="system" name="assignifempty"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -38610,7 +38868,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="grabuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="grabuntil"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38618,7 +38876,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processbetween"> + <cd:command file="syst-aux.mkiv" level="system" name="processbetween"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -38626,12 +38884,12 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbleuntilrelax"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbleuntilrelax"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -38639,12 +38897,12 @@ <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processuntil"> + <cd:command file="syst-aux.mkiv" level="system" name="processuntil"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="groupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="groupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38654,7 +38912,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="simplegroupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="simplegroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38664,7 +38922,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pickupgroupedcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="pickupgroupedcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38677,33 +38935,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="BeforePar"> + <cd:command file="syst-aux.mkiv" level="system" name="BeforePar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="AfterPar"> + <cd:command file="syst-aux.mkiv" level="system" name="AfterPar"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="GetPar"/> - <cd:command file="syst-aux.mkiv" name="GotoPar"/> - <cd:command file="syst-aux.mkiv" name="dowithpargument"> + <cd:command file="syst-aux.mkiv" level="system" name="GetPar"/> + <cd:command file="syst-aux.mkiv" level="system" name="GotoPar"/> + <cd:command file="syst-aux.mkiv" level="system" name="dowithpargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowithwargument"> + <cd:command file="syst-aux.mkiv" level="system" name="dowithwargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dorepeatwithcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="dorepeatwithcommand"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -38712,7 +38970,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsestringinstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsestringinstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38728,7 +38986,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifstringinstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifstringinstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -38744,7 +39002,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38753,7 +39011,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38762,7 +39020,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtoksonce"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38771,7 +39029,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtoksonce"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtoksonce"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38780,7 +39038,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseintoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseintoks"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38796,7 +39054,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifintokselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifintokselse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:command"/> @@ -38812,20 +39070,20 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="collecting" type="environment"/> - <cd:command file="syst-aux.mkiv" name="collect" type="environment"/> - <cd:command file="syst-aux.mkiv" name="expandedcollect" type="environment"/> - <cd:command file="syst-aux.mkiv" name="collect"> + <cd:command file="syst-aux.mkiv" level="system" name="collecting" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="collect" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="expandedcollect" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="collect"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="collectexpanded"> + <cd:command file="syst-aux.mkiv" level="system" name="collectexpanded"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="removetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38834,7 +39092,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="appendetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38843,7 +39101,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependetoks"> + <cd:command file="syst-aux.mkiv" level="system" name="prependetoks"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:command"/> @@ -38852,17 +39110,17 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="flushtoks"> + <cd:command file="syst-aux.mkiv" level="system" name="flushtoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotoks"> + <cd:command file="syst-aux.mkiv" level="system" name="dotoks"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="beforesplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="beforesplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38875,7 +39133,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="aftersplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="aftersplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38888,7 +39146,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="splitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38903,7 +39161,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="greedysplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="greedysplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38918,7 +39176,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="beforetestandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="beforetestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38931,7 +39189,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="aftertestandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="aftertestandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38944,7 +39202,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="testandsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="testandsplitstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38959,7 +39217,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolon"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatperiod"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38968,7 +39226,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcomma"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcomma"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38977,7 +39235,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatasterisk"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatasterisk"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38986,7 +39244,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolon"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcolon"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -38995,7 +39253,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitatcolons"> + <cd:command file="syst-aux.mkiv" level="system" name="splitatcolons"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39004,7 +39262,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removesubstring"> + <cd:command file="syst-aux.mkiv" level="system" name="removesubstring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39017,7 +39275,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="appendtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39025,7 +39283,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="prependtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39033,7 +39291,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="addtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="addtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39041,7 +39299,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pretocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="pretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39049,13 +39307,13 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustdoifelseinset"> + <cd:command file="syst-aux.mkiv" level="system" name="robustdoifelseinset"> <cd:arguments> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39065,13 +39323,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustdoifinsetelse"> + <cd:command file="syst-aux.mkiv" level="system" name="robustdoifinsetelse"> <cd:arguments> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39081,7 +39339,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustaddtocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="robustaddtocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39089,7 +39347,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="robustpretocommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="robustpretocommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39097,7 +39355,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="xsplitstring"> + <cd:command file="syst-aux.mkiv" level="system" name="xsplitstring"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39105,7 +39363,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="removefromcommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="removefromcommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39113,7 +39371,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="substituteincommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="substituteincommalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39124,7 +39382,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="replaceincommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="replaceincommalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39132,7 +39390,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalprocesscommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="globalprocesscommalist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -39140,21 +39398,21 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="withoutpt"> + <cd:command file="syst-aux.mkiv" level="system" name="withoutpt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PtToCm"> + <cd:command file="syst-aux.mkiv" level="system" name="PtToCm"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dimensiontocount"> + <cd:command file="syst-aux.mkiv" level="system" name="dimensiontocount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39162,75 +39420,75 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="numberofpoints"> + <cd:command file="syst-aux.mkiv" level="system" name="numberofpoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="swapdimens"> + <cd:command file="syst-aux.mkiv" level="system" name="swapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="swapcounts"> + <cd:command file="syst-aux.mkiv" level="system" name="swapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="swapmacros"> + <cd:command file="syst-aux.mkiv" level="system" name="swapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapdimens"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapdimens"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapcounts"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapcounts"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalswapmacros"> + <cd:command file="syst-aux.mkiv" level="system" name="globalswapmacros"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalpushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="globalpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localpushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="localpushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="globalpopmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="globalpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="localpopmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="localpopmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="pushmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="pushmacro"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="popmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="popmacro"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -39257,7 +39515,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="hsizefraction"> + <cd:command file="syst-aux.mkiv" level="system" name="hsizefraction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39267,7 +39525,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39280,7 +39538,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39293,7 +39551,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsevalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39309,7 +39567,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvalueelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39325,7 +39583,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39335,7 +39593,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39345,7 +39603,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39358,7 +39616,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnothingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39371,7 +39629,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39384,7 +39642,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomethingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomethingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39397,7 +39655,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39407,7 +39665,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluesomething"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluesomething"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39417,7 +39675,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsevaluenothing"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsevaluenothing"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39430,7 +39688,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifvaluenothingelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifvaluenothingelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39443,7 +39701,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39456,7 +39714,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyvalueelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalueelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39469,7 +39727,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39479,7 +39737,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotemptyvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotemptyvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39489,13 +39747,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39505,13 +39763,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifallcommonelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifallcommonelse"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39521,33 +39779,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotallcommon"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotallcommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces" list="yes"> - <cd:content/> + <cd:constant type="cd:text"/> </cd:keywords> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleemptywithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -39558,7 +39816,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleemptywithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleemptywithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes" optional="yes"> @@ -39572,7 +39830,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dodoubleargumentwithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dodoubleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -39583,7 +39841,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dotripleargumentwithset"> + <cd:command file="syst-aux.mkiv" level="system" name="dotripleargumentwithset"> <cd:arguments> <cd:csname/> <cd:keywords list="yes"> @@ -39597,7 +39855,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="stripcharacter"> + <cd:command file="syst-aux.mkiv" level="system" name="stripcharacter"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:character"/> @@ -39610,7 +39868,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="stripspaces"> + <cd:command file="syst-aux.mkiv" level="system" name="stripspaces"> <cd:arguments> <cd:delimiter name="from"/> <cd:keywords delimiters="none"> @@ -39620,7 +39878,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspacestring"> + <cd:command file="syst-aux.mkiv" level="system" name="unspacestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39629,7 +39887,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="executeifdefined"> + <cd:command file="syst-aux.mkiv" level="system" name="executeifdefined"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39639,7 +39897,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesomespace"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesomespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39652,7 +39910,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsomespaceelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsomespaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39665,7 +39923,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processseparatedlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processseparatedlist"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -39679,7 +39937,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processlist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:character"/> @@ -39693,7 +39951,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processassignlist"> + <cd:command file="syst-aux.mkiv" level="system" name="processassignlist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> @@ -39701,7 +39959,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="untexargument"> + <cd:command file="syst-aux.mkiv" level="system" name="untexargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -39710,7 +39968,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="untexcommand"> + <cd:command file="syst-aux.mkiv" level="system" name="untexcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:csname"/> @@ -39719,7 +39977,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39727,7 +39985,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToWholeBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39735,7 +39993,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ScaledPointsToBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39743,7 +40001,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ScaledPointsToWholeBigPoints"> + <cd:command file="syst-aux.mkiv" level="system" name="ScaledPointsToWholeBigPoints"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39751,7 +40009,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="PointsToReal"> + <cd:command file="syst-aux.mkiv" level="system" name="PointsToReal"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -39760,21 +40018,21 @@ </cd:arguments> </cd:command> <cd:command file="syst-aux.mkiv" name="dontleavehmode"/> - <cd:command file="syst-aux.mkiv" name="utfupper"> + <cd:command file="syst-aux.mkiv" level="system" name="utfupper"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="utflower"> + <cd:command file="syst-aux.mkiv" level="system" name="utflower"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="uppercasestring"> + <cd:command file="syst-aux.mkiv" level="system" name="uppercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39783,7 +40041,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="lowercasestring"> + <cd:command file="syst-aux.mkiv" level="system" name="lowercasestring"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39792,7 +40050,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="counttoken"> + <cd:command file="syst-aux.mkiv" level="system" name="counttoken"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39805,7 +40063,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="counttokens"> + <cd:command file="syst-aux.mkiv" level="system" name="counttokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39814,7 +40072,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="splitofftokens"> + <cd:command file="syst-aux.mkiv" level="system" name="splitofftokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39827,7 +40085,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="handletokens"> + <cd:command file="syst-aux.mkiv" level="system" name="handletokens"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -39836,9 +40094,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="settrialtypesetting"/> - <cd:command file="syst-aux.mkiv" name="resettrialtypesetting"/> - <cd:command file="syst-aux.mkiv" name="iftrialtypesetting"> + <cd:command file="syst-aux.mkiv" level="system" name="settrialtypesetting"/> + <cd:command file="syst-aux.mkiv" level="system" name="resettrialtypesetting"/> + <cd:command file="syst-aux.mkiv" level="system" name="iftrialtypesetting"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:true"/> @@ -39850,35 +40108,35 @@ <cd:delimiter name="fi"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="integerrounding"> + <cd:command file="syst-aux.mkiv" level="system" name="integerrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="onedigitrounding"> + <cd:command file="syst-aux.mkiv" level="system" name="onedigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="twodigitrounding"> + <cd:command file="syst-aux.mkiv" level="system" name="twodigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="threedigitrounding"> + <cd:command file="syst-aux.mkiv" level="system" name="threedigitrounding"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processcontent"> + <cd:command file="syst-aux.mkiv" level="system" name="processcontent"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -39886,14 +40144,14 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dogobblesingleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dogobblesingleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dogobbledoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="dogobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -39903,14 +40161,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblesingleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblesingleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobbledoubleempty"> + <cd:command file="syst-aux.mkiv" level="system" name="gobbledoubleempty"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -39920,7 +40178,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsesometoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsesometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39931,7 +40189,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsometokselse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsometokselse"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39942,7 +40200,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifsometoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifsometoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39950,7 +40208,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifemptytoks"> + <cd:command file="syst-aux.mkiv" level="system" name="doifemptytoks"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -39958,8 +40216,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strictinspectnextcharacter" type="environment"/> - <cd:command file="syst-aux.mkiv" name="strictdoifelsenextoptional"> + <cd:command file="syst-aux.mkiv" level="system" name="strictinspectnextcharacter" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="strictdoifelsenextoptional"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39969,7 +40227,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="strictdoifnextoptionalelse"> + <cd:command file="syst-aux.mkiv" level="system" name="strictdoifnextoptionalelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -39979,42 +40237,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="gobblespacetokens"/> - <cd:command file="syst-aux.mkiv" name="verbatimstring"> + <cd:command file="syst-aux.mkiv" level="system" name="gobblespacetokens"/> + <cd:command file="syst-aux.mkiv" level="system" name="verbatimstring"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="lastdigit"> + <cd:command file="syst-aux.mkiv" level="system" name="lastdigit"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="lasttwodigits"> + <cd:command file="syst-aux.mkiv" level="system" name="lasttwodigits"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="serializedcommalist"/> - <cd:command file="syst-aux.mkiv" name="serializecommalist"> + <cd:command file="syst-aux.mkiv" level="system" name="serializedcommalist"/> + <cd:command file="syst-aux.mkiv" level="system" name="serializecommalist"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:command"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="purenumber"> + <cd:command file="syst-aux.mkiv" level="system" name="purenumber"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="filterfromvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="filterfromvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40027,7 +40285,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="filterfromnext"> + <cd:command file="syst-aux.mkiv" level="system" name="filterfromnext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40035,21 +40293,11 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> </cd:arguments> </cd:command> <cd:command file="syst-aux.mkiv" name="definemeasure"> @@ -40139,7 +40387,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedimension"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40152,7 +40400,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdimensionelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdimensionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40165,7 +40413,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsedimenstring"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsedimenstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40178,7 +40426,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifdimenstringelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifdimenstringelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40191,8 +40439,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="compresult"/> - <cd:command file="syst-aux.mkiv" name="comparedimension"> + <cd:command file="syst-aux.mkiv" level="system" name="compresult"/> + <cd:command file="syst-aux.mkiv" level="system" name="comparedimension"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40202,7 +40450,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="comparedimensioneps"> + <cd:command file="syst-aux.mkiv" level="system" name="comparedimensioneps"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40212,7 +40460,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcscsname"> + <cd:command file="syst-aux.mkiv" level="system" name="letcscsname"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -40222,7 +40470,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcsnamecs"> + <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecs"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -40232,7 +40480,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="letcsnamecsname"> + <cd:command file="syst-aux.mkiv" level="system" name="letcsnamecsname"> <cd:arguments> <cd:delimiter name="csname"/> <cd:keywords delimiters="none"> @@ -40246,7 +40494,7 @@ <cd:delimiter name="endcsname"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="addvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="addvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40256,14 +40504,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspaced"> + <cd:command file="syst-aux.mkiv" level="system" name="unspaced"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspaceargument"> + <cd:command file="syst-aux.mkiv" level="system" name="unspaceargument"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -40272,7 +40520,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unspaceafter"> + <cd:command file="syst-aux.mkiv" level="system" name="unspaceafter"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40280,7 +40528,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsehasspace"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsehasspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40293,7 +40541,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifhasspaceelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifhasspaceelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40306,28 +40554,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="setflag"> + <cd:command file="syst-aux.mkiv" level="system" name="setflag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="resetflag"> + <cd:command file="syst-aux.mkiv" level="system" name="resetflag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="flag"> + <cd:command file="syst-aux.mkiv" level="system" name="flag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelseflagged"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelseflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40340,7 +40588,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifflaggedelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifflaggedelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40353,7 +40601,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnotflagged"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnotflagged"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40363,7 +40611,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="inheritparameter"> + <cd:command file="syst-aux.mkiv" level="system" name="inheritparameter"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40376,7 +40624,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifelsenonzeropositive"> + <cd:command file="syst-aux.mkiv" level="system" name="doifelsenonzeropositive"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40389,7 +40637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="doifnonzeropositiveelse"> + <cd:command file="syst-aux.mkiv" level="system" name="doifnonzeropositiveelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40402,7 +40650,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40414,7 +40662,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getraweparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getraweparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40426,7 +40674,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawgparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawgparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40438,7 +40686,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getrawxparameters"> + <cd:command file="syst-aux.mkiv" level="system" name="getrawxparameters"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -40450,7 +40698,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="unprotected"> + <cd:command file="syst-aux.mkiv" level="system" name="unprotected"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:content"/> @@ -40458,18 +40706,16 @@ <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="resettimer"/> - <cd:command file="syst-aux.mkiv" name="elapsedtime"/> - <cd:command file="syst-aux.mkiv" name="elapsedseconds"/> - <cd:command file="syst-aux.mkiv" name="currentfeaturetest"/> - <cd:command file="syst-aux.mkiv" name="testfeature"> + <cd:command file="syst-aux.mkiv" level="system" name="resettimer"/> + <cd:command file="syst-aux.mkiv" level="system" name="elapsedtime"/> + <cd:command file="syst-aux.mkiv" level="system" name="elapsedseconds"/> + <cd:command file="syst-aux.mkiv" level="system" name="currentfeaturetest"/> + <cd:command file="syst-aux.mkiv" level="system" name="testfeature"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> + <cd:content/> </cd:arguments> </cd:command> <cd:command file="syst-aux.mkiv" name="showtimer"> @@ -40479,30 +40725,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="testfeatureonce"> + <cd:command file="syst-aux.mkiv" level="system" name="testfeatureonce"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> + <cd:content/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="freezedimenmacro"> + <cd:command file="syst-aux.mkiv" level="system" name="freezedimenmacro"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="negated"> + <cd:command file="syst-aux.mkiv" level="system" name="negated"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="assigndimen"> + <cd:command file="syst-aux.mkiv" level="system" name="assigndimen"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40510,7 +40754,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="appendvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40520,7 +40764,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="appendgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="appendgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40530,7 +40774,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="prependvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40540,7 +40784,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="prependgvalue"> + <cd:command file="syst-aux.mkiv" level="system" name="prependgvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -40550,7 +40794,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="processranges"> + <cd:command file="syst-aux.mkiv" level="system" name="processranges"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -40559,7 +40803,7 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="dowithrange"> + <cd:command file="syst-aux.mkiv" level="system" name="dowithrange"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -40568,9 +40812,9 @@ <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ignoreimplicitspaces"/> - <cd:command file="syst-aux.mkiv" name="nointerference" type="environment"/> - <cd:command file="syst-aux.mkiv" name="expandcheckedcsname"> + <cd:command file="syst-aux.mkiv" level="system" name="ignoreimplicitspaces"/> + <cd:command file="syst-aux.mkiv" level="system" name="nointerference" type="environment"/> + <cd:command file="syst-aux.mkiv" level="system" name="expandcheckedcsname"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -40581,39 +40825,39 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="docheckedpair"> + <cd:command file="syst-aux.mkiv" level="system" name="docheckedpair"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantnumber"> + <cd:command file="syst-aux.mkiv" level="system" name="constantnumber"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantnumberargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantnumberargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantdimen"> + <cd:command file="syst-aux.mkiv" level="system" name="constantdimen"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantdimenargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantdimenargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="constantemptyargument"> + <cd:command file="syst-aux.mkiv" level="system" name="constantemptyargument"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="getsubstring"> + <cd:command file="syst-aux.mkiv" level="system" name="getsubstring"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -40626,7 +40870,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="converteddimen"> + <cd:command file="syst-aux.mkiv" level="system" name="converteddimen"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -40647,7 +40891,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="syst-aux.mkiv" name="ntimes"> + <cd:command file="syst-aux.mkiv" level="system" name="ntimes"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -40657,9 +40901,108 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifelse"> + <cd:arguments> + <cd:content/> + <cd:content/> + <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 file="syst-lua.mkiv" level="system" name="expdoif"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifnot"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> + <cd:arguments> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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:command file="syst-lua.mkiv" level="system" name="expdoifcommonelse"> + <cd:arguments> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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:command file="syst-lua.mkiv" level="system" name="expdoifelseinset"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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:command file="syst-lua.mkiv" level="system" name="expdoifinsetelse"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces" list="yes"> + <cd:constant type="cd:text"/> + </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:command file="syst-lua.mkiv" level="system" name="luaexpr"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-systemlog.xml"> - <cd:command file="core-sys.mkiv" name="systemlog"> + <cd:command file="core-sys.mkiv" level="system" name="systemlog"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40672,7 +41015,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="systemlogfirst"> + <cd:command file="core-sys.mkiv" level="system" name="systemlogfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40685,7 +41028,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-sys.mkiv" name="systemloglast"> + <cd:command file="core-sys.mkiv" level="system" name="systemloglast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -40700,7 +41043,7 @@ </cd:command> </cd:interface> <cd:interface file="i-table.xml"> - <cd:command file="tabl-tab.mkiv" name="table" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="table" type="environment"> <cd:arguments> <cd:template/> <cd:assignments list="yes" optional="yes"> @@ -40708,7 +41051,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="table" type="environment" variant="name"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="table" type="environment" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40718,7 +41061,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="definetabletemplate"> + <cd:command category="tables" file="tabl-tab.mkiv" level="style" name="definetabletemplate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40732,33 +41075,33 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tables" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tables" type="environment"> <cd:arguments> <cd:template/> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tables" type="environment" variant="name"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tables" type="environment" variant="name"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tablehead" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tablehead" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="tabletail" type="environment"> + <cd:command category="tables" file="tabl-tab.mkiv" level="document" name="tabletail" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tab.mkiv" name="setuptables"> + <cd:command category="tables" file="tabl-tab.mkiv" name="setuptables"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> @@ -40828,7 +41171,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tabulation.xml"> - <cd:command file="tabl-tbl.mkiv" name="definetabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulation"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40841,7 +41184,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="setuptabulation"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulation"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -40927,7 +41270,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" generated="yes" name="tabulation" type="environment" variant="example"> + <cd:command category="tables" file="tabl-tbl.mkiv" generated="yes" level="document" name="tabulation" type="environment" variant="example"> <cd:sequence> <cd:variable value="tabulation"/> </cd:sequence> @@ -40940,7 +41283,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="definetabulate"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="definetabulate"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -40951,7 +41294,7 @@ <cd:template optional="yes"/> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="setuptabulate"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="style" name="setuptabulate"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -40964,7 +41307,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulate" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulate" type="environment"> <cd:arguments> <cd:template optional="yes"/> <cd:assignments list="yes" optional="yes"> @@ -40972,7 +41315,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" generated="yes" name="tabulate" type="environment" variant="instance"> + <cd:command category="tables" file="tabl-tbl.mkiv" generated="yes" level="document" name="tabulate" type="environment" variant="instance"> <cd:sequence> <cd:instance value="tabulate"/> </cd:sequence> @@ -40984,29 +41327,32 @@ <cd:inherit name="setuptabulate"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="legend"/> + <cd:constant value="fact"/> + </cd:instances> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulatehead" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulatehead" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulatetail" type="environment"> + <cd:command category="tables" file="tabl-tbl.mkiv" level="document" name="tabulatetail" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-tbl.mkiv" name="tabulaterule"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateline"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateautorule"/> - <cd:command file="tabl-tbl.mkiv" name="tabulateautoline"/> + <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:interface> <cd:interface file="i-tagging.xml"> - <cd:command file="strc-tag.mkiv" name="setuptagging"> + <cd:command file="strc-tag.mkiv" level="style" name="setuptagging"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -41019,7 +41365,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command begin="dostart" end="dostop" file="strc-tag.mkiv" name="tagged" type="environment"> + <cd:command begin="dostart" end="dostop" file="strc-tag.mkiv" level="system" name="tagged" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41041,7 +41387,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="doifelseinelement"> + <cd:command file="strc-tag.mkiv" level="system" name="doifelseinelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41054,7 +41400,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="doifinelementelse"> + <cd:command file="strc-tag.mkiv" level="system" name="doifinelementelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41067,7 +41413,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="taggedlabeltexts"> + <cd:command file="strc-tag.mkiv" level="system" name="taggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41078,7 +41424,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="strc-tag.mkiv" name="namedtaggedlabeltexts"> + <cd:command file="strc-tag.mkiv" level="system" name="namedtaggedlabeltexts"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41106,7 +41452,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textbackground.xml"> - <cd:command file="anch-bck.mkiv" name="definetextbackground"> + <cd:command file="anch-bck.mkiv" level="style" name="definetextbackground"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41119,7 +41465,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="setuptextbackground"> + <cd:command file="anch-bck.mkiv" level="style" name="setuptextbackground"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41226,7 +41572,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="textbackground" type="environment"> + <cd:command file="anch-bck.mkiv" level="document" name="textbackground" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41236,7 +41582,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" name="textbackground" type="environment" variant="example"> + <cd:command file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" type="environment" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41246,7 +41592,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" generated="yes" name="textbackground" variant="example"> + <cd:command file="anch-bck.mkiv" generated="yes" level="document" name="textbackground" variant="example"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -41254,10 +41600,10 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="anch-bck.mkiv" name="textbackgroundmanual" type="environment"/> + <cd:command file="anch-bck.mkiv" level="system" name="textbackgroundmanual" type="environment"/> </cd:interface> <cd:interface file="i-textflow.xml"> - <cd:command file="page-flw.mkiv" name="definetextflow"> + <cd:command file="page-flw.mkiv" level="style" name="definetextflow"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41270,7 +41616,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="setuptextflow"> + <cd:command file="page-flw.mkiv" level="style" name="setuptextflow"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -41296,7 +41642,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doifelsetextflowcollector"> + <cd:command file="page-flw.mkiv" level="system" name="doifelsetextflowcollector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41309,7 +41655,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doiftextflowcollectorelse"> + <cd:command file="page-flw.mkiv" level="system" name="doiftextflowcollectorelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41322,7 +41668,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doifelsetextflow"> + <cd:command file="page-flw.mkiv" level="system" name="doifelsetextflow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41335,7 +41681,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-flw.mkiv" name="doiftextflowelse"> + <cd:command file="page-flw.mkiv" level="system" name="doiftextflowelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41364,7 +41710,7 @@ </cd:command> </cd:interface> <cd:interface file="i-textrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setuptextrules"> + <cd:command file="pack-mrl.mkiv" level="style" name="setuptextrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -41412,7 +41758,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="textrule"> + <cd:command file="pack-mrl.mkiv" level="document" name="textrule"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -41424,7 +41770,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="textrule" type="environment"> + <cd:command file="pack-mrl.mkiv" level="document" name="textrule" type="environment"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -41433,7 +41779,7 @@ </cd:command> </cd:interface> <cd:interface file="i-texts.xml"> - <cd:command file="page-txt.mkvi" name="setuplayouttext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuplayouttext"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -41504,7 +41850,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptop"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptop"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41516,7 +41862,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupheader"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupheader"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41528,7 +41874,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptext"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41540,7 +41886,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupfooter"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupfooter"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41552,7 +41898,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupbottom"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupbottom"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="text"/> @@ -41564,7 +41910,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doifelselayouttextline"> + <cd:command category="layout" file="page-txt.mkvi" level="system" name="doifelselayouttextline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41577,7 +41923,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doiflayouttextlineelse"> + <cd:command category="layout" file="page-txt.mkvi" level="system" name="doiflayouttextlineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41590,7 +41936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doifelselayoutsomeline"> + <cd:command category="layout" file="page-txt.mkvi" level="system" name="doifelselayoutsomeline"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41603,7 +41949,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="doiflayoutsomelineelse"> + <cd:command category="layout" file="page-txt.mkvi" level="system" name="doiflayoutsomelineelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -41616,9 +41962,9 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="noheaderandfooterlines"/> - <cd:command file="page-txt.mkvi" name="notopandbottomlines"/> - <cd:command file="page-txt.mkvi" name="setuptoptexts"> + <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="setuptoptexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41655,7 +42001,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupheadertexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupheadertexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41692,7 +42038,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setuptexttexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setuptexttexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41729,7 +42075,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupfootertexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupfootertexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41766,7 +42112,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="setupbottomtexts"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="setupbottomtexts"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant default="yes" type="text"/> @@ -41803,7 +42149,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="settextcontent"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="settextcontent"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -41838,7 +42184,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-txt.mkvi" name="definetext"> + <cd:command category="layout" file="page-txt.mkvi" level="style" name="definetext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41887,7 +42233,7 @@ </cd:command> </cd:interface> <cd:interface file="i-thinrule.xml"> - <cd:command file="pack-mrl.mkiv" name="setupthinrules"> + <cd:command file="pack-mrl.mkiv" level="style" name="setupthinrules"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="height"> @@ -41941,9 +42287,9 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="pack-mrl.mkiv" name="thinrule"/> - <cd:command file="pack-mrl.mkiv" name="hairline"/> - <cd:command file="pack-mrl.mkiv" name="thinrules"> + <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:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> @@ -41952,28 +42298,28 @@ </cd:command> </cd:interface> <cd:interface file="i-token.xml"> - <cd:command file="toks-tra.mkiv" name="tokens" type="environment"> + <cd:command file="toks-tra.mkiv" level="system" name="tokens" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" name="flushtokens"> + <cd:command file="toks-tra.mkiv" level="system" name="flushtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" name="showtokens"> + <cd:command file="toks-tra.mkiv" level="system" name="showtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="toks-tra.mkiv" name="testtokens"> + <cd:command file="toks-tra.mkiv" level="system" name="testtokens"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -41982,7 +42328,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tolerance.xml"> - <cd:command file="spac-hor.mkiv" name="setuptolerance"> + <cd:command file="spac-hor.mkiv" level="style" name="setuptolerance"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> @@ -41998,7 +42344,7 @@ </cd:command> </cd:interface> <cd:interface file="i-tooltip.xml"> - <cd:command file="scrn-fld.mkvi" name="definetooltip"> + <cd:command file="scrn-fld.mkvi" level="style" name="definetooltip"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42011,7 +42357,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="scrn-fld.mkvi" name="setuptooltip"> + <cd:command file="scrn-fld.mkvi" level="style" name="setuptooltip"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42041,7 +42387,9 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="tooltip"/> + </cd:instances> </cd:command> <cd:command file="scrn-fld.mkvi" generated="yes" name="tooltip" variant="instance:argument"> <cd:sequence> @@ -42060,11 +42408,13 @@ <cd:constant type="cd:text"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="tooltip"/> + </cd:instances> </cd:command> </cd:interface> <cd:interface file="i-tracker.xml"> - <cd:command file="trac-ctx.mkiv" name="installtextracker"> + <cd:command file="trac-ctx.mkiv" level="system" name="installtextracker"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42077,7 +42427,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-ctx.mkiv" name="installtexdirective"> + <cd:command file="trac-ctx.mkiv" level="system" name="installtexdirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42090,14 +42440,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="enabletrackers"> + <cd:command file="trac-deb.mkiv" level="style" name="enabletrackers"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="disabletrackers"> + <cd:command file="trac-deb.mkiv" level="style" name="disabletrackers"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -42106,14 +42456,14 @@ </cd:command> <cd:command file="trac-deb.mkiv" name="resettrackers"/> <cd:command file="trac-deb.mkiv" name="showtrackers"/> - <cd:command file="trac-deb.mkiv" name="enabledirectives"> + <cd:command file="trac-deb.mkiv" level="style" name="enabledirectives"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="disabledirectives"> + <cd:command file="trac-deb.mkiv" level="style" name="disabledirectives"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -42121,14 +42471,14 @@ </cd:arguments> </cd:command> <cd:command file="trac-deb.mkiv" name="showdirectives"/> - <cd:command file="trac-deb.mkiv" name="enableexperiments"> + <cd:command file="trac-deb.mkiv" level="style" name="enableexperiments"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="trac-deb.mkiv" name="disableexperiments"> + <cd:command file="trac-deb.mkiv" level="style" name="disableexperiments"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -42142,7 +42492,7 @@ <cd:command file="trac-jus.mkiv" name="showjustification"/> </cd:interface> <cd:interface file="i-translation.xml"> - <cd:command file="lang-lab.mkiv" name="translate"> + <cd:command category="language" file="lang-lab.mkiv" name="translate"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="cd:language"> @@ -42151,7 +42501,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="lang-lab.mkiv" name="assigntranslation"> + <cd:command category="language" file="lang-lab.mkiv" name="assigntranslation"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> @@ -42164,7 +42514,7 @@ </cd:command> </cd:interface> <cd:interface file="i-twopassdata.xml"> - <cd:command file="core-two.mkiv" name="immediatesavetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="immediatesavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42175,7 +42525,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="savetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="savetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42186,7 +42536,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="lazysavetwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="lazysavetwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42197,7 +42547,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="savetaggedtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="savetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42211,7 +42561,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="lazysavetaggedtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="lazysavetaggedtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42225,28 +42575,28 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="definetwopasslist"> + <cd:command file="core-two.mkiv" level="system" name="definetwopasslist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="gettwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="gettwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="checktwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="checktwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="findtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="findtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42256,21 +42606,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getfirsttwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="getfirsttwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getlasttwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="getlasttwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getnamedtwopassdatalist"> + <cd:command file="core-two.mkiv" level="system" name="getnamedtwopassdatalist"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="braces"> @@ -42278,14 +42628,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="gettwopassdatalist"> + <cd:command file="core-two.mkiv" level="system" name="gettwopassdatalist"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="doifelseintwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="doifelseintwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42301,7 +42651,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="doifintwopassdataelse"> + <cd:command file="core-two.mkiv" level="system" name="doifintwopassdataelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42317,7 +42667,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-two.mkiv" name="getfromtwopassdata"> + <cd:command file="core-two.mkiv" level="system" name="getfromtwopassdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42579,21 +42929,21 @@ </cd:command> </cd:interface> <cd:interface file="i-unit.xml"> - <cd:command file="phys-dim.mkiv" name="digits"> + <cd:command 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" name="digits" variant="string"> + <cd:command 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" name="defineunit"> + <cd:command file="phys-dim.mkiv" level="style" name="defineunit"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -42606,7 +42956,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="setupunit"> + <cd:command file="phys-dim.mkiv" level="style" name="setupunit"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -42657,16 +43007,18 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" generated="yes" name="unit" variant="instance"> + <cd:command file="phys-dim.mkiv" generated="yes" level="document" name="unit" variant="instance"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="unit"/> + </cd:instances> </cd:command> - <cd:command file="phys-dim.mkiv" name="installunitsseparator"> + <cd:command file="phys-dim.mkiv" level="system" name="installunitsseparator"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42676,7 +43028,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="installunitsspace"> + <cd:command file="phys-dim.mkiv" level="system" name="installunitsspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42686,7 +43038,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="phys-dim.mkiv" name="registerunit"> + <cd:command file="phys-dim.mkiv" level="style" name="registerunit"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> @@ -42867,7 +43219,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelsevariable"> + <cd:command file="core-env.mkiv" level="system" name="doifelsevariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42883,7 +43235,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifvariableelse"> + <cd:command file="core-env.mkiv" level="system" name="doifvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42899,7 +43251,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifvariable"> + <cd:command file="core-env.mkiv" level="system" name="doifvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42912,7 +43264,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotvariable"> + <cd:command file="core-env.mkiv" level="system" name="doifnotvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42925,7 +43277,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseemptyvariable"> + <cd:command file="core-env.mkiv" level="system" name="doifelseemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42941,7 +43293,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifemptyvariableelse"> + <cd:command file="core-env.mkiv" level="system" name="doifemptyvariableelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42957,7 +43309,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifemptyvariable"> + <cd:command file="core-env.mkiv" level="system" name="doifemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42970,7 +43322,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotemptyvariable"> + <cd:command file="core-env.mkiv" level="system" name="doifnotemptyvariable"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -42983,7 +43335,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="getvariabledefault"> + <cd:command file="core-env.mkiv" level="system" name="getvariabledefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43011,7 +43363,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifelseenv"> + <cd:command file="core-env.mkiv" level="system" name="doifelseenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43024,7 +43376,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifenvelse"> + <cd:command file="core-env.mkiv" level="system" name="doifenvelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43037,7 +43389,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifenv"> + <cd:command file="core-env.mkiv" level="system" name="doifenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43047,7 +43399,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="core-env.mkiv" name="doifnotenv"> + <cd:command file="core-env.mkiv" level="system" name="doifnotenv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:key"/> @@ -43074,7 +43426,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43084,7 +43436,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43094,7 +43446,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="setdocumentargumentdefault"> + <cd:command file="luat-ini.mkiv" level="system" name="setdocumentargumentdefault"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43128,7 +43480,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifelsedocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="doifelsedocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43141,7 +43493,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentargumentelse"> + <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentargumentelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43154,7 +43506,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43164,7 +43516,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifnotdocumentargument"> + <cd:command file="luat-ini.mkiv" level="system" name="doifnotdocumentargument"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -43174,7 +43526,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifelsedocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="doifelsedocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43187,7 +43539,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentfilenameelse"> + <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentfilenameelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43200,7 +43552,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifdocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="doifdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43210,7 +43562,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="luat-ini.mkiv" name="doifnotdocumentfilename"> + <cd:command file="luat-ini.mkiv" level="system" name="doifnotdocumentfilename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43222,7 +43574,7 @@ </cd:command> </cd:interface> <cd:interface file="i-verbatim.xml"> - <cd:command file="buff-ver.mkiv" name="definetype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="definetype"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43235,7 +43587,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="setuptype"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="setuptype"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -43300,7 +43652,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="type"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="type"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43308,7 +43660,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="type" variant="angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="type" variant="angles"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43316,7 +43668,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typ"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typ"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43324,7 +43676,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typ" variant="angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typ" variant="angles"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -43332,7 +43684,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="type" variant="example"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="type" variant="example"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -43343,7 +43695,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="type" variant="example:angles"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="type" variant="example:angles"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -43354,7 +43706,7 @@ <cd:angles/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="definetyping"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="definetyping"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43367,7 +43719,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="setuptyping"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="style" name="setuptyping"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -43478,7 +43830,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typing" type="environment" variant="instance"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -43487,9 +43839,16 @@ <cd:inherit name="setuptyping"/> </cd:assignments> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> + </cd:instances> </cd:command> - <cd:command file="buff-ver.mkiv" generated="yes" name="typing" type="environment" variant="instance:argument"> + <cd:command category="verbatim" file="buff-ver.mkiv" generated="yes" level="document" name="typing" type="environment" variant="instance:argument"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -43498,51 +43857,58 @@ <cd:constant type="continue"/> </cd:keywords> </cd:arguments> - <cd:instances/> + <cd:instances> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> + </cd:instances> </cd:command> - <cd:command file="buff-ver.mkiv" name="tex"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="tex"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="arg"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="arg"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="mat"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="mat"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="dis"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="dis"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="astype"> + <cd:command category="verbatim" file="buff-ver.mkiv" name="astype"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="asciistr"> + <cd:command category="verbatim" file="buff-ver.mkiv" name="asciistr"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="verbatim"> + <cd:command category="verbatim" file="buff-ver.mkiv" name="verbatim"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="filename"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="filename"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="typefile"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="document" name="typefile"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -43555,7 +43921,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="doifelsetypingfile"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="doifelsetypingfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43568,7 +43934,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="buff-ver.mkiv" name="doiftypingfileelse"> + <cd:command category="verbatim" file="buff-ver.mkiv" level="system" name="doiftypingfileelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> @@ -43583,7 +43949,7 @@ </cd:command> </cd:interface> <cd:interface file="i-version.xml"> - <cd:command file="page-inf.mkiv" name="setupversion"> + <cd:command file="page-inf.mkiv" level="style" name="setupversion"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -43594,7 +43960,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="page-inf.mkiv" name="version"> + <cd:command file="page-inf.mkiv" level="style" name="version"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -43622,7 +43988,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifelseolderversion"> + <cd:command file="file-mod.mkvi" level="system" name="doifelseolderversion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43638,7 +44004,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifolderversionelse"> + <cd:command file="file-mod.mkvi" level="system" name="doifolderversionelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43654,7 +44020,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifelseoldercontext"> + <cd:command file="file-mod.mkvi" level="system" name="doifelseoldercontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43667,7 +44033,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="file-mod.mkvi" name="doifoldercontextelse"> + <cd:command file="file-mod.mkvi" level="system" name="doifoldercontextelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> @@ -43682,7 +44048,7 @@ </cd:command> </cd:interface> <cd:interface file="i-viewerlayer.xml"> - <cd:command file="attr-lay.mkiv" name="defineviewerlayer"> + <cd:command file="attr-lay.mkiv" level="style" name="defineviewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43695,7 +44061,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="setupviewerlayer"> + <cd:command file="attr-lay.mkiv" level="style" name="setupviewerlayer"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -43724,19 +44090,19 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="attr-lay.mkiv" name="viewerlayer" type="environment"> + <cd:command 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" name="viewerlayer" type="environment" variant="example"> + <cd:command 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" name="viewerlayer"> + <cd:command file="attr-lay.mkiv" level="document" name="viewerlayer"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -43747,7 +44113,7 @@ <cd:command file="attr-lay.mkiv" name="showlayoutcomponents"/> </cd:interface> <cd:interface file="i-visualizer.xml"> - <cd:command file="trac-vis.mkiv" name="ruledhbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledhbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43755,7 +44121,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvbox"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43763,7 +44129,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvtop"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvtop"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43771,7 +44137,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledtopv"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledtopv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43779,7 +44145,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledhpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledhpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43787,7 +44153,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledvpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledvpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43795,7 +44161,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledtpack"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledtpack"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43803,12 +44169,12 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="ruledmbox"> + <cd:command file="trac-vis.mkiv" level="system" name="ruledmbox"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxr"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxr"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43816,7 +44182,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxg"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxg"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43824,7 +44190,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxb"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxb"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43832,7 +44198,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxc"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxc"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43840,7 +44206,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxm"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxm"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43848,7 +44214,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxy"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxy"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43856,7 +44222,7 @@ <cd:content/> </cd:arguments> </cd:command> - <cd:command file="trac-vis.mkiv" name="filledhboxk"> + <cd:command file="trac-vis.mkiv" level="system" name="filledhboxk"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="cd:text"/> @@ -43994,28 +44360,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="setupblank"> + <cd:command file="spac-ver.mkiv" level="style" name="setupblank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="blank"> + <cd:command file="spac-ver.mkiv" level="document" name="blank"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="useblankparameter"> + <cd:command 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" name="synchronizeblank"/> - <cd:command file="spac-ver.mkiv" name="definevspace"> + <cd:command file="spac-ver.mkiv" level="system" name="synchronizeblank"/> + <cd:command file="spac-ver.mkiv" level="style" name="definevspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44028,7 +44394,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="vspace"> + <cd:command file="spac-ver.mkiv" level="document" name="vspace"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -44038,7 +44404,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="godown"> + <cd:command file="spac-ver.mkiv" level="document" name="godown"> <cd:arguments> <cd:keywords> <cd:constant type="cd:dimension"/> @@ -44057,7 +44423,7 @@ <cd:command file="spac-ver.mkiv" name="bigskip"/> </cd:interface> <cd:interface file="i-whitespace.xml"> - <cd:command file="spac-ver.mkiv" name="setupwhitespace"> + <cd:command file="spac-ver.mkiv" level="style" name="setupwhitespace"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="fix"/> @@ -44075,13 +44441,13 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="synchronizewhitespace"/> - <cd:command file="spac-ver.mkiv" name="correctwhitespace"> + <cd:command file="spac-ver.mkiv" level="system" name="synchronizewhitespace"/> + <cd:command file="spac-ver.mkiv" level="system" name="correctwhitespace"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command file="spac-ver.mkiv" name="packed" type="environment"> + <cd:command file="spac-ver.mkiv" level="document" name="packed" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> @@ -44089,7 +44455,7 @@ </cd:arguments> </cd:command> <cd:command file="spac-ver.mkiv" name="unpacked" type="environment"/> - <cd:command file="spac-ver.mkiv" name="linecorrection" type="environment"> + <cd:command file="spac-ver.mkiv" level="document" name="linecorrection" type="environment"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> @@ -44107,21 +44473,21 @@ </cd:command> </cd:interface> <cd:interface file="i-xml.xml"> - <cd:command name="xmlmain"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlmain"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflush"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflush"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44131,7 +44497,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpure"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44141,21 +44507,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushtext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushtext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushpure"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushpure"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlnonspace"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlnonspace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44165,21 +44531,21 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushspacewise"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushspacewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushlinewise"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushlinewise"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlall"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlall"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44189,8 +44555,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllastmatch"/> - <cd:command name="xmlfirst"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmllastmatch"/> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlfirst"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44200,7 +44566,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllast"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmllast"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44210,7 +44576,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44220,28 +44586,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushcontext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushcontext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlshow"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlshow"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinfo"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinfo"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlfilter"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlfilter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44251,7 +44617,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstrip"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstrip"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44261,7 +44627,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstripped"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstripped"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44271,7 +44637,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstripnolines"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstripnolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44281,7 +44647,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlstrippednolines"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlstrippednolines"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44291,7 +44657,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlposition"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlposition"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44304,7 +44670,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlelement"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlelement"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44314,14 +44680,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpos"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpos"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsnippet"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsnippet"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44331,7 +44697,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlconcat"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlconcat"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44344,7 +44710,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlconcatrange"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlconcatrange"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44363,7 +44729,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcommand"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcommand"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44376,42 +44742,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinlineverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinlineverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldisplayverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" type="environment"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldisplayverbatim" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlverbatim"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlverbatim"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprettyprint"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprettyprint"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44421,7 +44787,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadfile"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44434,7 +44800,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44447,7 +44813,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloaddata"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloaddata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44460,7 +44826,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloadonly"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloadonly"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44473,7 +44839,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessfile"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessfile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44486,7 +44852,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessbuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessbuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:buffer"/> @@ -44499,7 +44865,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprocessdata"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprocessdata"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44512,7 +44878,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclude"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclude"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44525,42 +44891,42 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlname"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlpath"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlpath"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltag"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltag"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlcount"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlcount"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlatt"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44570,7 +44936,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattdef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44583,7 +44949,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlrefatt"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlrefatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44593,8 +44959,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmllastatt"/> - <cd:command name="xmlattribute"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmllastatt"/> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattribute"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44607,7 +44973,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlattributedef"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlattributedef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44623,7 +44989,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchainatt"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchainatt"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44633,7 +44999,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchainattdef"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchainattdef"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44646,28 +45012,28 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesbefore"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectivesbefore"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesafter"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldirectivesafter"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinstalldirective"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinstalldirective"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44677,7 +45043,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44687,7 +45053,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44700,14 +45066,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremovesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremovesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremovedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremovedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44717,7 +45083,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlflushdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlflushdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44727,35 +45093,35 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlresetsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlresetsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlresetdocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlresetdocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprependsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprependsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlappendsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlappendsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbeforesetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbeforesetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44765,7 +45131,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlaftersetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlaftersetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:setup"/> @@ -44775,7 +45141,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlprependdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlprependdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44785,7 +45151,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlappenddocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlappenddocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44795,7 +45161,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbeforedocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbeforedocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44808,7 +45174,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlafterdocumentsetup"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlafterdocumentsetup"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44821,8 +45187,8 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisteredsetups"/> - <cd:command name="xmlregistereddocumentsetups"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisteredsetups"/> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregistereddocumentsetups"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44832,7 +45198,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetfunction"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetfunction"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44845,7 +45211,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoif"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoif"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44858,7 +45224,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnot"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnot"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44871,7 +45237,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelse"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44887,7 +45253,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoiftext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoiftext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44900,7 +45266,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnottext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnottext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44913,7 +45279,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelsetext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelsetext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44929,7 +45295,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44939,7 +45305,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifnotselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifnotselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44949,7 +45315,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseselfempty"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelseselfempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44962,7 +45328,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelseempty"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelseempty"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -44978,7 +45344,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44988,7 +45354,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlregisterns"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -44998,7 +45364,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremapname"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremapname"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45014,7 +45380,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlremapnamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlremapnamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45027,7 +45393,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlchecknamespace"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlchecknamespace"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45037,7 +45403,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlmapvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlmapvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45050,7 +45416,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlvalue"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlvalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45063,7 +45429,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmldoifelsevalue"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldoifelsevalue"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:category"/> @@ -45079,14 +45445,14 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlloaddirectives"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlloaddirectives"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:file"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsave"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsave"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45096,7 +45462,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltofile"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltofile"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45109,7 +45475,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltobuffer"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltobuffer"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45122,7 +45488,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltobufferverbose"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltobufferverbose"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45135,65 +45501,65 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmladdindex"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmladdindex"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclusion"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclusion"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlbadinclusions"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlbadinclusions"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlraw"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlraw"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlraw" type="environment"/> - <cd:command name="xmlresetinjectors"/> - <cd:command name="xmlsetinjectors"> + <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:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlinjector"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlinjector"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlapplyselectors"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlapplyselectors"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmlsetentity"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmlsetentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45203,7 +45569,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="xmltexentity"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmltexentity"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -45213,7 +45579,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="setupxml"> + <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="setupxml"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -45228,7 +45594,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="xmldefaulttotext"> + <cd:command category="xml" file="lxml-ini.mkiv" name="xmldefaulttotext"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:node"/> @@ -45237,7 +45603,7 @@ </cd:command> </cd:interface> <cd:interface file="i-xtable.xml"> - <cd:command file="tabl-xtb.mkvi" name="definextable"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="definextable"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -45250,7 +45616,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="setupxtable"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="style" name="setupxtable"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -45319,35 +45685,35 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtable" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="embeddedxtable" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" name="embeddedxtable" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="embeddedxtable" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" name="embeddedxtable" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" generated="yes" name="xtable" type="environment" variant="example"> + <cd:command category="tables" file="tabl-xtb.mkvi" generated="yes" level="document" name="xtable" type="environment" variant="example"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -45357,14 +45723,14 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="processxtablebuffer"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="processxtablebuffer"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xrow" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrow" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45374,7 +45740,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xcell" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcell" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45396,63 +45762,63 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablehead" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablehead" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablehead" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablefoot" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablefoot" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablefoot" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablenext" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablenext" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablenext" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablebody" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupxtable"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xtablebody" type="environment" variant="name"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xtablebody" type="environment" variant="name"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45462,7 +45828,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xrowgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xrowgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45472,7 +45838,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="xcellgroup" type="environment"> + <cd:command category="tables" file="tabl-xtb.mkvi" level="document" name="xcellgroup" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -45482,7 +45848,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="tabl-xtb.mkvi" name="currentxtablerow"/> - <cd:command file="tabl-xtb.mkvi" name="currentxtablecolumn"/> + <cd:command category="tables" file="tabl-xtb.mkvi" name="currentxtablerow"/> + <cd:command category="tables" file="tabl-xtb.mkvi" name="currentxtablecolumn"/> </cd:interface> </cd:interface> diff --git a/tex/context/interface/mkiv/i-align.xml b/tex/context/interface/mkiv/i-align.xml index d8b75a463..326024c39 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" file="spac-ali.mkiv"> + <cd:command name="setupalign" 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" file="spac-ali.mkiv"> + <cd:command name="usealignparameter" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="alignment" type="environment" file="spac-ali.mkiv"> + <cd:command name="alignment" type="environment" 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" file="spac-ali.mkiv"> + <cd:command name="linealignment" type="environment" 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" file="spac-ali.mkiv"/> + <cd:command name="leftaligned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="middlealigned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="middlealigned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="rightaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="rightaligned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="maxaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="maxaligned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="midaligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="midaligned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="centeraligned" type="environment" file="spac-ali.mkiv"/> + <cd:command name="centeraligned" type="environment" level="document" file="spac-ali.mkiv"/> - <cd:command name="leftaligned" file="spac-ali.mkiv"> + <cd:command name="leftaligned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rightaligned" file="spac-ali.mkiv"> + <cd:command name="rightaligned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="middlealigned" file="spac-ali.mkiv"> + <cd:command name="middlealigned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="maxaligned" file="spac-ali.mkiv"> + <cd:command name="maxaligned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="midaligned" file="spac-ali.mkiv"> + <cd:command name="midaligned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="centeraligned" file="spac-ali.mkiv"> + <cd:command name="centeraligned" level="document" file="spac-ali.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="alignedline" file="spac-ali.mkiv"> + <cd:command name="alignedline" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="wordright" 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" file="spac-ali.mkiv"> + <cd:command name="simplealignedbox" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="simplealignedspreadbox" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="simplealignedboxplus" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedbox" level="system" 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" file="spac-ali.mkiv"> + <cd:command name="simplereversealignedboxplus" level="system" 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" file="pack-box.mkiv"> + <cd:command name="alignedbox" level="system" 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" file="pack-box.mkiv"> + <cd:command name="aligned" level="system" file="pack-box.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:resolve name="value-aligned"/> @@ -273,4 +273,44 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="hanging" type="environment" level="document" file="spac-ver.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left" default="yes"/> + <cd:constant type="right"/> + </cd:parameter> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="hanging" type="environment" variant="argument" level="document" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="left" default="yes"/> + <cd:constant type="right"/> + </cd:keywords> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="fixed" type="environment" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="low"/> + <cd:constant type="middle"/> + <cd:constant type="high"/> + <cd:constant type="lohi"/> + <cd:constant type="default" default="yes"/> + </cd:keywords> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-anchor.xml b/tex/context/interface/mkiv/i-anchor.xml index 342976a3d..c8dad56d5 100644 --- a/tex/context/interface/mkiv/i-anchor.xml +++ b/tex/context/interface/mkiv/i-anchor.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineanchor" file="pack-box.mkiv"> + <cd:command name="defineanchor" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> @@ -18,7 +18,7 @@ </cd:arguments> </cd:command> - <cd:command name="anchor" file="pack-box.mkiv"> + <cd:command name="anchor" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-attachment.xml b/tex/context/interface/mkiv/i-attachment.xml index 82056a0ad..9320275a1 100644 --- a/tex/context/interface/mkiv/i-attachment.xml +++ b/tex/context/interface/mkiv/i-attachment.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineattachment" file="scrn-wid.mkvi"> + <cd:command name="defineattachment" level="style" 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="setupattachment" file="scrn-wid.mkvi"> + <cd:command name="setupattachment" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -85,18 +85,14 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupattachments" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupattachments" level="style" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupattachment"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="registerattachment" file="scrn-wid.mkvi"> <cd:arguments> @@ -107,9 +103,9 @@ </cd:arguments> </cd:command> - <cd:command name="attachment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="attachment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -118,13 +114,13 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="attachment"/> + <cd:resolve name="instance-attachment"/> </cd:instances> </cd:command> - <cd:command name="attachment" type="environment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="attachment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="attachment"/> + <cd:instance value="attachment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-name-optional"/> @@ -133,28 +129,32 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="attachment"/> + <cd:resolve name="instance-attachment"/> </cd:instances> </cd:command> - <cd:command name="placeattachments" file="scrn-wid.mkvi"/> + <cd:command name="placeattachments" level="document" file="scrn-wid.mkvi"/> - <cd:command name="attachment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="attachment" type="environment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupattachment"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="attachment" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupattachment"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="attachment" type="environment" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupattachment"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> </cd:interface> diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml index cd1e807d2..0db3eaa88 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" file="attr-ini.mkiv"> + <cd:command name="pushattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popattribute" file="attr-ini.mkiv"> + <cd:command name="popattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installattributestack" file="attr-ini.mkiv"> + <cd:command name="installattributestack" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="defineattribute" file="attr-ini.mkiv"> + <cd:command name="defineattribute" 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" file="attr-ini.mkiv"> + <cd:command name="definesystemattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -46,46 +46,46 @@ </cd:arguments> </cd:command> - <cd:command name="newattribute" file="attr-ini.mkiv"> + <cd:command name="newattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dosetattribute" file="attr-ini.mkiv"> + <cd:command name="dosetattribute" 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" file="attr-ini.mkiv"> + <cd:command name="doresetattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattribute" file="attr-ini.mkiv"> + <cd:command name="dogetattribute" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dogetattributeid" file="attr-ini.mkiv"> + <cd:command name="dogetattributeid" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetallattributes" file="attr-ini.mkiv"/> + <cd:command name="resetallattributes" level="system" file="attr-ini.mkiv"/> - <cd:command name="savecurrentattributes" file="attr-ini.mkiv"> + <cd:command name="savecurrentattributes" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecurrentattributes" file="attr-ini.mkiv"> + <cd:command name="restorecurrentattributes" level="system" file="attr-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index ff9a628cb..ef9c2890e 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" file="back-ini.mkiv"> + <cd:command name="setupbackend" level="style" file="back-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="export"> diff --git a/tex/context/interface/mkiv/i-background.xml b/tex/context/interface/mkiv/i-background.xml index f51a0247c..7ae1e254a 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" file="pack-bck.mkvi"> + <cd:command name="definebackground" level="style" 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" file="pack-bck.mkvi"> + <cd:command name="setupbackground" level="style" 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" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" generated="yes" variant="example" level="document" 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" file="pack-bck.mkvi"> + <cd:command name="background" type="environment" level="document" 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" file="pack-bck.mkvi"> + <cd:command name="background" generated="yes" variant="example" level="document" file="pack-bck.mkvi"> <cd:sequence> <cd:variable value="background"/> </cd:sequence> @@ -79,20 +79,20 @@ </cd:instances> </cd:command> - <cd:command name="background" file="pack-bck.mkvi"> + <cd:command name="background" level="document" file="pack-bck.mkvi"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="backgroundline" file="pack-bck.mkvi"> + <cd:command name="backgroundline" level="document" file="pack-bck.mkvi"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupbackgrounds" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" level="style" 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" file="page-bck.mkiv"> + <cd:command name="setupbackgrounds" variant="page" level="style" file="page-bck.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="paper"/> @@ -140,7 +140,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesomebackground" file="page-bck.mkiv"> + <cd:command name="doifelsesomebackground" level="system" 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" file="page-bck.mkiv"> + <cd:command name="doifsomebackgroundelse" level="system" 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" file="page-bck.mkiv"> + <cd:command name="doifsomebackground" level="system" 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 951448249..2b9fdcecb 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" file="node-rul.mkiv"> + <cd:command name="definebar" level="style" 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" file="node-rul.mkiv"> + <cd:command name="setupbar" level="style" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -82,165 +82,150 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupbars" file="node-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupbar"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupbars" level="style" file="node-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupbar"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="bar" generated="yes" variant="example" file="node-rul.mkiv"> + <cd:command name="bar" generated="yes" variant="instance" level="document" file="node-rul.mkiv"> <cd:sequence> - <cd:variable value="bar"/> + <cd:instance value="bar"/> </cd:sequence> <cd:arguments> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="overbar"/> - <cd:constant value="underbar"/> - <cd:constant value="overstrike"/> - <cd:constant value="understrike"/> - <cd:constant value="overbars"/> - <cd:constant value="underbars"/> - <cd:constant value="overstrikes"/> - <cd:constant value="understrikes"/> - <cd:constant value="underrandom"/> - <cd:constant value="underrandoms"/> - <cd:constant value="underdash"/> - <cd:constant value="underdashes"/> - <cd:constant value="underdot"/> - <cd:constant value="underdots"/> - <cd:constant value="nobar"/> - <cd:constant value="hiddenbar"/> + <cd:resolve name="instance-bar"/> </cd:instances> </cd:command> - <cd:command name="bar" type="environment" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" level="document" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setbar" file="node-rul.mkiv"> + <cd:command name="setbar" level="document" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directsetbar" file="node-rul.mkiv"> + <cd:command name="directsetbar" level="document" 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" file="node-rul.mkiv"> + <cd:command name="bar" type="environment" begin="push" end="pop" level="system" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="overbar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="underbar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="overbar" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="hiddenbar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underbar" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="overstrike" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="hiddenbar" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="understrike" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="overstrike" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="overbars" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="understrike" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underbars" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="overbars" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="overstrikes" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underbars" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="understrikes" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="overstrikes" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underrandom" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="understrikes" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underrandoms" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underrandom" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underdash" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underrandoms" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underdashes" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underdash" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underdot" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underdashes" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="underdots" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underdot" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="nobar" file="node-rul.mkiv"> - <cd:arguments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="underdots" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="nobar" file="node-rul.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + + --> <cd:command name="resetbar" file="node-rul.mkiv"/> diff --git a/tex/context/interface/mkiv/i-blackrule.xml b/tex/context/interface/mkiv/i-blackrule.xml index edb6873f0..32ff5d854 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" file="pack-mrl.mkiv"> + <cd:command name="setupblackrules" level="style" 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" file="pack-mrl.mkiv"> + <cd:command name="blackrule" level="document" 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" file="pack-mrl.mkiv"> + <cd:command name="blackrules" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupblackrules"/> @@ -63,13 +63,13 @@ </cd:arguments> </cd:command> - <cd:command name="vl" file="pack-mrl.mkiv"> + <cd:command name="vl" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="hl" file="pack-mrl.mkiv"> + <cd:command name="hl" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-bleed.xml b/tex/context/interface/mkiv/i-bleed.xml index 301f7d066..a0622f919 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" file="pack-box.mkiv"> + <cd:command name="setupbleeding" level="style" 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" file="pack-box.mkiv"> + <cd:command name="bleed" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupbleeding"/> diff --git a/tex/context/interface/mkiv/i-block.xml b/tex/context/interface/mkiv/i-block.xml index 837b2133d..f6be451ec 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" file="strc-blk.mkiv"> + <cd:command name="defineblock" level="style" 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" file="strc-blk.mkiv"> + <cd:command name="setupblock" level="style" 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" file="strc-blk.mkiv"> + <cd:command name="block" type="environment" generated="yes" variant="example" begin="begin" end="end" level="document" file="strc-blk.mkiv"> <cd:sequence> <cd:variable value="block"/> </cd:sequence> @@ -45,6 +45,7 @@ <cd:keywords list="yes" optional="yes"> <cd:constant type="+"/> <cd:constant type="-"/> + <cd:constant type="cd:name"/> </cd:keywords> </cd:arguments> </cd:command> @@ -52,30 +53,21 @@ <cd:command name="hideblocks" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> <cd:command name="keepblocks" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="useblocks" file="strc-blk.mkiv"> + <cd:command name="useblocks" level="document" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> @@ -85,13 +77,10 @@ </cd:arguments> </cd:command> - <cd:command name="processblocks" file="strc-blk.mkiv"> + <cd:command name="processblocks" level="document" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> @@ -101,13 +90,10 @@ </cd:arguments> </cd:command> - <cd:command name="selectblocks" file="strc-blk.mkiv"> + <cd:command name="selectblocks" level="document" file="strc-blk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="+"/> - <cd:constant type="-"/> - </cd:keywords> + <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes" optional="yes"> <cd:parameter name="criterium"> <cd:constant type="text" default="yes"/> diff --git a/tex/context/interface/mkiv/i-bookmark.xml b/tex/context/interface/mkiv/i-bookmark.xml index 68d893609..0a8359fa8 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" file="strc-bkm.mkiv"> + <cd:command name="setupbookmark" level="style" file="strc-bkm.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="force"> @@ -50,7 +50,7 @@ --> - <cd:command name="bookmark" file="strc-bkm.mkiv"> + <cd:command name="bookmark" level="document" file="strc-bkm.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:section"/> diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index 648106b89..faac4ddf9 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextbox" file="supp-box.mkiv"> + <cd:command name="dowithnextbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:csname/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextboxcs" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcs" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -44,21 +44,21 @@ </cd:arguments> </cd:command> - <cd:command name="nextboxwd" file="supp-box.mkiv"/> + <cd:command name="nextboxwd" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxht" file="supp-box.mkiv"/> + <cd:command name="nextboxht" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxdp" file="supp-box.mkiv"/> + <cd:command name="nextboxdp" level="system" file="supp-box.mkiv"/> - <cd:command name="nextboxhtdp" file="supp-box.mkiv"/> + <cd:command name="nextboxhtdp" level="system" file="supp-box.mkiv"/> - <cd:command name="flushnextbox" file="supp-box.mkiv"/> + <cd:command name="flushnextbox" level="system" file="supp-box.mkiv"/> - <cd:command name="nextbox" file="supp-box.mkiv"/> + <cd:command name="nextbox" level="system" file="supp-box.mkiv"/> - <cd:command name="nextdepth" file="supp-box.mkiv"/> + <cd:command name="nextdepth" level="system" file="supp-box.mkiv"/> - <cd:command name="dowithnextboxcontent" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontent" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithnextboxcontentcs" file="supp-box.mkiv"> + <cd:command name="dowithnextboxcontentcs" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -106,25 +106,25 @@ </cd:arguments> </cd:command> - <cd:command name="reshapebox" file="supp-box.mkiv"> + <cd:command name="reshapebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="shapebox" type="environment" begin="beginof" end="endof" file="supp-box.mkiv"/> + <cd:command name="shapebox" type="environment" begin="beginof" end="endof" level="system" file="supp-box.mkiv"/> - <cd:command name="flushshapebox" file="supp-box.mkiv"/> + <cd:command name="flushshapebox" level="system" file="supp-box.mkiv"/> - <cd:command name="innerflushshapebox" file="supp-box.mkiv"/> + <cd:command name="innerflushshapebox" level="system" file="supp-box.mkiv"/> - <cd:command name="shapedhbox" file="supp-box.mkiv"> + <cd:command name="shapedhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="processtokens" file="supp-box.mkiv"> + <cd:command name="processtokens" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -134,7 +134,7 @@ </cd:arguments> </cd:command> - <cd:command name="doboundtext" file="supp-box.mkiv"> + <cd:command name="doboundtext" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-dimension"/> @@ -170,70 +170,70 @@ </cd:arguments> </cd:command> - <cd:command name="processisolatedchars" file="supp-box.mkiv"> + <cd:command name="processisolatedchars" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processisolatedwords" file="supp-box.mkiv"> + <cd:command name="processisolatedwords" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="applytocharacters" file="supp-box.mkiv"> + <cd:command name="applytocharacters" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytowords" file="supp-box.mkiv"> + <cd:command name="applytowords" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringchar" file="supp-box.mkiv"> + <cd:command name="applytosplitstringchar" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringword" file="supp-box.mkiv"> + <cd:command name="applytosplitstringword" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringline" file="supp-box.mkiv"> + <cd:command name="applytosplitstringline" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringcharspaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringcharspaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringwordspaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringwordspaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="applytosplitstringlinespaced" file="supp-box.mkiv"> + <cd:command name="applytosplitstringlinespaced" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -285,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnhsize" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnhsize" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> @@ -293,21 +293,21 @@ </cd:arguments> </cd:command> - <cd:command name="setrigidcolumnbalance" file="supp-box.mkiv"> + <cd:command name="setrigidcolumnbalance" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxtohbox" type="environment" file="supp-box.mkiv"/> + <cd:command name="vboxtohbox" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="vboxtohboxseparator" type="environment" file="supp-box.mkiv"/> + <cd:command name="vboxtohboxseparator" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="convertvboxtohbox" file="supp-box.mkiv"/> + <cd:command name="convertvboxtohbox" level="system" file="supp-box.mkiv"/> - <cd:command name="hboxestohbox" type="environment" file="supp-box.mkiv"/> + <cd:command name="hboxestohbox" type="environment" level="system" file="supp-box.mkiv"/> - <cd:command name="unhhbox" file="supp-box.mkiv"> + <cd:command name="unhhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:delimiter name="with"/> @@ -317,11 +317,11 @@ <!-- - <cd:command name="hhbox" file="supp-box.mkiv"/> + <cd:command name="hhbox" level="system" file="supp-box.mkiv"/> --> - <cd:command name="hboxofvbox" file="supp-box.mkiv"> + <cd:command name="hboxofvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> @@ -444,7 +444,7 @@ <cd:content/> </cd:arguments> </cd:command> - + <cd:command name="limitatelines" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> @@ -579,7 +579,7 @@ </cd:arguments> </cd:command> - <cd:command name="setstackbox" file="supp-box.mkiv"> + <cd:command name="setstackbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -587,13 +587,13 @@ </cd:arguments> </cd:command> - <cd:command name="initializeboxstack" file="supp-box.mkiv"> + <cd:command name="initializeboxstack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="savebox" file="supp-box.mkiv"> + <cd:command name="savebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -601,21 +601,21 @@ </cd:arguments> </cd:command> - <cd:command name="restorebox" file="supp-box.mkiv"> + <cd:command name="restorebox" 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="foundbox" file="supp-box.mkiv"> + <cd:command name="foundbox" 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="doifelsebox" file="supp-box.mkiv"> + <cd:command name="doifelsebox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -624,7 +624,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifboxelse" file="supp-box.mkiv"> + <cd:command name="doifboxelse" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -633,25 +633,25 @@ </cd:arguments> </cd:command> - <cd:command name="localpushbox" file="supp-box.mkiv"> + <cd:command name="localpushbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="localpopbox" file="supp-box.mkiv"> + <cd:command name="localpopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpushbox" file="supp-box.mkiv"> + <cd:command name="globalpushbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="globalpopbox" file="supp-box.mkiv"> + <cd:command name="globalpopbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> @@ -667,11 +667,11 @@ </cd:arguments> </cd:command> - <cd:command name="removebottomthings" file="supp-box.mkiv"/> + <cd:command name="removebottomthings" level="system" file="supp-box.mkiv"/> - <cd:command name="removelastskip" file="supp-box.mkiv"/> + <cd:command name="removelastskip" level="system" file="supp-box.mkiv"/> - <cd:command name="makestrutofbox" file="supp-box.mkiv"> + <cd:command name="makestrutofbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> @@ -705,152 +705,152 @@ </cd:arguments> </cd:command> - <cd:command name="naturalhbox" file="supp-box.mkiv"> + <cd:command name="naturalhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvbox" file="supp-box.mkiv"> + <cd:command name="naturalvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvtop" file="supp-box.mkiv"> + <cd:command name="naturalvtop" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvcenter" file="supp-box.mkiv"> + <cd:command name="naturalvcenter" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalhpack" file="supp-box.mkiv"> + <cd:command name="naturalhpack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="naturalvpack" file="supp-box.mkiv"> + <cd:command name="naturalvpack" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="frozenhbox" file="supp-box.mkiv"> + <cd:command name="frozenhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setboxllx" file="supp-box.mkiv"> + <cd:command name="setboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="setboxlly" file="supp-box.mkiv"> + <cd:command name="setboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxllx" file="supp-box.mkiv"> + <cd:command name="gsetboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="gsetboxlly" file="supp-box.mkiv"> + <cd:command name="gsetboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getboxllx" file="supp-box.mkiv"> + <cd:command name="getboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="getboxlly" file="supp-box.mkiv"> + <cd:command name="getboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxllx" file="supp-box.mkiv"> + <cd:command name="directgetboxllx" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="directgetboxlly" file="supp-box.mkiv"> + <cd:command name="directgetboxlly" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="shownextbox" file="supp-box.mkiv"> + <cd:command name="shownextbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="spreadhbox" file="supp-box.mkiv"> + <cd:command name="spreadhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="minimalhbox" file="supp-box.mkiv"> + <cd:command name="minimalhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="nodetostring" file="supp-box.mkiv"> + <cd:command name="nodetostring" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getnaturaldimensions" file="supp-box.mkiv"> + <cd:command name="getnaturaldimensions" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="lastnaturalboxwd" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxwd" level="system" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxht" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxht" level="system" file="supp-box.mkiv"/> - <cd:command name="lastnaturalboxdp" file="supp-box.mkiv"/> + <cd:command name="lastnaturalboxdp" level="system" file="supp-box.mkiv"/> - <cd:command name="naturalwd" file="supp-box.mkiv"> + <cd:command name="naturalwd" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="doifelserighttoleftinbox" file="supp-box.mkiv"> + <cd:command name="doifelserighttoleftinbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -858,7 +858,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifrighttoleftinboxelse" file="supp-box.mkiv"> + <cd:command name="doifrighttoleftinboxelse" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:resolve name="argument-true"/> @@ -866,141 +866,141 @@ </cd:arguments> </cd:command> - <cd:command name="runninghbox" file="supp-box.mkiv"> + <cd:command name="runninghbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vbox" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="vbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="hbox" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="hbox" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="vtop" type="environment" begin="begin" end="end" file="supp-box.mkiv"/> + <cd:command name="vtop" type="environment" begin="begin" end="end" level="system" file="supp-box.mkiv"/> - <cd:command name="setvboxregister" file="supp-box.mkiv"> + <cd:command name="setvboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="sethboxregister" file="supp-box.mkiv"> + <cd:command name="sethboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvtopregister" file="supp-box.mkiv"> + <cd:command name="setvtopregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="flushboxregister" file="supp-box.mkiv"> + <cd:command name="flushboxregister" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vboxregister" type="environment" file="supp-box.mkiv"> + <cd:command name="vboxregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hboxregister" type="environment" file="supp-box.mkiv"> + <cd:command name="hboxregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vtopregister" type="environment" file="supp-box.mkiv"> + <cd:command name="vtopregister" type="environment" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="righttolefthbox" file="spac-ali.mkiv"> + <cd:command name="righttolefthbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorighthbox" file="spac-ali.mkiv"> + <cd:command name="lefttorighthbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvbox" file="spac-ali.mkiv"> + <cd:command name="righttoleftvbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvbox" file="spac-ali.mkiv"> + <cd:command name="lefttorightvbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="righttoleftvtop" file="spac-ali.mkiv"> + <cd:command name="righttoleftvtop" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lefttorightvtop" file="spac-ali.mkiv"> + <cd:command name="lefttorightvtop" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirhbox" file="spac-ali.mkiv"> + <cd:command name="autodirhbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvbox" file="spac-ali.mkiv"> + <cd:command name="autodirvbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="autodirvtop" file="spac-ali.mkiv"> + <cd:command name="autodirvtop" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrighthbox" file="spac-ali.mkiv"> + <cd:command name="leftorrighthbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvbox" file="spac-ali.mkiv"> + <cd:command name="leftorrightvbox" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="leftorrightvtop" file="spac-ali.mkiv"> + <cd:command name="leftorrightvtop" level="system" file="spac-ali.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> @@ -1036,7 +1036,89 @@ </cd:arguments> </cd:command> - <cd:command name="lastlinewidth" file="supp-box.mkiv"> + <cd:command name="lastlinewidth" file="supp-box.mkiv"/> + + <cd:command name="putboxincache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="getboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelseboxincache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="copyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:resolve name="string-box"/> + </cd:arguments> + </cd:command> + + <cd:command name="directboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="directcopyboxfromcache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="resetboxesincache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="putnextboxincache" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-name"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + <cd:constant type="cd:text"/> + </cd:keywords> + <cd:csname/> + <cd:content/> + </cd:arguments> </cd:command> </cd:interface> diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index 38571fcd4..b99d2886b 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" file="buff-ini.mkiv"> + <cd:command name="doifelsebuffer" level="system" 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" file="buff-ini.mkiv"> + <cd:command name="doifbufferelse" level="system" 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" file="buff-ini.mkiv"> + <cd:command name="resetbuffer" level="system" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer"/> </cd:arguments> </cd:command> - <cd:command name="buffer" type="environment" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" level="document" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="grabbufferdata" file="buff-ini.mkiv"> + <cd:command name="grabbufferdata" level="system" 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" file="buff-ini.mkiv"> + <cd:command name="grabbufferdatadirect" level="system" 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" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" begin="set" end="end" level="system" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupbuffer" file="buff-ini.mkiv"> + <cd:command name="setupbuffer" level="style" 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" file="buff-ini.mkiv"> + <cd:command name="definebuffer" level="style" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-buffer-optional"/> @@ -79,7 +79,7 @@ </cd:arguments> </cd:command> - <cd:command name="getbuffer" file="buff-ini.mkiv"> + <cd:command name="getbuffer" level="document" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> @@ -91,29 +91,33 @@ </cd:arguments> </cd:command> - <cd:command name="inlinebuffer" file="buff-ini.mkiv"> + <cd:command name="inlinebuffer" level="document" 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="example" file="buff-ini.mkiv"> + <cd:command name="buffer" type="environment" generated="yes" variant="instance" level="document" file="buff-ini.mkiv"> <cd:sequence> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:instances> - <cd:constant value="hiding"/> + <cd:resolve name="instance-buffer"/> </cd:instances> </cd:command> - <cd:command name="getbuffer" generated="yes" variant="example" file="buff-ini.mkiv"> + <cd:command name="getbuffer" generated="yes" variant="instance" level="document" file="buff-ini.mkiv"> <cd:sequence> <cd:string value="get"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> </cd:command> - <cd:command name="hiding" type="environment" file="buff-ini.mkiv"/> + <!-- + + <cd:command name="hiding" type="environment" file="buff-ini.mkiv"/> + + --> <cd:command name="processtexbuffer" file="buff-ini.mkiv"> <cd:sequence> @@ -166,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="typebuffer" file="buff-ver.mkiv"> + <cd:command name="typebuffer" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-list-optional"/> <cd:assignments list="yes" optional="yes"> @@ -175,10 +179,10 @@ </cd:arguments> </cd:command> - <cd:command name="typebuffer" generated="yes" variant="example" file="buff-ver.mkiv"> + <cd:command name="typebuffer" generated="yes" variant="instance" level="document" file="buff-ver.mkiv"> <cd:sequence> <cd:string value="type"/> - <cd:variable value="buffer"/> + <cd:instance value="buffer"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-button.xml b/tex/context/interface/mkiv/i-button.xml index 0ccb2d28d..4166f21aa 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" file="scrn-but.mkvi"> + <cd:command name="definebutton" level="style" 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" file="scrn-but.mkvi"> + <cd:command name="setupbutton" level="style" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-capitals.xml b/tex/context/interface/mkiv/i-capitals.xml index 154a1a040..55c6779f4 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" file="typo-cap.mkiv"> + <cd:command name="definecapitals" level="style" 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" file="typo-cap.mkiv"> + <cd:command name="setupcapitals" level="style" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -53,43 +53,43 @@ </cd:arguments> </cd:command> - <cd:command name="WORD" file="typo-cap.mkiv"> + <cd:command name="WORD" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="word" file="typo-cap.mkiv"> + <cd:command name="word" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Word" file="typo-cap.mkiv"> + <cd:command name="Word" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="Words" file="typo-cap.mkiv"> + <cd:command name="Words" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="camel" file="typo-cap.mkiv"> + <cd:command name="camel" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="WORDS" file="typo-cap.mkiv"> + <cd:command name="WORDS" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="words" file="typo-cap.mkiv"> + <cd:command name="words" level="document" file="typo-cap.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml index b8636ceee..2eb39f380 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" file="catc-ctx.mkiv"/> + <cd:command name="texcode" type="environment" level="system" file="catc-ctx.mkiv"/> - <cd:command name="contextcode" type="environment" file="catc-ctx.mkiv"/> + <cd:command name="contextcode" type="environment" level="system" file="catc-ctx.mkiv"/> - <cd:command name="contextdefinitioncode" type="environment" file="catc-ctx.mkiv"/> + <cd:command name="contextdefinitioncode" type="environment" level="system" file="catc-ctx.mkiv"/> - <cd:command name="protect" type="environment" begin="un" end="" file="catc-def.mkiv"/><!-- end="zero width space" --> + <cd:command name="protect" type="environment" begin="un" end="" level="system" file="catc-def.mkiv"/><!-- end="zero width space" --> - <cd:command name="newcatcodetable" file="catc-ini.mkiv"> + <cd:command name="newcatcodetable" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" file="catc-ini.mkiv"> + <cd:command name="catcodetable" type="environment" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="extendedcatcodetable" type="environment" file="catc-ini.mkiv"> + <cd:command name="extendedcatcodetable" type="environment" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="installactivecharacter" file="catc-act.mkiv"> + <cd:command name="installactivecharacter" level="system" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="defineactivecharacter" file="catc-act.mkiv"> + <cd:command name="defineactivecharacter" level="system" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installanddefineactivecharacter" file="catc-act.mkiv"> + <cd:command name="installanddefineactivecharacter" level="system" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="makecharacteractive" file="catc-act.mkiv"> + <cd:command name="makecharacteractive" level="system" file="catc-act.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="permitcircumflexescape" file="catc-ini.mkiv"/> + <cd:command name="permitcircumflexescape" level="system" file="catc-ini.mkiv"/> - <cd:command name="permitcaretescape" file="catc-ini.mkiv"/> + <cd:command name="permitcaretescape" level="system" file="catc-ini.mkiv"/> - <cd:command name="letcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="letcatcodecommand" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -71,7 +71,7 @@ </cd:arguments> </cd:command> - <cd:command name="defcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="defcatcodecommand" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="uedcatcodecommand" file="catc-ini.mkiv"> + <cd:command name="uedcatcodecommand" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> <cd:keywords delimiters="none"> @@ -93,27 +93,27 @@ </cd:arguments> </cd:command> - <cd:command name="catcodetable" type="environment" begin="push" end="pop" file="catc-ini.mkiv"/> + <cd:command name="catcodetable" type="environment" begin="push" end="pop" level="system" file="catc-ini.mkiv"/> - <cd:command name="restorecatcodes" file="catc-ini.mkiv"/> + <cd:command name="restorecatcodes" level="system" file="catc-ini.mkiv"/> - <cd:command name="setcatcodetable" file="catc-ini.mkiv"> + <cd:command name="setcatcodetable" level="system" file="catc-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="tracecatcodetables" file="catc-ini.mkiv"/> + <cd:command name="tracecatcodetables" level="system" file="catc-ini.mkiv"/> - <cd:command name="catcodetablename" file="catc-ini.mkiv"/> + <cd:command name="catcodetablename" level="system" file="catc-ini.mkiv"/> - <cd:command name="rescan" file="catc-sym.mkiv"> + <cd:command name="rescan" level="system" file="catc-sym.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="rescanwithsetup" file="catc-sym.mkiv"> + <cd:command name="rescanwithsetup" level="system" file="catc-sym.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml index a515ba1e9..16b73287a 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" file="typo-tal.mkiv"> + <cd:command name="singalcharacteralign" level="system" file="typo-tal.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="setcharacteralign" file="typo-tal.mkiv"> + <cd:command name="setcharacteralign" level="system" 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" file="typo-tal.mkiv"/> + <cd:command name="resetcharacteralign" level="system" file="typo-tal.mkiv"/> - <cd:command name="alignmentcharacter" file="typo-tal.mkiv"/> + <cd:command name="alignmentcharacter" level="system" file="typo-tal.mkiv"/> - <cd:command name="characteralign" type="environment" file="typo-tal.mkiv"> + <cd:command name="characteralign" type="environment" level="system" file="typo-tal.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkcharacteralign" file="typo-tal.mkiv"> + <cd:command name="checkcharacteralign" level="system" file="typo-tal.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-characterspacing.xml b/tex/context/interface/mkiv/i-characterspacing.xml index cb54030c7..950866c40 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" file="typo-spa.mkiv"> + <cd:command name="definecharacterspacing" level="style" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupcharacterspacing" file="typo-spa.mkiv"> + <cd:command name="setupcharacterspacing" level="style" file="typo-spa.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> diff --git a/tex/context/interface/mkiv/i-chart.xml b/tex/context/interface/mkiv/i-chart.xml index 06c356041..84899c44e 100644 --- a/tex/context/interface/mkiv/i-chart.xml +++ b/tex/context/interface/mkiv/i-chart.xml @@ -4,13 +4,111 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <?context-directive job ctxfile x-setups.ctx ?> + <!-- + + <cd:command name="setupFLOWchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <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:parameter> + <cd:parameter name="dx"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="dy"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="nx"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="ny"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="x"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="labeloffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="commentoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="exitoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="split"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="bodyfont"> + <cd:inherit name="setupbodyfont"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant type="test"/> + </cd:parameter> + <cd:parameter name="dot"> + <cd:constant type="yes"/> + <cd:constant type="con"/> + <cd:constant type="mid"/> + <cd:constant type="all"/> + </cd:parameter> + <cd:parameter name="hcompact"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="vcompact"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="focus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="autofocus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="background"> + <cd:resolve name="value-background"/> + </cd:parameter> + <cd:parameter name="framecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="frame"> + <cd:constant type="on"/> + <cd:constant type="off" default="yes"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> - <!-- still incomplete --> + <cd:command name="setupFLOWcharts" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWchart"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="setupFLOWcharts" file="m-chart.mkiv"> + --> + + <cd:command name="setupFLOWcharts" level="style" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> @@ -58,18 +156,28 @@ <cd:parameter name="option"> <cd:constant type="test"/> </cd:parameter> - <!-- dot: private option --> - <cd:parameter name="focus"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="autofocus"> + <!-- dot: private option + <cd:parameter name="dot"> + <cd:constant type="yes"/> + <cd:constant type="con"/> + <cd:constant type="mid"/> + <cd:constant type="all"/> + </cd:parameter> + --> + <cd:parameter name="hcompact"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> - <cd:parameter name="autofocus"> + <cd:parameter name="vcompact"> <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> </cd:parameter> + <cd:parameter name="focus"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="autofocus"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:parameter name="background"> <cd:resolve name="value-background"/> </cd:parameter> @@ -83,135 +191,351 @@ <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="frame"> - <cd:constant type="on" default="yes"/> - <cd:constant type="off"/> + <cd:constant type="on"/> + <cd:constant type="off" default="yes"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWlines" file="m-chart.mkiv"> + <!-- + <cd:command name="setupFLOWline" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="corner"> + <cd:constant type="round" default="yes"/> + </cd:parameter> + <cd:parameter name="arrow"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> + <cd:parameter name="dash"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="radius"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="offset"> + <cd:constant type="none"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupFLOWlines" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWline"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupFLOWlines" level="style" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> - <cd:parameter name="color"> - <cd:constant name="round"/> - <cd:constant name="normal" default="yes"/> + <cd:parameter name="corner"> + <cd:constant type="round" default="yes"/> </cd:parameter> <cd:parameter name="arrow"> - <cd:constant name="yes" default="yes"/> - <cd:constant name="no"/> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> </cd:parameter> <cd:parameter name="dash"> - <cd:constant name="yes"/> - <cd:constant name="no" default="yes"/> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> </cd:parameter> <cd:parameter name="radius"> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="color"> - <cd:constant name="cd:color"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant name="cd:dimension"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="offset"> + <cd:constant type="none"/> <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWshapes" file="m-chart.mkiv"> + <!-- + + <cd:command name="setupFLOWshape" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="default"> + <cd:resolve name="value-flowshape"/> + </cd:parameter> + <cd:parameter name="framecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupFLOWshapes" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupFLOWshape"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupFLOWshapes" level="style" file="m-chart.mkvi"> <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="default"> - <cd:resolve name="cd:name"/> + <cd:resolve name="value-flowshape"/> </cd:parameter> <cd:parameter name="framecolor"> - <cd:constant name="cd:color"/> - </cd:parameter> - <cd:parameter name="background"> - <cd:resolve name="value-background"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="backgroundcolor"> - <cd:constant name="cd:color"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant name="cd:dimension"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:constant type="none"/> - <cd:constant type="overlay"/> - <cd:constant type="standard"/> <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWfocus" file="m-chart.mkiv"> + <cd:command name="setupFLOWfocus" level="style" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> - <cd:parameter name="color"> + <cd:parameter name="framecolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="background"> - <cd:inherit name="setupFLOWshape"/> - </cd:parameter> <cd:parameter name="backgroundcolor"> - <cd:inherit name="setupFLOWshape"/> + <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:inherit name="setupFLOWshape"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:inherit name="setupFLOWshape"/> + <cd:constant type="cd:dimension"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupFLOWsplit" file="m-chart.mkiv"> + <cd:command name="setupFLOWsplit" level="style" file="m-chart.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="dx"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="dy"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="nx"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="ny"> - <cd:constant name="cd:number"/> + <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="command"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:oneargument"/> </cd:parameter> <cd:parameter name="before"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="after"> - <cd:constant name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <!-- + <cd:command name="FLOWchart" type="environment" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> - startFLOWchart [name] - FLOWchart [name] - startFLOWcell [key=value] - includeFLOWchart + <cd:command name="defineFLOWchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:content/> + </cd:arguments> + </cd:command> - name shape destination focus overlay location text label comment exit - connection include figure connect locate - --> + <cd:command name="FLOWcell" type="environment" file="m-chart.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWshape"/> + </cd:assignments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWline"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="FLOWchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWchart"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="FLOWcharts" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupFLOWsplit"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="name" scope="flowchart" 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:arguments> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-flowshape"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="destination" scope="flowchart" 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:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="overlay" scope="flowchart" 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:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="-"/> + <cd:constant type="+"/> + <cd:constant type="cd:number" prefix="cd:sign" method="none"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="figure" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="text" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="label" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="comment" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="exit" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:resolve name="value-chartlabel"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="connection" scope="flowchart" file="m-chart.mkvi"> + <cd:arguments> + <cd:keywords> + <cd:constant type="+"/> + <cd:constant type="-"/> + <cd:constant type="p"/> + <cd:constant type="m"/> + <cd:constant type="l"/> + <cd:constant type="r"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="␣"/> + </cd:keywords> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="include" file="m-chart.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="x"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </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-chemical.xml b/tex/context/interface/mkiv/i-chemical.xml index 1a81b82fc..ef6848d80 100644 --- a/tex/context/interface/mkiv/i-chemical.xml +++ b/tex/context/interface/mkiv/i-chemical.xml @@ -18,12 +18,12 @@ </cd:arguments> </cd:command> - <cd:command name="setupchemical" file="chem-str.mkiv"> + <cd:command name="setupchemical" level="style" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> <cd:parameter name="strut"> - <cd:inherit name="value-strut"/> + <cd:resolve name="value-strut"/> </cd:parameter> <cd:parameter name="width"> <cd:constant type="fit" default="yes"/> @@ -125,7 +125,7 @@ --> - <cd:command name="setupchemicalframed" file="chem-str.mkiv"> + <cd:command name="setupchemicalframed" level="style" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -242,7 +242,7 @@ --> - <cd:command name="definechemicals" file="chem-str.mkiv"> + <cd:command name="definechemicals" level="style" file="chem-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> diff --git a/tex/context/interface/mkiv/i-cleaning.xml b/tex/context/interface/mkiv/i-cleaning.xml index e37eb7999..dd54fdacc 100644 --- a/tex/context/interface/mkiv/i-cleaning.xml +++ b/tex/context/interface/mkiv/i-cleaning.xml @@ -4,11 +4,11 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="punctuation" type="environment" begin="push" end="pop" file="typo-chr.mkiv"/> + <cd:command name="punctuation" type="environment" begin="push" end="pop" level="system" file="typo-chr.mkiv"/> - <cd:command name="removepunctuation" file="typo-chr.mkiv"/> + <cd:command name="removepunctuation" level="system" file="typo-chr.mkiv"/> - <cd:command name="markcontent" file="typo-chr.mkiv"> + <cd:command name="markcontent" level="system" file="typo-chr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -19,7 +19,7 @@ </cd:arguments> </cd:command> - <cd:command name="markedcontent" type="environment" file="typo-chr.mkiv"> + <cd:command name="markedcontent" type="environment" level="system" file="typo-chr.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reset"/> @@ -29,13 +29,13 @@ </cd:arguments> </cd:command> - <cd:command name="removemarkedcontent" file="typo-chr.mkiv"> + <cd:command name="removemarkedcontent" level="system" file="typo-chr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcharactercleaning" file="typo-cln.mkiv"> + <cd:command name="setcharactercleaning" level="system" file="typo-cln.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> diff --git a/tex/context/interface/mkiv/i-clipping.xml b/tex/context/interface/mkiv/i-clipping.xml index aa152a85b..c7f7a1777 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" file="grph-trf.mkiv"> + <cd:command name="setupclipping" level="style" 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" file="grph-trf.mkiv"> + <cd:command name="clip" level="document" file="grph-trf.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupclipping"/> diff --git a/tex/context/interface/mkiv/i-collector.xml b/tex/context/interface/mkiv/i-collector.xml index a75f3534e..7bdf6270f 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" file="pack-box.mkiv"> + <cd:command name="definecollector" level="style" 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" file="pack-box.mkiv"> + <cd:command name="setupcollector" level="style" 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" file="pack-box.mkiv"> + <cd:command name="setcollector" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -71,13 +71,13 @@ </cd:arguments> </cd:command> - <cd:command name="flushcollector" file="pack-box.mkiv"> + <cd:command name="flushcollector" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="composedcollector" file="pack-box.mkiv"> + <cd:command name="composedcollector" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -92,7 +92,7 @@ </cd:arguments> </cd:command> - <cd:command name="collectedtext" file="pack-box.mkiv"> + <cd:command name="collectedtext" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcollector"/> diff --git a/tex/context/interface/mkiv/i-color.xml b/tex/context/interface/mkiv/i-color.xml index 4168216a9..9856c02b6 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" file="colo-ext.mkiv"> + <cd:command name="negatecolorbox" category="colors" file="colo-ext.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="colorintent" type="environment" file="colo-ext.mkiv"> + <cd:command name="colorintent" type="environment" 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" file="colo-ext.mkiv"/> + <cd:command name="overprint" type="environment" category="colors" file="colo-ext.mkiv"/> - <cd:command name="knockout" type="environment" file="colo-ext.mkiv"/> + <cd:command name="knockout" type="environment" category="colors" file="colo-ext.mkiv"/> - <cd:command name="textcolorintent" type="environment" file="colo-ext.mkiv"/> + <cd:command name="textcolorintent" type="environment" category="colors" file="colo-ext.mkiv"/> - <cd:command name="definecolorgroup" file="colo-grp.mkiv"> + <cd:command name="definecolorgroup" 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" file="colo-ini.mkiv"> + <cd:command name="definecolor" 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" file="colo-ini.mkiv"> + <cd:command name="definecolor" variant="name" 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" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" 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" file="colo-ini.mkiv"> + <cd:command name="defineglobalcolor" variant="name" 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" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" 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" file="colo-ini.mkiv"> + <cd:command name="definenamedcolor" variant="name" 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" file="colo-ini.mkiv"> + <cd:command name="defineprocesscolor" 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" file="colo-ini.mkiv"> + <cd:command name="definespotcolor" 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" file="colo-ini.mkiv"> + <cd:command name="definemultitonecolor" 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" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="1" 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" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="2" 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" file="colo-ini.mkiv"> + <cd:command name="definetransparency" variant="3" 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" file="colo-ini.mkiv"> + <cd:command name="switchtocolor" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="color" file="colo-ini.mkiv"> + <cd:command name="color" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloronly" file="colo-ini.mkiv"> + <cd:command name="coloronly" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="transparent" file="colo-ini.mkiv"> + <cd:command name="transparent" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="graycolor" file="colo-ini.mkiv"> + <cd:command name="graycolor" 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" file="colo-ini.mkiv"> + <cd:command name="colored" variant="name" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="colored" file="colo-ini.mkiv"> + <cd:command name="colored" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="definecolor"/> @@ -251,37 +251,37 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="coloronly" type="environment" file="colo-ini.mkiv"> + <cd:command name="coloronly" type="environment" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="transparent" type="environment" file="colo-ini.mkiv"> + <cd:command name="transparent" type="environment" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolor" file="colo-ini.mkiv"> + <cd:command name="directcolor" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" variant="name" file="colo-ini.mkiv"> + <cd:command name="directcolored" variant="name" category="colors" level="document" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="directcolored" file="colo-ini.mkiv"> + <cd:command name="directcolored" category="colors" level="document" 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" file="colo-ini.mkiv"/> + <cd:command name="currentcolor" type="environment" category="colors" file="colo-ini.mkiv"/> - <cd:command name="colorset" type="environment" file="colo-ini.mkiv"> + <cd:command name="colorset" type="environment" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usecolors" file="colo-ini.mkiv"> + <cd:command name="usecolors" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolor" file="colo-ini.mkiv"> + <cd:command name="setupcolor" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setupcolors" file="colo-ini.mkiv"> + <cd:command name="setupcolors" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -358,15 +358,15 @@ </cd:arguments> </cd:command> - <cd:command name="color" type="environment" begin="push" end="pop" file="colo-ini.mkiv"> + <cd:command name="color" type="environment" begin="push" end="pop" category="colors" level="system" 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" file="colo-ini.mkiv"/> + <cd:command name="color" type="environment" begin="save" end="restore" category="colors" level="system" file="colo-ini.mkiv"/> - <cd:command name="definepalet" file="colo-ini.mkiv"> + <cd:command name="definepalet" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -377,28 +377,28 @@ </cd:arguments> </cd:command> - <cd:command name="definepalet" variant="name" file="colo-ini.mkiv"> + <cd:command name="definepalet" variant="name" 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" file="colo-ini.mkiv"> + <cd:command name="getpaletsize" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="paletsize" file="colo-ini.mkiv"/> + <cd:command name="paletsize" category="colors" file="colo-ini.mkiv"/> - <cd:command name="setuppalet" file="colo-ini.mkiv"> + <cd:command name="setuppalet" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setcolormodell" file="colo-ini.mkiv"> + <cd:command name="setcolormodell" 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" file="colo-ini.mkiv"/> + <cd:command name="protectedcolors" type="environment" category="colors" file="colo-ini.mkiv"/> - <cd:command name="defineintermediatecolor" file="colo-ini.mkiv"> + <cd:command name="defineintermediatecolor" 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" file="color-ini.mkiv"> + <cd:command name="doifelsecolor" category="colors" level="system" 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" file="color-ini.mkiv"> + <cd:command name="doifcolorelse" category="colors" level="system" file="color-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> <cd:resolve name="argument-true"/> @@ -448,32 +448,32 @@ </cd:arguments> </cd:command> - <cd:command name="doifcolor" file="color-ini.mkiv"> + <cd:command name="doifcolor" category="colors" level="system" 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" file="colo-ini.mkiv"> + <cd:command name="textcolor" type="environment" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcolor" file="colo-ini.mkiv"> + <cd:command name="MPcolor" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPcoloronly" file="colo-ini.mkiv"> + <cd:command name="MPcoloronly" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="MPtransparency" file="colo-ini.mkiv"> + <cd:command name="MPtransparency" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> @@ -485,37 +485,37 @@ </cd:arguments> </cd:command> - <cd:command name="colorvalue" file="colo-ini.mkiv"> + <cd:command name="colorvalue" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="grayvalue" file="colo-ini.mkiv"> + <cd:command name="grayvalue" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="colorcomponents" file="colo-ini.mkiv"> + <cd:command name="colorcomponents" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="transparencycomponents" file="colo-ini.mkiv"> + <cd:command name="transparencycomponents" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="processcolorcomponents" file="colo-ini.mkiv"> + <cd:command name="processcolorcomponents" category="colors" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-color"/> </cd:arguments> </cd:command> - <cd:command name="doifelseblack" file="colo-ini.mkiv"> + <cd:command name="doifelseblack" category="colors" level="system" 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" file="colo-ini.mkiv"> + <cd:command name="doifblackelse" category="colors" level="system" 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" file="colo-ini.mkiv"> + <cd:command name="doifelsedrawingblack" category="colors" level="system" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifdrawingblackelse" file="colo-ini.mkiv"> + <cd:command name="doifdrawingblackelse" category="colors" level="system" file="colo-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="showcolorbar" file="colo-run.mkiv"> + <cd:command name="showcolorbar" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolor" file="colo-run.mkiv"> + <cd:command name="showcolor" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorset" file="colo-run.mkiv"> + <cd:command name="showcolorset" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showcolorcomponents" file="colo-run.mkiv"> + <cd:command name="showcolorcomponents" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-color"/> </cd:arguments> </cd:command> - <cd:command name="showpalet" file="colo-run.mkiv"> + <cd:command name="showpalet" 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" file="colo-run.mkiv"> + <cd:command name="comparepalet" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcolorgroup" file="colo-run.mkiv"> + <cd:command name="showcolorgroup" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -601,7 +601,7 @@ </cd:arguments> </cd:command> - <cd:command name="comparecolorgroup" file="colo-run.mkiv"> + <cd:command name="comparecolorgroup" category="colors" file="colo-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml index 154d38072..ce98104d2 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" file="page-mul.mkiv"> + <cd:command name="setupcolumns" level="style" 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" file="page-mul.mkiv"> + <cd:command name="columns" type="environment" level="document" 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" file="page-mul.mkiv"> + <cd:command name="setupcolumnspan" level="style" file="page-mul.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="n"> diff --git a/tex/context/interface/mkiv/i-combination.xml b/tex/context/interface/mkiv/i-combination.xml index 492edadd0..489d2494c 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" file="pack-com.mkiv"> + <cd:command name="definecombination" level="style" 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" file="pack-com.mkiv"> + <cd:command name="setupcombination" level="style" 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" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" variant="matrix" level="document" 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" file="pack-com.mkiv"> + <cd:command name="combination" type="environment" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -111,7 +111,7 @@ --> - <cd:command name="floatcombination" type="environment" variant="matrix" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" variant="matrix" level="document" 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" file="pack-com.mkiv"> + <cd:command name="floatcombination" type="environment" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupcombination"/> diff --git a/tex/context/interface/mkiv/i-commandhandler.xml b/tex/context/interface/mkiv/i-commandhandler.xml index 6550898b6..40da525f3 100644 --- a/tex/context/interface/mkiv/i-commandhandler.xml +++ b/tex/context/interface/mkiv/i-commandhandler.xml @@ -4,42 +4,42 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installrootparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installrootparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparameterhashhandler" file="mult-aux.mkiv"> + <cd:command name="installparameterhashhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installparametersethandler" file="mult-aux.mkiv"> + <cd:command name="installparametersethandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installstyleandcolorhandler" file="mult-aux.mkiv"> + <cd:command name="installstyleandcolorhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinehandler" file="mult-aux.mkiv"> + <cd:command name="installdefinehandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -47,35 +47,35 @@ </cd:arguments> </cd:command> - <cd:command name="installsetuphandler" file="mult-aux.mkiv"> + <cd:command name="installsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installswitchsetuphandler" file="mult-aux.mkiv"> + <cd:command name="installswitchsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installautosetuphandler" file="mult-aux.mkiv"> + <cd:command name="installautosetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installbasicparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installbasicautosetuphandler" file="mult-aux.mkiv"> + <cd:command name="installbasicautosetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -83,7 +83,7 @@ </cd:arguments> </cd:command> - <cd:command name="installcommandhandler" file="mult-aux.mkiv"> + <cd:command name="installcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -91,7 +91,7 @@ </cd:arguments> </cd:command> - <cd:command name="installswitchcommandhandler" file="mult-aux.mkiv"> + <cd:command name="installswitchcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="installautocommandhandler" file="mult-aux.mkiv"> + <cd:command name="installautocommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -107,7 +107,7 @@ </cd:arguments> </cd:command> - <cd:command name="installsimplecommandhandler" file="mult-aux.mkiv"> + <cd:command name="installsimplecommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -115,49 +115,49 @@ </cd:arguments> </cd:command> - <cd:command name="installdirectparameterhandler" file="mult-aux.mkiv"> + <cd:command name="installdirectparameterhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectsetuphandler" file="mult-aux.mkiv"> + <cd:command name="installdirectsetuphandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectparametersethandler" file="mult-aux.mkiv"> + <cd:command name="installdirectparametersethandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectstyleandcolorhandler" file="mult-aux.mkiv"> + <cd:command name="installdirectstyleandcolorhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdirectcommandhandler" file="mult-aux.mkiv"> + <cd:command name="installdirectcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installsetuponlycommandhandler" file="mult-aux.mkiv"> + <cd:command name="installsetuponlycommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relateparameterhandlers" file="mult-aux.mkiv"> + <cd:command name="relateparameterhandlers" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -166,25 +166,25 @@ </cd:arguments> </cd:command> - <cd:command name="installactionhandler" file="mult-aux.mkiv"> + <cd:command name="installactionhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installnamespace" file="mult-aux.mkiv"> + <cd:command name="installnamespace" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installcorenamespace" file="mult-aux.mkiv"> + <cd:command name="installcorenamespace" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definenamespace" file="mult-aux.mkiv"> + <cd:command name="definenamespace" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -221,16 +221,16 @@ </cd:arguments> </cd:command> - <cd:command name="listnamespaces" file="mult-aux.mkiv"/> + <cd:command name="listnamespaces" level="system" file="mult-aux.mkiv"/> - <cd:command name="showparentchain" file="mult-aux.mkiv"> + <cd:command name="showparentchain" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecommandhandler" file="mult-aux.mkiv"> + <cd:command name="doifelsecommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -239,7 +239,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommandhandlerelse" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandlerelse" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -248,7 +248,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcommandhandler" file="mult-aux.mkiv"> + <cd:command name="doifcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -256,7 +256,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotcommandhandler" file="mult-aux.mkiv"> + <cd:command name="doifnotcommandhandler" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -264,14 +264,14 @@ </cd:arguments> </cd:command> - <cd:command name="installdefinitionset" file="mult-aux.mkiv"> + <cd:command name="installdefinitionset" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installdefinitionsetmember" file="mult-aux.mkiv"> + <cd:command name="installdefinitionsetmember" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -280,14 +280,14 @@ </cd:arguments> </cd:command> - <cd:command name="installparentinjector" file="mult-aux.mkiv"> + <cd:command name="installparentinjector" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="installframedcommandhandler" file="pack-rul.mkiv"> + <cd:command name="installframedcommandhandler" level="system" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="installframedautocommandhandler" file="pack-rul.mkiv"> + <cd:command name="installframedautocommandhandler" level="system" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> @@ -303,7 +303,7 @@ </cd:arguments> </cd:command> - <cd:command name="installsimpleframedcommandhandler" file="pack-rul.mkiv"> + <cd:command name="installsimpleframedcommandhandler" level="system" file="pack-rul.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-comment.xml b/tex/context/interface/mkiv/i-comment.xml index e7f18fb0e..918d8a5f4 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" file="scrn-wid.mkvi"> + <cd:command name="definecomment" level="style" 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" file="scrn-wid.mkvi"> + <cd:command name="setupcomment" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -87,13 +87,19 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="space"> + <cd:constant type="yes"/> + </cd:parameter> + <cd:parameter name="buffer"> + <cd:constant type="cd:buffer"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="comment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="comment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-text-optional"/> @@ -103,13 +109,13 @@ <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> - <cd:constant value="comment"/> + <cd:resolve name="instance-comment"/> </cd:instances> </cd:command> - <cd:command name="comment" type="environment" generated="yes" variant="example" file="scrn-wid.mkvi"> + <cd:command name="comment" type="environment" generated="yes" variant="instance" level="document" file="scrn-wid.mkvi"> <cd:sequence> - <cd:variable value="comment"/> + <cd:instance value="comment"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-text-optional"/> @@ -118,29 +124,33 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="comment"/> + <cd:resolve name="instance-comment"/> </cd:instances> </cd:command> - <cd:command name="placecomments" file="scrn-wid.mkvi"/> + <cd:command name="placecomments" level="document" file="scrn-wid.mkvi"/> - <cd:command name="comment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-text-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="comment" type="environment" file="scrn-wid.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-text-optional"/> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupcomment"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="comment" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-text-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupcomment"/> + </cd:assignments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="comment" type="environment" file="scrn-wid.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-text-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupcomment"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> </cd:interface> diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml index b3b2cd5bc..787475e8b 100644 --- a/tex/context/interface/mkiv/i-common-argument.xml +++ b/tex/context/interface/mkiv/i-common-argument.xml @@ -89,32 +89,6 @@ </cd:keywords> </cd:define> - <!-- @WS: These were unresolved. Shouldn't they become text? --> - - <cd:define name="argument-content"> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-optional"> - <cd:keywords delimiters="braces" optional="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-list"> - <cd:keywords delimiters="braces" list="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - - <cd:define name="argument-content-list-optional"> - <cd:keywords delimiters="braces" list="yes" optional="yes"> - <cd:content/> - </cd:keywords> - </cd:define> - <!-- * --> <!-- \... {...} --> <!-- --> @@ -547,4 +521,15 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... {...} --> + <!-- --> + <!-- * TOCHAR --> + + <cd:define name="argument-tochar"> + <cd:keywords delimiters="braces"> + <cd:resolve name="value-tochar"/> + </cd:keywords> + </cd:define> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml index 8cde55b2e..b00ee9a92 100644 --- a/tex/context/interface/mkiv/i-common-instance.xml +++ b/tex/context/interface/mkiv/i-common-instance.xml @@ -2,6 +2,50 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + <cd:define name="instance-attachment"> + <cd:constant value="attachment"/> + </cd:define> + + <cd:define name="instance-bar"> + <cd:constant value="overbar"/> + <cd:constant value="underbar"/> + <cd:constant value="overstrike"/> + <cd:constant value="understrike"/> + <cd:constant value="overbars"/> + <cd:constant value="underbars"/> + <cd:constant value="overstrikes"/> + <cd:constant value="understrikes"/> + <cd:constant value="underrandom"/> + <cd:constant value="underrandoms"/> + <cd:constant value="underdash"/> + <cd:constant value="underdashes"/> + <cd:constant value="underdot"/> + <cd:constant value="underdots"/> + <cd:constant value="nobar"/> + <cd:constant value="hiddenbar"/> + </cd:define> + + <cd:define name="instance-buffer"> + <cd:constant value="hiding"/> + </cd:define> + + <cd:define name="instance-comment"> + <cd:constant value="comment"/> + </cd:define> + + <cd:define name="instance-delimitedtext"> + <cd:constant value="quotation"/> + <cd:constant value="quote"/> + <cd:constant value="blockquote"/> + <cd:constant value="speech"/> + <cd:constant value="aside"/> + </cd:define> + + <cd:define name="instance-fittingpage"> + <cd:constant value="TEXpage"/> + <cd:constant value="MPpage"/> + </cd:define> + <cd:define name="instance-float"> <cd:constant value="chemical"/> <cd:constant value="figure"/> @@ -10,79 +54,170 @@ <cd:constant value="graphic"/> </cd:define> + <cd:define name="instance-floatlist"> + <cd:constant value="chemicals"/> + <cd:constant value="figures"/> + <cd:constant value="tables"/> + <cd:constant value="intermezzi"/> + <cd:constant value="graphics"/> + </cd:define> + + <cd:define name="instance-formula"> + <cd:constant value="sp"/> + <cd:constant value="sd"/> + <cd:constant value="mp"/> + <cd:constant value="md"/> + </cd:define> + + <cd:define name="instance-fraction"> + <cd:constant value="xfrac"/> + <cd:constant value="xxfrac"/> + <cd:constant value="frac"/> + <cd:constant value="sfrac"/> + <cd:constant value="dfrac"/> + <cd:constant value="binom"/> + <cd:constant value="dbinom"/> + <cd:constant value="tbinom"/> + </cd:define> + + <cd:define name="instance-mathframed"> + <cd:constant value="mframed"/> + <cd:constant value="inmframed"/> + <cd:constant value="mcframed"/> + </cd:define> + + <cd:define name="instance-framedtext"> + <cd:constant value="framedtext"/> + </cd:define> + + <cd:define name="instance-framed"> + <cd:constant value="unframed"/> + <cd:constant value="fitfieldframed"/> + </cd:define> + + <cd:define name="instance-help"> + <cd:constant value="helptext"/> + </cd:define> + <cd:define name="instance-itemgroup"> <cd:constant value="itemize"/> </cd:define> - <cd:define name="instance-labeltext"> - <!-- tode --> + <cd:define name="instance-labelclass"> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> + <cd:constant value="taglabel"/> + <cd:constant value="unit"/> + <cd:constant value="operator"/> + <cd:constant value="prefix"/> + <cd:constant value="suffix"/> + <cd:constant value="btxlabel"/> </cd:define> - <cd:define name="instance-labelclass"> - <!-- tode --> + <cd:define name="instance-labeltext"> + <cd:constant value="head"/> + <cd:constant value="label"/> + <cd:constant value="mathlabel"/> </cd:define> <cd:define name="instance-lines"> - <!-- tode --> + <cd:constant value="lines"/> </cd:define> <cd:define name="instance-combinedlist"> - <!-- tode --> + <cd:constant value="content"/> </cd:define> <cd:define name="instance-low"> - <!-- tode --> + <cd:constant value="unitslow"/> </cd:define> <cd:define name="instance-high"> - <!-- tode --> + <cd:constant value="unitshigh"/> </cd:define> <cd:define name="instance-makeup"> - <!-- tode --> + <cd:constant value="standard"/> + <cd:constant value="page"/> + <cd:constant value="text"/> + <cd:constant value="middle"/> </cd:define> <cd:define name="instance-margindata"> - <!-- tode --> + <cd:constant value="inleftmargin"/> + <cd:constant value="inrightmargin"/> + <cd:constant value="inoutermargin"/> + <cd:constant value="ininnermargin"/> + <cd:constant value="inleftedge"/> + <cd:constant value="inrightedge"/> + <cd:constant value="inouteredge"/> + <cd:constant value="ininneredge"/> + <cd:constant value="atleftmargin"/> + <cd:constant value="atrightmargin"/> + <cd:constant value="inleft"/> + <cd:constant value="inright"/> + <cd:constant value="inouter"/> + <cd:constant value="ininner"/> + <cd:constant value="inmargin"/> + <cd:constant value="inother"/> + <cd:constant value="margintext"/> + <!-- + <cd:constant value="marginword"/> + <cd:constant value="margintitle"/> + <cd:constant value="inothermargin"/> + --> </cd:define> <cd:define name="instance-mathalignment"> - <!-- tode --> + <cd:constant value="align"/> + <cd:constant value="mathalignment"/> </cd:define> <cd:define name="instance-mathcases"> - <!-- tode --> + <cd:constant value="cases"/> + <cd:constant value="mathcases"/> </cd:define> <cd:define name="instance-mathmatrix"> - <!-- tode --> + <cd:constant value="matrix"/> + <cd:constant value="mathmatrix"/> </cd:define> <cd:define name="instance-mixedcolumns"> - <!-- tode --> + <cd:constant value="itemgroupcolumns"/> + <cd:constant value="boxedcolumns"/> </cd:define> <cd:define name="instance-note"> - <!-- tode --> + <cd:constant value="footnote"/> + <cd:constant value="endnote"/> </cd:define> <cd:define name="instance-linenote"> - <!-- tode --> + <cd:constant value="linenote"/> </cd:define> <cd:define name="instance-pairedbox"> - <!-- tode --> + <cd:constant value="legend"/> </cd:define> <cd:define name="instance-register"> - <!-- tode --> + <cd:constant value="index"/> </cd:define> <cd:define name="instance-script"> - <!-- tode --> + <cd:constant value="hangul"/> + <cd:constant value="hanzi"/> + <cd:constant value="nihongo"/> + <cd:constant value="ethiopic"/> + <cd:constant value="thai"/> + <cd:constant value="latin"/> + <cd:constant value="test"/> </cd:define> <cd:define name="instance-section"> + <cd:constant value="part"/> <cd:constant value="chapter"/> <cd:constant value="section"/> <cd:constant value="subsection"/> @@ -98,43 +233,53 @@ </cd:define> <cd:define name="instance-sectionblock"> - <!-- tode --> + <cd:constant value="frontmatter"/> + <cd:constant value="bodymatter"/> + <cd:constant value="appendices"/> + <cd:constant value="backmatter"/> </cd:define> <cd:define name="instance-shift"> - <!-- tode --> + <cd:constant value="shiftup"/> + <cd:constant value="shiftdown"/> </cd:define> <cd:define name="instance-sort"> - <!-- tode --> + <cd:constant value="logo"/> </cd:define> <cd:define name="instance-sortlist"> - <!-- tode --> + <cd:constant value="logos"/> </cd:define> <cd:define name="instance-synonym"> - <!-- tode --> + <cd:constant value="abbreviation"/> </cd:define> <cd:define name="instance-synonymlist"> - <!-- tode --> + <cd:constant value="abbreviations"/> </cd:define> <cd:define name="instance-tabulate"> - <!-- tode --> + <cd:constant value="legend"/> + <cd:constant value="fact"/> </cd:define> <cd:define name="instance-tooltip"> - <!-- tode --> + <cd:constant value="tooltip"/> </cd:define> <cd:define name="instance-unit"> - <!-- tode --> + <cd:constant value="unit"/> </cd:define> <cd:define name="instance-typing"> - <!-- tode --> + <cd:constant value="typing"/> + <cd:constant value="LUA"/> + <cd:constant value="MP"/> + <cd:constant value="PARSEDXML"/> + <cd:constant value="TEX"/> + <cd:constant value="XML"/> </cd:define> </cd:interface> diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml index e087ea5ac..9671a4528 100644 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ b/tex/context/interface/mkiv/i-common-keyword.xml @@ -750,4 +750,45 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * SCITE --> + + <cd:define name="keyword-scite-optional"> + <cd:keywords optional="yes"> + <cd:constant type="tex"/> + <cd:constant type="mkiv"/> + <cd:constant type="mkvi"/> + <cd:constant type="mkxi"/> + <cd:constant type="mkix"/> + <cd:constant type="mkii"/> + <cd:constant type="cld"/> + <cd:constant type="lua"/> + <cd:constant type="lfg"/> + <cd:constant type="lus"/> + <cd:constant type="mp"/> + <cd:constant type="mkiv"/> + <cd:constant type="mkii"/> + <cd:constant type="w"/> + <cd:constant type="ww"/> + <cd:constant type="c"/> + <cd:constant type="h"/> + <cd:constant type="cpp"/> + <cd:constant type="hpp"/> + <cd:constant type="cxx"/> + <cd:constant type="hxx"/> + <cd:constant type="xml"/> + <cd:constant type="lmx"/> + <cd:constant type="ctx"/> + <cd:constant type="xsl"/> + <cd:constant type="xsd"/> + <cd:constant type="rlx"/> + <cd:constant type="css"/> + <cd:constant type="dtd"/> + <cd:constant type="bib"/> + <cd:constant type="rme"/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-string.xml b/tex/context/interface/mkiv/i-common-string.xml index 68bde02ed..5ef1fc71a 100644 --- a/tex/context/interface/mkiv/i-common-string.xml +++ b/tex/context/interface/mkiv/i-common-string.xml @@ -152,4 +152,21 @@ </cd:keywords> </cd:define> + <!-- * --> + <!-- \... ... --> + <!-- --> + <!-- * ASSIGNMENT --> + + <cd:define name="string-assignment"> + <cd:keywords delimiters="none"> + <cd:constant type="="/> + </cd:keywords> + </cd:define> + + <cd:define name="string-assignment-optional"> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="="/> + </cd:keywords> + </cd:define> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-value.xml b/tex/context/interface/mkiv/i-common-value.xml index 36f2c1d52..9f919b58e 100644 --- a/tex/context/interface/mkiv/i-common-value.xml +++ b/tex/context/interface/mkiv/i-common-value.xml @@ -296,10 +296,10 @@ <cd:constant type="page"/> <cd:constant type="leftpage"/> <cd:constant type="rightpage"/> - <cd:constant type="header"/> - <cd:constant type="footer"/> <cd:constant type="somewhere"/> <cd:constant type="effective"/> + <cd:constant type="header"/> + <cd:constant type="footer"/> </cd:define> <!-- sortorder = ... --> @@ -593,4 +593,70 @@ <cd:constant type="cd:reference"/> </cd:define> + <!-- shape = ... --> + + <cd:define name="value-flowshape"> + <cd:constant type="none"/> + <cd:constant type="node"/> + <cd:constant type="action"/> + <cd:constant type="procedure"/> + <cd:constant type="product"/> + <cd:constant type="subprocedure"/> + <cd:constant type="singledocument"/> + <cd:constant type="multidocument"/> + <cd:constant type="decision"/> + <cd:constant type="archive"/> + <cd:constant type="loop"/> + <cd:constant type="wait"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="up"/> + <cd:constant type="down"/> + <cd:constant type="cd:number"/> + </cd:define> + + <!-- location = ... --> + + <cd:define name="value-chartlabel"> + <cd:constant type="l"/> + <cd:constant type="r"/> + <cd:constant type="t"/> + <cd:constant type="b"/> + <cd:constant type="lt"/> + <cd:constant type="rt"/> + <cd:constant type="lb"/> + <cd:constant type="rb"/> + <cd:constant type="tl"/> + <cd:constant type="tr"/> + <cd:constant type="bl"/> + <cd:constant type="br"/> + <!-- text only + <cd:constant type="c"/> + <cd:constant type="m"/> + --> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <!-- text only + <cd:constant type="center"/> + <cd:constant type="middle"/> + --> + </cd:define> + + <!-- tochar = ... ---> + + <cd:define name="value-tochar"> + <cd:constant prefix="e" type="cd:name" method="range"/> + <cd:constant prefix="x" type="cd:number" method="range"/> + <cd:constant prefix="d" type="cd:number" method="range"/> + <cd:constant prefix="s" type="cd:number" method="range"/> + <cd:constant prefix="i" type="cd:number" method="range"/> + <cd:constant prefix="n" type="cd:name" method="range"/> + <cd:constant prefix="c" type="cd:name" method="range"/> + <cd:constant prefix="u" type="cd:name" method="range"/> + <cd:constant prefix="a" type="cd:name" method="range"/> + </cd:define> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-context-modules.xml b/tex/context/interface/mkiv/i-context-modules.xml new file mode 100644 index 000000000..319ba53df --- /dev/null +++ b/tex/context/interface/mkiv/i-context-modules.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<!-- + + Right from the start the ConTeXt user interface was sytematic enough to be described using a + common framework. First it was done in the TeX language at the top of the files where features + were implemented. Later we switched to XML where all definitions were moved to one file. That + file could be translated to different user interfaces. + + The current XML files are a follow up on this. Instead of one big file we now have many small + files, and support for shared (XML) definitions has been extended. Many more commands are defined, + including those considered low level. There are no longer translated files needed but you can + still generate them. + + These files can be used to generate overviews (see x-setups-*.mkiv) but also for generating + information for text editors. We also use them for the (local) help service. + + Wolfgang Schuster & Hans Hagen + +--> + + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:interfacefile filename="i-common-definitions.xml"/> + + <cd:interfacefile filename="i-chart.xml"/> + <cd:interfacefile filename="i-database.xml"/> + <cd:interfacefile filename="i-hemistich.xml"/> + <cd:interfacefile filename="i-ipsum.xml"/> + <cd:interfacefile filename="i-scite.xml"/> + <cd:interfacefile filename="i-setup.xml"/> + <cd:interfacefile filename="i-spreadsheet.xml"/> + <cd:interfacefile filename="i-steps.xml"/> + <cd:interfacefile filename="i-translate.xml"/> + <cd:interfacefile filename="i-visual.xml"/> + +</cd:interface> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 304cdbe33..23c4a1f20 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-conversion.xml b/tex/context/interface/mkiv/i-conversion.xml index 47440ddac..af679b8e0 100644 --- a/tex/context/interface/mkiv/i-conversion.xml +++ b/tex/context/interface/mkiv/i-conversion.xml @@ -4,211 +4,211 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="numbers" file="core-con.mkiv"> + <cd:command name="numbers" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Numbers" file="core-con.mkiv"> + <cd:command name="Numbers" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="romannumerals" file="core-con.mkiv"> + <cd:command name="romannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Romannumerals" file="core-con.mkiv"> + <cd:command name="Romannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnumerals" file="core-con.mkiv"> + <cd:command name="abjadnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnodotnumerals" file="core-con.mkiv"> + <cd:command name="abjadnodotnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="abjadnaivenumerals" file="core-con.mkiv"> + <cd:command name="abjadnaivenumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languagecharacters" file="core-con.mkiv"> + <cd:command name="languagecharacters" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="languageCharacters" file="core-con.mkiv"> + <cd:command name="languageCharacters" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="alphabeticnumerals" file="core-con.mkiv"> + <cd:command name="alphabeticnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Alphabeticnumerals" file="core-con.mkiv"> + <cd:command name="Alphabeticnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="thainumerals" file="core-con.mkiv"> + <cd:command name="thainumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="devanagarinumerals" file="core-con.mkiv"> + <cd:command name="devanagarinumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gurmurkhinumerals" file="core-con.mkiv"> + <cd:command name="gurmurkhinumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="gujaratinumerals" file="core-con.mkiv"> + <cd:command name="gujaratinumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tibetannumerals" file="core-con.mkiv"> + <cd:command name="tibetannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="greeknumerals" file="core-con.mkiv"> + <cd:command name="greeknumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Greeknumerals" file="core-con.mkiv"> + <cd:command name="Greeknumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicnumerals" file="core-con.mkiv"> + <cd:command name="arabicnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiannumerals" file="core-con.mkiv"> + <cd:command name="persiannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicdecimals" file="core-con.mkiv"> + <cd:command name="arabicdecimals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="persiandecimals" file="core-con.mkiv"> + <cd:command name="persiandecimals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="arabicexnumerals" file="core-con.mkiv"> + <cd:command name="arabicexnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumerals" file="core-con.mkiv"> + <cd:command name="koreannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsp" file="core-con.mkiv"> + <cd:command name="koreannumeralsp" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreannumeralsc" file="core-con.mkiv"> + <cd:command name="koreannumeralsc" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreanparentnumerals" file="core-con.mkiv"> + <cd:command name="koreanparentnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="koreancirclenumerals" file="core-con.mkiv"> + <cd:command name="koreancirclenumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesenumerals" file="core-con.mkiv"> + <cd:command name="chinesenumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chinesecapnumerals" file="core-con.mkiv"> + <cd:command name="chinesecapnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="chineseallnumerals" file="core-con.mkiv"> + <cd:command name="chineseallnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="character" file="core-con.mkiv"> + <cd:command name="character" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Character" file="core-con.mkiv"> + <cd:command name="Character" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="characters" file="core-con.mkiv"> + <cd:command name="characters" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="Characters" file="core-con.mkiv"> + <cd:command name="Characters" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> @@ -314,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="currentdate" file="core-con.mkiv"> + <cd:command name="currentdate" level="document" 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" file="core-con.mkiv"> + <cd:command name="date" level="document" file="core-con.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="d"> @@ -385,7 +385,7 @@ </cd:arguments> </cd:command> - <cd:command name="currenttime" file="core-con.mkiv"> + <cd:command name="currenttime" level="document" file="core-con.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="h"/> @@ -412,7 +412,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineconversion" file="core-con.mkiv"> + <cd:command name="defineconversion" 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" file="core-con.mkiv"> + <cd:command name="defineconversion" variant="list" category="counter" 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" file="core-con.mkiv"> + <cd:command name="convertnumber" category="counter" level="document" 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" file="core-con.mkiv"> + <cd:command name="uconvertnumber" 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" file="core-con.mkiv"> + <cd:command name="doifelseconversiondefined" category="counter" level="system" 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" file="core-con.mkiv"> + <cd:command name="doifconversiondefinedelse" category="counter" level="system" 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" file="core-con.mkiv"> + <cd:command name="doifelseconversionnumber" category="counter" level="system" 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" file="core-con.mkiv"> + <cd:command name="doifconversionnumberelse" category="counter" level="system" 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" file="core-con.mkiv"> + <cd:command name="wordtonumber" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="one"/> @@ -582,61 +582,61 @@ </cd:arguments> </cd:command> - <cd:command name="verbosenumber" file="core-con.mkiv"> + <cd:command name="verbosenumber" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="VerboseNumber" file="core-con.mkiv"> + <cd:command name="VerboseNumber" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedromannumerals" file="core-con.mkiv"> + <cd:command name="smallcappedromannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="smallcappedcharacters" file="core-con.mkiv"> + <cd:command name="smallcappedcharacters" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="sloveniannumerals" file="core-con.mkiv"> + <cd:command name="sloveniannumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="slovenianNumerals" file="core-con.mkiv"> + <cd:command name="slovenianNumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishnumerals" file="core-con.mkiv"> + <cd:command name="spanishnumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="spanishNumerals" file="core-con.mkiv"> + <cd:command name="spanishNumerals" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="unihex" file="core-con.mkiv"> + <cd:command name="unihex" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="continuednumber" file="core-con.mkiv"> + <cd:command name="continuednumber" category="counter" file="core-con.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml index 55630b511..124638026 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" file="strc-num.mkiv"> + <cd:command name="definecounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="setupcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifelsecounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifcounterelse" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotcounter" file="strc-num.mkiv"> + <cd:command name="doifnotcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="setcounter" file="strc-num.mkiv"> + <cd:command name="setcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="setcounterown" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="restartcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="resetcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="incrementcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="decrementcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="rawcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="lastcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="firstcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="nextcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="prevcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="countersubs" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="savecounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="restorecounter" file="strc-num.mkiv"> + <cd:command name="restorecounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showcounter" file="strc-num.mkiv"> + <cd:command name="showcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="incrementedcounter" file="strc-num.mkiv"> + <cd:command name="incrementedcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementedcounter" file="strc-num.mkiv"> + <cd:command name="decrementedcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawcountervalue" file="strc-num.mkiv"> + <cd:command name="rawcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="lastcountervalue" file="strc-num.mkiv"> + <cd:command name="lastcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="firstcountervalue" file="strc-num.mkiv"> + <cd:command name="firstcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextcountervalue" file="strc-num.mkiv"> + <cd:command name="nextcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="prevcountervalue" file="strc-num.mkiv"> + <cd:command name="prevcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="rawsubcountervalue" file="strc-num.mkiv"> + <cd:command name="rawsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="lastsubcountervalue" file="strc-num.mkiv"> + <cd:command name="lastsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="firstsubcountervalue" file="strc-num.mkiv"> + <cd:command name="firstsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="nextsubcountervalue" file="strc-num.mkiv"> + <cd:command name="nextsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="prevsubcountervalue" file="strc-num.mkiv"> + <cd:command name="prevsubcountervalue" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="convertedcounter" file="strc-num.mkiv"> + <cd:command name="convertedcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="convertedsubcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="directconvertedcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifelsedefinedcounter" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounterelse" category="counter" level="system" 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" file="strc-num.mkiv"> + <cd:command name="doifdefinedcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifundefinedcounter" file="strc-num.mkiv"> + <cd:command name="doifundefinedcounter" category="counter" level="system" file="strc-num.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="defineresetset" file="strc-ini.mkvi"> + <cd:command name="defineresetset" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -416,7 +416,7 @@ --> - <cd:command name="defineseparatorset" file="strc-ini.mkvi"> + <cd:command name="defineseparatorset" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -450,7 +450,7 @@ --> - <cd:command name="defineconversionset" file="strc-ini.mkvi"> + <cd:command name="defineconversionset" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -488,7 +488,7 @@ --> - <cd:command name="defineprefixset" file="strc-ini.mkvi"> + <cd:command name="defineprefixset" category="counter" file="strc-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> diff --git a/tex/context/interface/mkiv/i-database.xml b/tex/context/interface/mkiv/i-database.xml new file mode 100644 index 000000000..0eb961a87 --- /dev/null +++ b/tex/context/interface/mkiv/i-database.xml @@ -0,0 +1,118 @@ +<?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="definedatabase" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupdatabase" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="strip"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="tab"/> + <cd:constant type="tabs"/> + <cd:constant type="comma"/> + <cd:constant type="space"/> + <cd:constant type="spaces"/> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="quotechar"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="commentchar"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="setups" list="yes"> + <cd:constant type="cd:name"/> + </cd:parameter> + <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="first"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="last"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="left"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="right"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:csname"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="processdatabasebuffer" 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:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="defineseparatedlist" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="processseparatedlist" 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:sequence> + <cd:instance value="separatedlist"/> + </cd:sequence> + </cd:command> + + <cd:command name="separatedlist" type="environment" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="setupseparatedlist" level="style" file="m-database.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupdatabase"/> + </cd:assignments> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-dataset.xml b/tex/context/interface/mkiv/i-dataset.xml index 6f4f9fb9f..afb8f8fa3 100644 --- a/tex/context/interface/mkiv/i-dataset.xml +++ b/tex/context/interface/mkiv/i-dataset.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definedataset" file="core-dat.mkiv"> + <cd:command name="definedataset" level="system" file="core-dat.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="setupdataset" file="core-dat.mkiv"> + <cd:command name="setupdataset" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setdataset" file="core-dat.mkiv"> + <cd:command name="setdataset" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="datasetvariable" file="core-dat.mkiv"> + <cd:command name="datasetvariable" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> diff --git a/tex/context/interface/mkiv/i-define.xml b/tex/context/interface/mkiv/i-define.xml index 2db8614c0..f37645cf1 100644 --- a/tex/context/interface/mkiv/i-define.xml +++ b/tex/context/interface/mkiv/i-define.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="define" file="core-sys.mkiv"> + <cd:command name="define" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:csname/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineexpandable" file="core-sys.mkiv"> + <cd:command name="defineexpandable" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> <cd:csname/> diff --git a/tex/context/interface/mkiv/i-delimitedtext.xml b/tex/context/interface/mkiv/i-delimitedtext.xml index d75fb957e..e64693210 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" file="typo-del.mkiv"> + <cd:command name="definedelimitedtext" category="language" level="style" 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" file="typo-del.mkiv"> + <cd:command name="setupdelimitedtext" category="language" level="style" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -90,26 +90,22 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" generated="yes" variant="example" file="typo-del.mkiv"> + <cd:command name="delimitedtext" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-language-optional"/> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="quotation"/> - <cd:constant value="quote"/> - <cd:constant value="blockquote"/> - <cd:constant value="speech"/> - <cd:constant value="aside"/> + <cd:resolve name="instance-delimitedtext"/> </cd:instances> </cd:command> - <cd:command name="delimitedtext" type="environment" generated="yes" variant="example" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" generated="yes" variant="instance" category="language" level="document" file="typo-del.mkiv"> <cd:sequence> - <cd:variable value="delimitedtext"/> + <cd:instance value="delimitedtext"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-language-optional"/> @@ -118,15 +114,11 @@ </cd:keywords> </cd:arguments> <cd:instances> - <cd:constant value="quotation"/> - <cd:constant value="quote"/> - <cd:constant value="blockquote"/> - <cd:constant value="speech"/> - <cd:constant value="aside"/> + <cd:resolve name="instance-delimitedtext"/> </cd:instances> </cd:command> - <cd:command name="delimitedtext" file="typo-del.mkiv"> + <cd:command name="delimitedtext" category="language" level="document" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -134,7 +126,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimitedtext" type="environment" file="typo-del.mkiv"> + <cd:command name="delimitedtext" type="environment" category="language" level="document" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -144,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" file="typo-del.mkiv"> + <cd:command name="delimited" category="language" level="document" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -152,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="delimited" type="environment" file="typo-del.mkiv"> + <cd:command name="delimited" type="environment" category="language" level="document" file="typo-del.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language-optional"/> @@ -162,83 +154,87 @@ </cd:arguments> </cd:command> - <cd:command name="quotation" 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:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> + <cd:command name="quotation" file="typo-del.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="quote" 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:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="startnarrower"/> + </cd:keywords> + </cd:arguments> + </cd:command> - <cd:command name="quote" type="environment" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="quote" file="typo-del.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="blockquote" 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:arguments> + <cd:resolve name="keyword-language-optional"/> + </cd:arguments> + </cd:command> - <cd:command name="blockquote" type="environment" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> + <cd:command name="blockquote" file="typo-del.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="speech" 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:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="startnarrower"/> + </cd:keywords> + </cd:arguments> + </cd:command> - <cd:command name="aside" type="environment" file="typo-del.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-language-optional"/> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> + <cd:command name="speech" file="typo-del.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="aside" 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:arguments> + <cd:resolve name="keyword-language-optional"/> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="startnarrower"/> + </cd:keywords> + </cd:arguments> + </cd:command> - <cd:command name="speech" type="environment" file="typo-del.mkiv"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:inherit name="startnarrower"/> - </cd:keywords> - </cd:arguments> - </cd:command> + <cd:command name="aside" 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:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:inherit name="startnarrower"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + --> - <cd:command name="setupquotation" file="typo-del.mkiv"> + <cd:command name="setupquotation" category="language" level="style" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> @@ -246,7 +242,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupquote" file="typo-del.mkiv"> + <cd:command name="setupquote" category="language" level="style" file="typo-del.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupdelimitedtext"/> @@ -254,12 +250,12 @@ </cd:arguments> </cd:command> - <cd:command name="subsentence" file="typo-del.mkiv"> + <cd:command name="subsentence" category="language" level="document" file="typo-del.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="subsentence" type="environment" file="typo-del.mkiv"/> + <cd:command name="subsentence" type="environment" category="language" level="document" file="typo-del.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index 13b056d71..6f836f326 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" file="strc-des.mkvi"> + <cd:command name="definedescription" level="style" 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" file="strc-des.mkvi"> + <cd:command name="setupdescription" level="style" file="strc-des.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -102,6 +102,9 @@ <cd:constant type="no" default="yes"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -138,7 +141,7 @@ --> - <cd:command name="description" type="environment" generated="yes" variant="example" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example" level="document" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -147,7 +150,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" type="environment" generated="yes" variant="example:title" file="strc-des.mkvi"> + <cd:command name="description" type="environment" generated="yes" variant="example:title" level="document" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> @@ -157,7 +160,7 @@ </cd:arguments> </cd:command> - <cd:command name="description" generated="yes" variant="example" file="strc-des.mkvi"> + <cd:command name="description" generated="yes" variant="example" level="document" file="strc-des.mkvi"> <cd:sequence> <cd:variable value="description"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-dimension.xml b/tex/context/interface/mkiv/i-dimension.xml index 7bf59467b..bb7c3bfa7 100644 --- a/tex/context/interface/mkiv/i-dimension.xml +++ b/tex/context/interface/mkiv/i-dimension.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="assigndimension" file="mult-dim.mkvi"> + <cd:command name="assigndimension" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small" prefix="cd:sign" method="none"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignalfadimension" file="mult-dim.mkvi"> + <cd:command name="assignalfadimension" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignwidth" file="mult-dim.mkvi"> + <cd:command name="assignwidth" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="fit"/> @@ -49,7 +49,7 @@ </cd:arguments> </cd:command> - <cd:command name="assignvalue" file="mult-dim.mkvi"> + <cd:command name="assignvalue" level="system" file="mult-dim.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="small"/> diff --git a/tex/context/interface/mkiv/i-direction.xml b/tex/context/interface/mkiv/i-direction.xml index 630f07cb7..ad266db6b 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" file="typo-dir.mkiv"> + <cd:command name="setupdirections" level="style" file="typo-dir.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="bidi"> @@ -48,7 +48,7 @@ <cd:command name="showdirsinmargin" file="supp-dir.mkiv"/> - <cd:command name="istltdir" file="supp-dir.mkiv"> + <cd:command name="istltdir" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> @@ -57,7 +57,7 @@ </cd:arguments> </cd:command> - <cd:command name="istrtdir" file="supp-dir.mkiv"> + <cd:command name="istrtdir" level="system" file="supp-dir.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="TLT"/> diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml index e2417ec63..d80683244 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" file="file-job.mkvi"/> + <cd:command name="text" type="environment" level="document" file="file-job.mkvi"/> <cd:command name="text" type="environment" begin="autostart" end="autostop" file="file-job.mkvi"/> - <cd:command name="notext" type="environment" file="file-job.mkvi"/> + <cd:command name="notext" type="environment" level="system" file="file-job.mkvi"/> - <cd:command name="environment" type="environment" file="file-job.mkvi"> + <cd:command name="environment" type="environment" level="document" 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" file="file-job.mkvi"> + <cd:command name="environment" type="environment" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -28,13 +28,13 @@ </cd:arguments> </cd:command> - <cd:command name="environment" file="file-job.mkvi"> + <cd:command name="environment" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="environment" variant="string" file="file-job.mkvi"> + <cd:command name="environment" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> @@ -46,9 +46,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentenvironment" file="file-job.mkvi"/> + <cd:command name="currentenvironment" level="system" file="file-job.mkvi"/> - <cd:command name="project" type="environment" file="file-job.mkvi"> + <cd:command name="project" type="environment" level="document" 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" file="file-job.mkvi"> + <cd:command name="project" type="environment" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -66,13 +66,13 @@ </cd:arguments> </cd:command> - <cd:command name="project" file="file-job.mkvi"> + <cd:command name="project" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="project" variant="string" file="file-job.mkvi"> + <cd:command name="project" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> @@ -84,9 +84,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentproject" file="file-job.mkvi"/> + <cd:command name="currentproject" level="system" file="file-job.mkvi"/> - <cd:command name="product" type="environment" file="file-job.mkvi"> + <cd:command name="product" type="environment" level="document" 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" file="file-job.mkvi"> + <cd:command name="product" type="environment" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -104,13 +104,13 @@ </cd:arguments> </cd:command> - <cd:command name="product" file="file-job.mkvi"> + <cd:command name="product" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="product" variant="string" file="file-job.mkvi"> + <cd:command name="product" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> @@ -122,9 +122,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentproduct" file="file-job.mkvi"/> + <cd:command name="currentproduct" level="system" file="file-job.mkvi"/> - <cd:command name="component" type="environment" file="file-job.mkvi"> + <cd:command name="component" type="environment" level="document" 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" file="file-job.mkvi"> + <cd:command name="component" type="environment" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:file"/> @@ -142,13 +142,13 @@ </cd:arguments> </cd:command> - <cd:command name="component" file="file-job.mkvi"> + <cd:command name="component" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="component" variant="string" file="file-job.mkvi"> + <cd:command name="component" variant="string" level="document" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> @@ -160,9 +160,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentcomponent" file="file-job.mkvi"/> + <cd:command name="currentcomponent" level="system" file="file-job.mkvi"/> - <cd:command name="document" type="environment" file="file-job.mkvi"> + <cd:command name="document" type="environment" level="document" 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" file="file-job.mkvi"> + <cd:command name="setupdocument" level="style" file="file-job.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> diff --git a/tex/context/interface/mkiv/i-dummy.xml b/tex/context/interface/mkiv/i-dummy.xml index 6c7d4288f..10c0dbb90 100644 --- a/tex/context/interface/mkiv/i-dummy.xml +++ b/tex/context/interface/mkiv/i-dummy.xml @@ -4,52 +4,52 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="getdummyparameters" file="mult-aux.mkiv"> + <cd:command name="getdummyparameters" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="dummyparameter" file="mult-aux.mkiv"> + <cd:command name="dummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="directdummyparameter" file="mult-aux.mkiv"> + <cd:command name="directdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="setdummyparameter" file="mult-aux.mkiv"> + <cd:command name="setdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="letdummyparameter" file="mult-aux.mkiv"> + <cd:command name="letdummyparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleandcolor" file="mult-aux.mkiv"> + <cd:command name="usedummystyleandcolor" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummystyleparameter" file="mult-aux.mkiv"> + <cd:command name="usedummystyleparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="usedummycolorparameter" file="mult-aux.mkiv"> + <cd:command name="usedummycolorparameter" level="system" file="mult-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml index f6fd3e042..6720083b2 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" file="attr-eff.mkiv"> + <cd:command name="defineeffect" level="style" 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" file="attr-eff.mkiv"> + <cd:command name="setupeffect" level="style" 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" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" level="document" 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" file="attr-eff.mkiv"> + <cd:command name="effect" type="environment" generated="yes" variant="example" level="document" file="attr-eff.mkiv"> <cd:sequence> <cd:variable value="effect"/> </cd:sequence> </cd:command> - <cd:command name="effect" file="attr-eff.mkiv"> + <cd:command name="effect" level="document" 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 70823cff3..2469a9713 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" file="strc-enu.mkvi"> + <cd:command name="defineenumeration" level="style" 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" file="strc-enu.mkvi"> + <cd:command name="setupenumeration" level="style" file="strc-enu.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -148,6 +148,9 @@ <cd:constant type="no" default="yes"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -172,20 +175,16 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupenumerations" file="strc-enu.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupenumeration"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupenumerations" level="style" file="strc-enu.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupenumeration"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example" level="document" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -194,7 +193,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" file="strc-enu.mkvi"> + <cd:command name="enumeration" type="environment" generated="yes" variant="example:title" level="document" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> @@ -204,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="enumeration" generated="yes" variant="example" file="strc-enu.mkvi"> + <cd:command name="enumeration" generated="yes" variant="example" level="document" file="strc-enu.mkvi"> <cd:sequence> <cd:variable value="enumeration"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-export.xml b/tex/context/interface/mkiv/i-export.xml index 067649402..e3be678c0 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" file="back-exp.mkiv"> + <cd:command name="setelementexporttag" level="system" 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" file="back-exp.mkiv"> + <cd:command name="setupexport" level="style" file="back-exp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="align"> diff --git a/tex/context/interface/mkiv/i-field.xml b/tex/context/interface/mkiv/i-field.xml index 828ab204f..a3435e8da 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" file="scrn-fld.mkvi"> + <cd:command name="presetfieldsymbols" level="system" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="definefieldcategory" file="scrn-fld.mkvi"> + <cd:command name="definefieldcategory" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcategory" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="doifelsefieldcategory" level="system" 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" file="scrn-fld.mkvi"> + <cd:command name="doiffieldcategoryelse" level="system" 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" file="scrn-fld.mkvi"> + <cd:command name="definefieldbody" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldbody" level="style" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -263,7 +263,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfieldlabelframed" file="scrn-fld.mkvi"> + <cd:command name="setupfieldlabelframed" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldcontentframed" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfieldtotalframed" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfield" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setupfields" level="style" file="scrn-fld.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefieldstack" file="scrn-fld.mkvi"> + <cd:command name="definefieldstack" level="style" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> diff --git a/tex/context/interface/mkiv/i-figure.xml b/tex/context/interface/mkiv/i-figure.xml index 4b1439f41..92d3a9887 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" file="grph-fig.mkiv"> + <cd:command name="figure" type="environment" category="graphics" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml index a5ed9daa3..3db82077c 100644 --- a/tex/context/interface/mkiv/i-file.xml +++ b/tex/context/interface/mkiv/i-file.xml @@ -16,21 +16,21 @@ </cd:arguments> </cd:command> - <cd:command name="doiffile" file="file-ini.mkvi"> + <cd:command name="doiffile" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotfile" file="file-ini.mkvi"> + <cd:command name="doifnotfile" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefile" file="file-ini.mkvi"> + <cd:command name="doifelsefile" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doiffileelse" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -60,19 +60,19 @@ <cd:command name="outputfilename" file="core-sys.mkiv"/> - <cd:command name="readingfile" type="environment" file="file-ini.mkvi"/> + <cd:command name="readingfile" type="environment" level="system" file="file-ini.mkvi"/> - <cd:command name="endofline" type="environment" begin="push" end="pop" file="file-ini.mkvi"/> + <cd:command name="endofline" type="environment" begin="push" end="pop" level="system" file="file-ini.mkvi"/> - <cd:command name="restoreendofline" file="file-ini.mkvi"/> + <cd:command name="restoreendofline" level="system" file="file-ini.mkvi"/> - <cd:command name="inputgivenfile" file="file-ini.mkvi"> + <cd:command name="inputgivenfile" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="doifelsepath" file="file-ini.mkvi"> + <cd:command name="doifelsepath" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifpathelse" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifelsefileexists" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doiffileexistselse" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifelsepathexists" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifpathexistselse" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifelseparentfile" level="system" 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" file="file-ini.mkvi"> + <cd:command name="doifparentfileelse" level="system" 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" file="file-ini.mkvi"> + <cd:command name="splitfilename" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="splitofffull" file="file-ini.mkvi"/> + <cd:command name="splitofffull" level="system" file="file-ini.mkvi"/> - <cd:command name="splitoffpath" file="file-ini.mkvi"/> + <cd:command name="splitoffpath" level="system" file="file-ini.mkvi"/> - <cd:command name="splitoffbase" file="file-ini.mkvi"/> + <cd:command name="splitoffbase" level="system" file="file-ini.mkvi"/> - <cd:command name="splitoffname" file="file-ini.mkvi"/> + <cd:command name="splitoffname" level="system" file="file-ini.mkvi"/> - <cd:command name="splitofftype" file="file-ini.mkvi"/> + <cd:command name="splitofftype" level="system" file="file-ini.mkvi"/> - <cd:command name="splitoffkind" file="file-ini.mkvi"/> + <cd:command name="splitoffkind" level="system" file="file-ini.mkvi"/> - <cd:command name="splitoffroot" file="file-ini.mkvi"/> + <cd:command name="splitoffroot" level="system" file="file-ini.mkvi"/> - <cd:command name="doifelseinputfile" file="file-job.mkvi"> + <cd:command name="doifelseinputfile" level="system" 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" file="file-job.mkvi"> + <cd:command name="doifinputfileelse" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -172,19 +172,19 @@ </cd:arguments> </cd:command> - <cd:command name="processfile" file="file-ini.mkvi"> + <cd:command name="processfile" level="system" file="file-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="usepath" file="file-job.mkvi"> + <cd:command name="usepath" level="style" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> </cd:command> - <cd:command name="usesubpath" file="file-job.mkvi"> + <cd:command name="usesubpath" level="style" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-path-list"/> </cd:arguments> @@ -206,28 +206,28 @@ </cd:arguments> </cd:command> - <cd:command name="locatedfilepath" file="file-job.mkvi"/> + <cd:command name="locatedfilepath" level="system" file="file-job.mkvi"/> - <cd:command name="usezipfile" file="file-job.mkvi"> + <cd:command name="usezipfile" level="style" 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" file="file-job.mkvi"> + <cd:command name="processfilemany" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfileonce" file="file-job.mkvi"> + <cd:command name="processfileonce" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="processfilenone" file="file-job.mkvi"> + <cd:command name="processfilenone" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> @@ -251,43 +251,43 @@ </cd:arguments> </cd:command> - <cd:command name="loadanyfile" file="file-job.mkvi"> + <cd:command name="loadanyfile" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadtexfileonce" file="file-job.mkvi"> + <cd:command name="loadtexfileonce" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadluafileonce" file="file-job.mkvi"> + <cd:command name="loadluafileonce" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadcldfileonce" file="file-job.mkvi"> + <cd:command name="loadcldfileonce" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadanyfileonce" file="file-job.mkvi"> + <cd:command name="loadanyfileonce" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="continueifinputfile" file="file-job.mkvi"> + <cd:command name="continueifinputfile" level="system" file="file-job.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readjobfile" file="file-res.mkvi"> + <cd:command name="readjobfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -295,7 +295,7 @@ </cd:arguments> </cd:command> - <cd:command name="readlocfile" file="file-res.mkvi"> + <cd:command name="readlocfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -303,7 +303,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsysfile" file="file-res.mkvi"> + <cd:command name="readsysfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -311,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfixfile" file="file-res.mkvi"> + <cd:command name="readfixfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -320,7 +320,7 @@ </cd:arguments> </cd:command> - <cd:command name="readsetfile" file="file-res.mkvi"> + <cd:command name="readsetfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-path"/> <cd:resolve name="argument-file"/> @@ -329,7 +329,7 @@ </cd:arguments> </cd:command> - <cd:command name="readfile" file="file-res.mkvi"> + <cd:command name="readfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -337,13 +337,13 @@ </cd:arguments> </cd:command> - <cd:command name="ReadFile" file="file-res.mkvi"> + <cd:command name="ReadFile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="readtexfile" file="file-res.mkvi"> + <cd:command name="readtexfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -351,7 +351,7 @@ </cd:arguments> </cd:command> - <cd:command name="readxmlfile" file="file-res.mkvi"> + <cd:command name="readxmlfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -359,7 +359,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocfile" file="file-res.mkvi"> + <cd:command name="doifelselocfile" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -367,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiflocfileelse" file="file-res.mkvi"> + <cd:command name="doiflocfileelse" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -375,27 +375,27 @@ </cd:arguments> </cd:command> - <cd:command name="locfilename" file="file-res.mkvi"> + <cd:command name="locfilename" level="system" file="file-res.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilesynonym" file="file-sys.mkvi"> + <cd:command name="definefilesynonym" level="system" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definefilefallback" file="file-sys.mkvi"> + <cd:command name="definefilefallback" level="system" 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" file="file-sys.mkvi"> + <cd:command name="truefilename" level="system" file="file-sys.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml index 894780063..9be6ce275 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" file="spac-flr.mkiv"> + <cd:command name="definefiller" level="style" 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" file="spac-flr.mkiv"> + <cd:command name="setupfiller" level="style" file="spac-flr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelinefiller" file="node-rul.mkiv"> + <cd:command name="definelinefiller" level="style" 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" file="node-rul.mkiv"> + <cd:command name="setuplinefiller" level="style" 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" file="node-rul.mkiv"> + <cd:command name="setuplinefillers" level="style" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-fillinline.xml b/tex/context/interface/mkiv/i-fillinline.xml index dbf9f8627..7f75d6ee1 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" file="pack-mrl.mkiv"> + <cd:command name="setupfillinlines" level="style" 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" file="pack-mrl.mkiv"> + <cd:command name="fillinline" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfillinlines"/> diff --git a/tex/context/interface/mkiv/i-fillinrule.xml b/tex/context/interface/mkiv/i-fillinrule.xml index 949b8f6ea..84d8f8f3d 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" file="pack-mrl.mkiv"> + <cd:command name="setupfillinrules" level="style" 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" file="pack-mrl.mkiv"> + <cd:command name="fillinrules" level="document" 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" file="pack-mrl.mkiv"> + <cd:command name="fillintext" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfillinrules"/> diff --git a/tex/context/interface/mkiv/i-firstline.xml b/tex/context/interface/mkiv/i-firstline.xml index 59579a18c..1a530d152 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" file="typo-fln.mkiv"> + <cd:command name="definefirstline" level="style" 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" file="typo-fln.mkiv"> + <cd:command name="setupfirstline" level="style" file="typo-fln.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="applytofirstcharacter" file="typo-fln.mkiv"> + <cd:command name="applytofirstcharacter" level="system" file="typo-fln.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 29816601f..05e24af7a 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" file="page-app.mkiv"> + <cd:command name="definefittingpage" level="style" 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" file="page-app.mkiv"> + <cd:command name="setupfittingpage" level="style" 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" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" level="document" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -50,9 +50,9 @@ </cd:arguments> </cd:command> - <cd:command name="fittingpage" type="environment" generated="yes" variant="example" file="page-app.mkiv"> + <cd:command name="fittingpage" type="environment" generated="yes" variant="instance" level="document" file="page-app.mkiv"> <cd:sequence> - <cd:variable value="fittingpage"/> + <cd:instance value="fittingpage"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -60,36 +60,39 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="TEXpage"/> - <cd:constant value="MPpage"/> + <cd:resolve name="instance-fittingpage"/> </cd:instances> </cd:command> - <cd:command name="TEXpage" type="environment" file="page-app.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="setupTEXpage" file="page-app.mkiv"> - <cd:arguments> - <cd:assignments list="yes"> - <cd:inherit name="setupfittingpage"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="TEXpage" type="environment" file="page-app.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfittingpage"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="MPpage" type="environment" file="meta-fig.mkiv"> + <cd:command name="MPpage" type="environment" file="meta-fig.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfittingpage"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupTEXpage" level="style" file="page-app.mkiv"> <cd:arguments> - <cd:assignments list="yes" optional="yes"> + <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupMPpage" file="meta-fig.mkiv"> + <cd:command name="setupMPpage" level="style" file="meta-fig.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupfittingpage"/> diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index edc7f7f03..39dc52a9b 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -4,10 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definefloat" file="strc-flt.mkvi"> + <cd:command name="definefloat" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> - <cd:resolve name="keyword-plural-optional"/> + <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> @@ -17,7 +20,7 @@ </cd:instances> </cd:command> - <cd:command name="definefloat" variant="name" file="strc-flt.mkvi"> + <cd:command name="definefloat" variant="name" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-plural-optional"/> @@ -28,7 +31,7 @@ </cd:instances> </cd:command> - <cd:command name="setupfloat" file="strc-flt.mkvi"> + <cd:command name="setupfloat" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular-list-optional"/> <cd:assignments list="yes"> @@ -121,6 +124,24 @@ <cd:parameter name="bottomafter"> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </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 type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- begin root only --> <cd:parameter name="spacebefore"> <cd:constant type="none"/> @@ -177,16 +198,16 @@ </cd:arguments> </cd:command> - <!-- + <cd:command name="setupfloats" level="style" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-singular-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="setupfloats" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-singular-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupfloat"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <!-- <cd:command name="definefloatcaption" file="strc-flt.mkvi"> <cd:arguments> @@ -200,7 +221,7 @@ --> - <cd:command name="setupfloatcaption" file="strc-flt.mkvi"> + <cd:command name="setupfloatcaption" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -312,7 +333,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -321,26 +342,19 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupcaptions" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupcaptions" level="style" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi"> + <cd:command name="placefloat" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> -<!-- - <cd:variable value="float"/> ---> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -353,7 +367,7 @@ </cd:instances> </cd:command> - <cd:command name="placefloat" file="strc-flt.mkvi"> + <cd:command name="placefloat" level="document" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:resolve name="keyword-floatlocation-list-optional"/> @@ -363,16 +377,7 @@ </cd:arguments> </cd:command> -<!-- - <cd:command name="placefloat" type="environment" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-singular"/> - <cd:resolve name="assignment-floatdata-list-optional"/> - <cd:resolve name="assignment-userdata-list-optional"/> - </cd:arguments> - </cd:command> - - <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi"> + <cd:command name="placefloat" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="place"/> <cd:instance value="float"/> @@ -380,32 +385,23 @@ <cd:arguments> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> - <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> <cd:resolve name="instance-float"/> </cd:instances> </cd:command> ---> - - <cd:command name="placefloat" type="environment" generated="yes" variant="instance" file="strc-flt.mkvi"> - <cd:sequence> - <cd:string value="place"/> - <cd:instance value="float"/> - </cd:sequence> + <cd:command name="placefloat" type="environment" level="document" file="strc-flt.mkvi"> <cd:arguments> + <cd:resolve name="keyword-singular"/> <cd:resolve name="assignment-floatdata-list-optional"/> <cd:resolve name="assignment-userdata-list-optional"/> </cd:arguments> - <cd:instances> - <cd:resolve name="instance-float"/> - </cd:instances> </cd:command> - <cd:command name="floattext" type="environment" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="floattext" type="environment" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> <cd:sequence> - <cd:variable value="float"/> + <cd:instance value="float"/> <cd:string value="text"/> </cd:sequence> <cd:arguments> @@ -413,276 +409,286 @@ <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-float"/> + </cd:instances> </cd:command> - <cd:command name="placelistoffloats" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="placelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="placelistof"/> - <cd:variable value="floats"/> + <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:resolve name="instance-floatlist"/> + </cd:instances> </cd:command> - <cd:command name="completelistoffloats" generated="yes" variant="example" file="strc-flt.mkvi"> + <cd:command name="completelistoffloats" generated="yes" variant="instance" level="document" file="strc-flt.mkvi"> <cd:sequence> <cd:string value="completelistof"/> - <cd:variable value="floats"/> + <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:resolve name="instance-floatlist"/> + </cd:instances> </cd:command> - <cd:command name="floatuserdataparameter" file="strc-flt.mkvi"> + <cd:command name="floatuserdataparameter" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="doifelserightpagefloat" file="strc-flt.mkvi"> + <cd:command name="doifelserightpagefloat" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifrightpagefloatelse" file="strc-flt.mkvi"> + <cd:command name="doifrightpagefloatelse" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpagefloat" file="strc-flt.mkvi"> + <cd:command name="doifelseoddpagefloat" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpagefloatelse" file="strc-flt.mkvi"> + <cd:command name="doifoddpagefloatelse" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemainfloatbody" file="strc-flt.mkvi"> + <cd:command name="doifelsemainfloatbody" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifmainfloatbodyelse" file="strc-flt.mkvi"> + <cd:command name="doifmainfloatbodyelse" level="system" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> -<!-- + <!-- - <cd:command file="strc-flt.mkvi" name="placefigure"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="placefigure" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="placefigure" type="environment" 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="placefigure" type="environment" 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:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="figuretext" type="environment" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> - <cd:command name="placelistoffigures" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="placelistoffigures" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="completelistoffigures" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="completelistoffigures" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placetable" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="placetable" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="placetable" type="environment" 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="placetable" type="environment" 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:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="tabletext" type="environment" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> - <cd:command name="placelistoftables" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="placelistoftables" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="completelistoftables" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="completelistoftables" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placegraphic" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="placegraphic" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="placegraphic" type="environment" 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="placegraphic" type="environment" 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:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="graphictext" type="environment" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> - <cd:command name="placelistofgraphics" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="placelistofgraphics" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="completelistofgraphics" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="completelistofgraphics" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placeintermezzo" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="placeintermezzo" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="placeintermezzo" type="environment" 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="placeintermezzo" type="environment" 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:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="intermezzotext" type="environment" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> - <cd:command name="placelistofintermezzi" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="placelistofintermezzi" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="completelistofintermezzi" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="completelistofintermezzi" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="placechemical" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-floatlocation-list-optional"/> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="placechemical" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-floatlocation-list-optional"/> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="placechemical" type="environment" 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="placechemical" type="environment" 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:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="placelistofchemicals" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="completelistofchemicals" file="strc-flt.mkvi"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> - </cd:assignments> - </cd:arguments> - </cd:command> ---> + <cd:command name="completelistofchemicals" file="strc-flt.mkvi"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplist"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> - <cd:command name="setuplocalfloats" file="strc-flt.mkvi"> + <cd:command name="setuplocalfloats" level="style" file="strc-flt.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -716,7 +722,7 @@ <cd:command name="forcelocalfloats" file="strc-flt.mkvi"/> - <cd:command name="setupfloatsplitting" file="tabl-tsp.mkiv"> + <cd:command name="setupfloatsplitting" level="style" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="before"> @@ -739,7 +745,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitfloat" file="tabl-tsp.mkiv"> + <cd:command name="splitfloat" level="system" file="tabl-tsp.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupfloatsplitting"/> @@ -749,13 +755,13 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinsidesplitfloat" file="tabl-tsp.mkiv"> + <cd:command name="doifnotinsidesplitfloat" level="system" file="tabl-tsp.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="placenamedfloat" file="page-flt.mkiv"> + <cd:command name="placenamedfloat" level="document" file="page-flt.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference"/> diff --git a/tex/context/interface/mkiv/i-fontfamily.xml b/tex/context/interface/mkiv/i-fontfamily.xml index 2cf2fb403..59aafb519 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" file="font-sel.mkvi"> + <cd:command name="definefontfamily" category="fonts" level="style" 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" file="font-sel.mkvi"> + <cd:command name="definefontfamily" variant="preset" category="fonts" level="style" 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" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" category="fonts" level="style" 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" file="font-sel.mkvi"> + <cd:command name="definefallbackfamily" variant="preset" category="fonts" level="style" 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" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -215,7 +215,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfamilypreset" variant="name" file="font-sel.mkvi"> + <cd:command name="definefontfamilypreset" variant="name" category="fonts" file="font-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml index c246905f0..c774ef273 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" file="font-col.mkvi"> + <cd:command name="definefontfallback" category="fonts" level="style" file="font-col.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -31,32 +31,35 @@ <cd:constant type="cd:number"/> <cd:constant type="cd:name"/> </cd:parameter> + <cd:parameter name="features"> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="resetfontfallback" file="font-col.mkvi"> + <cd:command name="resetfontfallback" 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" file="font-emp.mkvi"/> + <cd:command name="emphasistypeface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="emphasisboldface" file="font-emp.mkvi"/> + <cd:command name="emphasisboldface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normalboldface" file="font-emp.mkvi"/> + <cd:command name="normalboldface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="normaltypeface" file="font-emp.mkvi"/> + <cd:command name="normaltypeface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swaptypeface" file="font-emp.mkvi"/> + <cd:command name="swaptypeface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="typeface" file="font-emp.mkvi"/> + <cd:command name="typeface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="boldface" file="font-emp.mkvi"/> + <cd:command name="boldface" category="fonts" file="font-emp.mkvi"/> - <cd:command name="swapface" file="font-emp.mkvi"/> + <cd:command name="swapface" category="fonts" file="font-emp.mkvi"/> <!-- @@ -98,7 +101,7 @@ --> - <cd:command name="definefontfeature" file="font-fea.mkvi"> + <cd:command name="definefontfeature" category="fonts" level="style" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -270,11 +273,15 @@ <cd:parameter name="mathnolimitsmode"> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="blockligatures"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="adaptfontfeature" file="font-fea.mkvi"> + <cd:command name="adaptfontfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <!-- pattern --> <cd:assignments list="yes"> @@ -283,72 +290,72 @@ </cd:arguments> </cd:command> - <cd:command name="fontfeaturelist" file="font-fea.mkvi"> + <cd:command name="fontfeaturelist" 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" file="font-fea.mkvi"> + <cd:command name="addfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="addfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="addfeature" variant="direct" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" file="font-fea.mkvi"> + <cd:command name="subtractfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="subtractfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="subtractfeature" variant="direct" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" file="font-fea.mkvi"> + <cd:command name="replacefeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="replacefeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="replacefeature" variant="direct" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetandaddfeature" variant="direct" file="font-fea.mkvi"> + <cd:command name="resetandaddfeature" variant="direct" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfeature" file="font-fea.mkvi"/> + <cd:command name="resetfeature" category="fonts" file="font-fea.mkvi"/> - <cd:command name="revivefeature" file="font-fea.mkvi"/> + <cd:command name="revivefeature" category="fonts" file="font-fea.mkvi"/> - <cd:command name="setfontfeature" file="font-fea.mkvi"> + <cd:command name="setfontfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="feature" file="font-fea.mkvi"> + <cd:command name="feature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="+"/> @@ -369,7 +376,7 @@ </cd:arguments> </cd:command> - <cd:command name="feature" variant="direct" file="font-fea.mkvi"> + <cd:command name="feature" variant="direct" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="+"/> @@ -390,7 +397,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentfonthasfeature" file="font-fea.mkvi"> + <cd:command name="doifelsecurrentfonthasfeature" category="fonts" level="system" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -398,7 +405,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifcurrentfonthasfeatureelse" file="font-fea.mkvi"> + <cd:command name="doifcurrentfonthasfeatureelse" category="fonts" level="system" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -406,31 +413,31 @@ </cd:arguments> </cd:command> - <cd:command name="doaddfeature" file="font-fea.mkvi"> + <cd:command name="doaddfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dosubtractfeature" file="font-fea.mkvi"> + <cd:command name="dosubtractfeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doreplacefeature" file="font-fea.mkvi"> + <cd:command name="doreplacefeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doresetandafffeature" file="font-fea.mkvi"> + <cd:command name="doresetandafffeature" category="fonts" file="font-fea.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fontclass" type="environment" file="font-fil.mkvi"> + <cd:command name="fontclass" type="environment" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="each"/> @@ -439,14 +446,14 @@ </cd:arguments> </cd:command> - <cd:command name="classfont" file="font-fil.mkvi"> + <cd:command name="classfont" 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" file="font-fil.mkvi"> + <cd:command name="definefontsynonym" category="fonts" level="style" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -468,7 +475,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefontfile" file="font-fil.mkvi"> + <cd:command name="definefontfile" category="fonts" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -490,20 +497,20 @@ </cd:arguments> </cd:command> - <cd:command name="truefontname" file="font-fil.mkvi"> + <cd:command name="truefontname" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="expandfontsynonym" file="font-fil.mkvi"> + <cd:command name="expandfontsynonym" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontsynonym" file="font-fil.mkvi"> + <cd:command name="doifelsefontsynonym" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -511,7 +518,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontsynonymelse" file="font-fil.mkvi"> + <cd:command name="doiffontsynonymelse" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -519,87 +526,87 @@ </cd:arguments> </cd:command> - <cd:command name="tracedfontname" file="font-fil.mkvi"> + <cd:command name="tracedfontname" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="fontclassname" file="font-fil.mkvi"> + <cd:command name="fontclassname" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="loadfontgoodies" file="font-gds.mkvi"> + <cd:command name="loadfontgoodies" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setfontcolorsheme" file="font-gds.mkvi"> + <cd:command name="setfontcolorsheme" category="fonts" file="font-gds.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontcolorsheme" file="font-gds.mkvi"/> + <cd:command name="resetfontcolorsheme" category="fonts" file="font-gds.mkvi"/> - <cd:command name="definedfont" file="font-ini.mkvi"> + <cd:command name="definedfont" category="fonts" level="document" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="font" type="environment" file="font-ini.mkvi"> + <cd:command name="font" type="environment" category="fonts" level="document" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font-optional"/> </cd:arguments> </cd:command> - <cd:command name="bodyfontsize" file="font-ini.mkvi"/> + <cd:command name="bodyfontsize" category="fonts" file="font-ini.mkvi"/> - <cd:command name="normalizebodyfontsize" file="font-ini.mkvi"> + <cd:command name="normalizebodyfontsize" category="fonts" level="system" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="thenormalizedbodyfontsize" file="font-ini.mkvi"> + <cd:command name="thenormalizedbodyfontsize" category="fonts" level="system" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="mapfontsize" file="font-fil.mkvi"> + <cd:command name="mapfontsize" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="keyword-dimension"/> <cd:resolve name="keyword-dimension"/> </cd:arguments> </cd:command> - <cd:command name="definefontstyle" file="font-ini.mkvi"> + <cd:command name="definefontstyle" 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" file="font-ini.mkvi"> + <cd:command name="definefontsize" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefontalternative" file="font-ini.mkvi"> + <cd:command name="definefontalternative" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definefont" file="font-ini.mkvi"> + <cd:command name="definefont" category="fonts" level="style" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -609,7 +616,7 @@ </cd:arguments> </cd:command> - <cd:command name="definefont" variant="argument" file="font-ini.mkvi"> + <cd:command name="definefont" variant="argument" category="fonts" level="style" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-font"/> @@ -617,14 +624,14 @@ </cd:arguments> </cd:command> - <cd:command name="definefrozenfont" file="font-ini.mkvi"> + <cd:command name="definefrozenfont" 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" file="font-ini.mkvi"> + <cd:command name="definebodyfontenvironment" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:keywords> @@ -708,31 +715,31 @@ --> - <cd:command name="processbodyfontenvironmentlist" file="font-fil.mkvi"> + <cd:command name="processbodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="bodyfontenvironmentlist" file="font-fil.mkvi"/> + <cd:command name="bodyfontenvironmentlist" category="fonts" level="system" file="font-fil.mkvi"/> - <cd:command name="registerfontclass" file="font-fil.mkvi"> + <cd:command name="registerfontclass" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setcurrentfontclass" file="font-fil.mkvi"> + <cd:command name="setcurrentfontclass" category="fonts" level="system" file="font-fil.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="tx" file="font-ini.mkvi"/> + <cd:command name="tx" category="fonts" level="document" file="font-ini.mkvi"/> - <cd:command name="txx" file="font-ini.mkvi"/> + <cd:command name="txx" category="fonts" level="document" file="font-ini.mkvi"/> - <cd:command name="definebodyfont" file="font-fil.mkvi"> + <cd:command name="definebodyfont" category="fonts" level="style" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -793,7 +800,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebodyfont" variant="argument" file="font-fil.mkvi"> + <cd:command name="definebodyfont" variant="argument" category="fonts" level="style" file="font-fil.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -814,7 +821,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfonts" file="font-ini.mkiv"> + <cd:command name="setupfonts" category="fonts" level="style" file="font-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="language"> @@ -825,7 +832,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbodyfont" file="font-ini.mkiv"> + <cd:command name="setupbodyfont" category="fonts" level="style" file="font-ini.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:dimension"/> @@ -858,7 +865,7 @@ </cd:arguments> </cd:command> - <cd:command name="switchtobodyfont" file="font-ini.mkvi"> + <cd:command name="switchtobodyfont" category="fonts" level="style" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -866,7 +873,7 @@ </cd:arguments> </cd:command> - <cd:command name="fastswitchtobodyfont" file="font-ini.mkiv"> + <cd:command name="fastswitchtobodyfont" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="x"/> @@ -879,7 +886,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfont" file="font-ini.mkvi"> + <cd:command name="usebodyfont" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -887,31 +894,31 @@ </cd:arguments> </cd:command> - <cd:command name="usebodyfontparameter" file="font-ini.mkvi"> + <cd:command name="usebodyfontparameter" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fontchar" file="font-ini.mkvi"> + <cd:command name="fontchar" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fontcharbyindex" file="font-ini.mkvi"> + <cd:command name="fontcharbyindex" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="tochar" file="font-ini.mkvi"> + <cd:command name="tochar" category="fonts" file="font-ini.mkvi"> <cd:arguments> - <cd:resolve name="argument-name"/> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="rm"/> @@ -934,13 +941,13 @@ </cd:arguments> </cd:command> - <cd:command name="switchstyleonly" variant="command" file="font-ini.mkiv"> + <cd:command name="switchstyleonly" variant="command" category="fonts" file="font-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definebodyfontswitch" file="font-ini.mkvi"> + <cd:command name="definebodyfontswitch" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -949,28 +956,28 @@ </cd:arguments> </cd:command> - <cd:command name="setsmallbodyfont" file="font-ini.mkvi"/> + <cd:command name="setsmallbodyfont" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setbigbodyfont" file="font-ini.mkvi"/> + <cd:command name="setbigbodyfont" category="fonts" file="font-ini.mkvi"/> - <cd:command name="setmainbodyfont" file="font-ini.mkvi"/> + <cd:command name="setmainbodyfont" category="fonts" file="font-ini.mkvi"/> - <cd:command name="restoreglobalbodyfont" file="font-ini.mkvi"/> + <cd:command name="restoreglobalbodyfont" category="fonts" file="font-ini.mkvi"/> - <cd:command name="predefinefont" file="font-ini.mkvi"> + <cd:command name="predefinefont" 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" file="font-ini.mkvi"> + <cd:command name="predefinedfont" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showbodyfont" file="font-run.mkiv"> + <cd:command name="showbodyfont" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -978,7 +985,7 @@ </cd:arguments> </cd:command> - <cd:command name="showbodyfontenvironment" file="font-run.mkiv"> + <cd:command name="showbodyfontenvironment" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -986,14 +993,14 @@ </cd:arguments> </cd:command> - <cd:command name="showfont" file="font-run.mkiv"> + <cd:command name="showfont" 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" file="font-run.mkiv"> + <cd:command name="showfontstyle" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="setupbodyfont"/> @@ -1021,19 +1028,19 @@ </cd:arguments> </cd:command> - <cd:command name="showligature" file="font-run.mkiv"> + <cd:command name="showligature" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showligatures" file="font-run.mkiv"> + <cd:command name="showligatures" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-font"/> </cd:arguments> </cd:command> - <cd:command name="showfontstrip" file="font-run.mkiv"> + <cd:command name="showfontstrip" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setupbodyfont"/> @@ -1041,111 +1048,109 @@ </cd:arguments> </cd:command> - <cd:command name="showminimalbaseline" file="font-run.mkiv"/> + <cd:command name="showminimalbaseline" category="fonts" file="font-run.mkiv"/> - <cd:command name="showkerning" file="font-run.mkiv"> + <cd:command name="showkerning" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showcharratio" file="font-run.mkiv"> + <cd:command name="showcharratio" category="fonts" file="font-run.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontparameters" file="font-run.mkiv"/> + <cd:command name="showfontparameters" category="fonts" file="font-run.mkiv"/> - <cd:command name="setsmallcaps" file="font-pre.mkiv"/> + <cd:command name="setsmallcaps" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setoldstyle" file="font-pre.mkiv"/> + <cd:command name="setoldstyle" category="fonts" file="font-pre.mkiv"/> - <cd:command name="settabular" file="font-pre.mkiv"/> + <cd:command name="settabular" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setfractions" file="font-pre.mkiv"/> + <cd:command name="setsuperiors" category="fonts" file="font-pre.mkiv"/> - <cd:command name="setsuperiors" file="font-pre.mkiv"/> + <cd:command name="tinyfont" category="fonts" file="font-pre.mkiv"/> - <cd:command name="tinyfont" file="font-pre.mkiv"/> + <cd:command name="infofont" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofont" file="font-pre.mkiv"/> + <cd:command name="infofontbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="infofontbold" file="font-pre.mkiv"/> + <cd:command name="smallbodyfont" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbodyfont" file="font-pre.mkiv"/> + <cd:command name="bigbodyfont" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigbodyfont" file="font-pre.mkiv"/> + <cd:command name="smaller" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smaller" file="font-pre.mkiv"/> + <cd:command name="bigger" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bigger" file="font-pre.mkiv"/> + <cd:command name="normal" category="fonts" file="font-pre.mkiv"/> - <cd:command name="normal" file="font-pre.mkiv"/> + <cd:command name="bold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bold" file="font-pre.mkiv"/> + <cd:command name="mono" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mono" file="font-pre.mkiv"/> + <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" file="font-pre.mkiv"/> + <cd:command name="slanted" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slanted" file="font-pre.mkiv"/> + <cd:command name="italic" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italic" file="font-pre.mkiv"/> + <cd:command name="boldslanted" category="fonts" file="font-pre.mkiv"/> - <cd:command name="boldslanted" file="font-pre.mkiv"/> + <cd:command name="slantedbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="slantedbold" file="font-pre.mkiv"/> + <cd:command name="bolditalic" category="fonts" file="font-pre.mkiv"/> - <cd:command name="bolditalic" file="font-pre.mkiv"/> + <cd:command name="italicbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="italicbold" file="font-pre.mkiv"/> + <cd:command name="small" category="fonts" file="font-pre.mkiv"/> - <cd:command name="small" file="font-pre.mkiv"/> + <cd:command name="smallnormal" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallnormal" file="font-pre.mkiv"/> + <cd:command name="smallbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbold" file="font-pre.mkiv"/> + <cd:command name="smalltype" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smalltype" file="font-pre.mkiv"/> + <cd:command name="smallslanted" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslanted" file="font-pre.mkiv"/> + <cd:command name="smallboldslanted" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallboldslanted" file="font-pre.mkiv"/> + <cd:command name="smallslantedbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallslantedbold" file="font-pre.mkiv"/> + <cd:command name="smallbolditalic" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallbolditalic" file="font-pre.mkiv"/> + <cd:command name="smallitalicbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="smallitalicbold" file="font-pre.mkiv"/> + <cd:command name="sans" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sans" file="font-pre.mkiv"/> + <cd:command name="sansserif" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansserif" file="font-pre.mkiv"/> + <cd:command name="roman" category="fonts" file="font-pre.mkiv"/> - <cd:command name="roman" file="font-pre.mkiv"/> + <cd:command name="serif" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serif" file="font-pre.mkiv"/> + <cd:command name="regular" category="fonts" file="font-pre.mkiv"/> - <cd:command name="regular" file="font-pre.mkiv"/> + <cd:command name="handwritten" category="fonts" file="font-pre.mkiv"/> - <cd:command name="handwritten" file="font-pre.mkiv"/> + <cd:command name="calligraphic" category="fonts" file="font-pre.mkiv"/> - <cd:command name="calligraphic" file="font-pre.mkiv"/> + <cd:command name="sansnormal" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansnormal" file="font-pre.mkiv"/> + <cd:command name="sansbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="sansbold" file="font-pre.mkiv"/> + <cd:command name="serifnormal" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifnormal" file="font-pre.mkiv"/> + <cd:command name="serifbold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="serifbold" file="font-pre.mkiv"/> + <cd:command name="mononormal" category="fonts" file="font-pre.mkiv"/> - <cd:command name="mononormal" file="font-pre.mkiv"/> + <cd:command name="monobold" category="fonts" file="font-pre.mkiv"/> - <cd:command name="monobold" file="font-pre.mkiv"/> - - <cd:command name="definefontsolution" file="font-sol.mkvi"> + <cd:command name="definefontsolution" category="fonts" level="style" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1155,7 +1160,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontsolution" file="font-sol.mkvi"> + <cd:command name="setupfontsolution" category="fonts" level="style" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1198,21 +1203,21 @@ --> - <cd:command name="setfontsolution" file="font-sol.mkvi"> + <cd:command name="setfontsolution" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetfontsolution" file="font-sol.mkvi"/> + <cd:command name="resetfontsolution" category="fonts" file="font-sol.mkvi"/> - <cd:command name="fontsolution" type="environment" file="font-sol.mkvi"> + <cd:command name="fontsolution" type="environment" category="fonts" file="font-sol.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definealternativestyle" file="font-sty.mkvi"> + <cd:command name="definealternativestyle" category="fonts" level="style" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-command"/> @@ -1220,17 +1225,17 @@ </cd:arguments> </cd:command> - <cd:command name="applyalternativestyle" file="font-sty.mkvi"> + <cd:command name="applyalternativestyle" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="dontconvertfont" file="font-sty.mkvi"/> + <cd:command name="dontconvertfont" category="fonts" file="font-sty.mkvi"/> - <cd:command name="redoconvertfont" file="font-sty.mkvi"/> + <cd:command name="redoconvertfont" category="fonts" file="font-sty.mkvi"/> - <cd:command name="definestyle" file="font-sty.mkvi"> + <cd:command name="definestyle" category="fonts" level="style" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -1240,7 +1245,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupstyle" file="font-sty.mkvi"> + <cd:command name="setupstyle" category="fonts" level="style" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -1257,22 +1262,22 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" generated="yes" variant="example" file="font-sty.mkvi"> + <cd:command name="style" type="environment" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> </cd:command> - <cd:command name="style" generated="yes" variant="example" file="font-sty.mkvi"> + <cd:command name="style" generated="yes" variant="instance" category="fonts" file="font-sty.mkvi"> <cd:sequence> - <cd:variable value="style"/> + <cd:instance value="style"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="style" type="environment" variant="argument" file="font-sty.mkvi"> + <cd:command name="style" type="environment" variant="argument" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1281,7 +1286,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" type="environment" file="font-sty.mkvi"> + <cd:command name="style" type="environment" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1289,7 +1294,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" variant="argument" file="font-sty.mkvi"> + <cd:command name="style" variant="argument" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -1299,7 +1304,7 @@ </cd:arguments> </cd:command> - <cd:command name="style" file="font-sty.mkvi"> + <cd:command name="style" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupstyle"/> @@ -1308,7 +1313,7 @@ </cd:arguments> </cd:command> - <cd:command name="definestyleinstance" file="font-sty.mkvi"> + <cd:command name="definestyleinstance" category="fonts" level="style" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -1334,59 +1339,59 @@ </cd:arguments> </cd:command> - <cd:command name="styleinstance" file="font-sty.mkvi"> + <cd:command name="styleinstance" category="fonts" file="font-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseitalic" file="font-sym.mkvi"> + <cd:command name="doifelseitalic" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifitalicelse" file="font-sym.mkvi"> + <cd:command name="doifitalicelse" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="getprivateslot" file="font-ini.mkvi"> + <cd:command name="getprivateslot" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getprivatechar" file="font-ini.mkvi"> + <cd:command name="getprivatechar" category="fonts" file="font-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="glyphfontfile" file="font-sym.mkvi"> + <cd:command name="glyphfontfile" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> </cd:command> - <cd:command name="getnamedglyphstyled" file="font-sym.mkvi"> + <cd:command name="getnamedglyphstyled" 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" file="font-sym.mkvi"> + <cd:command name="getnamedglyphdirect" 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" file="font-sym.mkvi"> + <cd:command name="getglyphstyled" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1396,7 +1401,7 @@ </cd:arguments> </cd:command> - <cd:command name="getglyphdirect" file="font-sym.mkvi"> + <cd:command name="getglyphdirect" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1406,31 +1411,27 @@ </cd:arguments> </cd:command> - <cd:command name="resolvedglyphstyled" file="font-sym.mkvi"> + <cd:command name="resolvedglyphstyled" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="resolvedglyphdirect" file="font-sym.mkvi"> + <cd:command name="resolvedglyphdirect" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> - <cd:keywords delimiters="braces"> - <cd:constant type="cd:text"/> - </cd:keywords> + <cd:resolve name="argument-tochar"/> </cd:arguments> </cd:command> - <cd:command name="setfont" file="font-sym.mkvi"> + <cd:command name="setfont" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="string-font"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefontchar" file="font-sym.mkvi"> + <cd:command name="doifelsefontchar" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1439,7 +1440,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontcharelse" file="font-sym.mkvi"> + <cd:command name="doiffontcharelse" category="fonts" file="font-sym.mkvi"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-number"/> @@ -1448,15 +1449,15 @@ </cd:arguments> </cd:command> - <cd:command name="showchardata" file="font-tra.mkiv"> + <cd:command name="showchardata" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showfontdata" file="font-tra.mkiv"/> + <cd:command name="showfontdata" category="fonts" file="font-tra.mkiv"/> - <cd:command name="doifelsefontpresent" file="font-tra.mkiv"> + <cd:command name="doifelsefontpresent" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1464,7 +1465,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffontpresentelse" file="font-tra.mkiv"> + <cd:command name="doiffontpresentelse" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:resolve name="argument-true"/> @@ -1472,7 +1473,7 @@ </cd:arguments> </cd:command> - <cd:command name="showotfcomposition" file="font-tra.mkiv"> + <cd:command name="showotfcomposition" category="fonts" file="font-tra.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> <cd:keywords delimiters="braces"> @@ -1486,31 +1487,31 @@ </cd:arguments> </cd:command> - <cd:command name="fontclass" file="font-var.mkvi"/> + <cd:command name="fontclass" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontbody" file="font-var.mkvi"/> + <cd:command name="fontbody" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontstyle" file="font-var.mkvi"/> + <cd:command name="fontstyle" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontalternative" file="font-var.mkvi"/> + <cd:command name="fontalternative" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontsize" file="font-var.mkvi"/> + <cd:command name="fontsize" category="fonts" file="font-var.mkvi"/> - <cd:command name="fontface" file="font-var.mkvi"/> + <cd:command name="fontface" category="fonts" file="font-var.mkvi"/> - <cd:command name="typescriptone" file="type-ini.mkvi"/> + <cd:command name="typescriptone" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescripttwo" file="type-ini.mkvi"/> + <cd:command name="typescripttwo" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptthree" file="type-ini.mkvi"/> + <cd:command name="typescriptthree" category="fonts" file="type-ini.mkvi"/> - <cd:command name="typescriptcollection" type="environment" file="type-ini.mkvi"> + <cd:command name="typescriptcollection" type="environment" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usetypescriptfile" file="type-ini.mkvi"> + <cd:command name="usetypescriptfile" category="fonts" level="style" file="type-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -1519,7 +1520,7 @@ </cd:arguments> </cd:command> - <cd:command name="usetypescript" file="type-ini.mkvi"> + <cd:command name="usetypescript" category="fonts" level="style" file="type-ini.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="serif"/> @@ -1545,22 +1546,22 @@ </cd:arguments> </cd:command> - <cd:command name="loadtypescriptfile" file="type-ini.mkvi"> + <cd:command name="loadtypescriptfile" category="fonts" level="style" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="quittypescriptscanning" file="type-ini.mkvi"/> + <cd:command name="quittypescriptscanning" category="fonts" file="type-ini.mkvi"/> - <cd:command name="definetypescriptsynonym" file="type-ini.mkvi"> + <cd:command name="definetypescriptsynonym" 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" file="type-ini.mkvi"> + <cd:command name="typescript" type="environment" category="fonts" level="style" file="type-ini.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="serif"/> @@ -1578,20 +1579,20 @@ </cd:arguments> </cd:command> - <cd:command name="definetypescriptprefix" file="type-ini.mkvi"> + <cd:command name="definetypescriptprefix" 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" file="type-ini.mkvi"> + <cd:command name="typescriptprefix" category="fonts" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definetypeface" file="type-ini.mkvi"> + <cd:command name="definetypeface" category="fonts" level="style" file="type-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -1640,7 +1641,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontexpansion" file="hand-ini.mkiv"> + <cd:command name="setupfontexpansion" category="fonts" level="style" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1663,7 +1664,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupfontprotrusion" file="hand-ini.mkiv"> + <cd:command name="setupfontprotrusion" category="fonts" level="style" file="hand-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -1683,10 +1684,10 @@ </cd:arguments> </cd:command> - <cd:command name="blockligatures" file="font-fea.mkiv"> + <cd:command name="blockligatures" category="fonts" level="style" file="font-fea.mkvi"> <cd:arguments> - <cd:resolve name="keyword-list"/> + <cd:resolve name="keyword-text-list"/> </cd:arguments> </cd:command> - + </cd:interface> diff --git a/tex/context/interface/mkiv/i-form.xml b/tex/context/interface/mkiv/i-form.xml index 13e669427..52246c457 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" file="scrn-fld.mkvi"> + <cd:command name="setupforms" level="style" file="scrn-fld.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml index f6522fca4..2d1e752d6 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" file="math-for.mkiv"> + <cd:command name="defineformula" 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" file="math-for.mkiv"> + <cd:command name="setupformula" category="mathematics" level="style" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -86,23 +86,33 @@ <cd:parameter name="frame"> <cd:constant type="number"/> </cd:parameter> + <cd:parameter name="expansion"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + <cd:constant type="xml"/> + </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </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:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupformulas" file="math-for.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupformula"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupformulas" category="mathematics" level="style" file="math-for.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> <cd:command name="definesubformula" file="math-for.mkiv"> <cd:arguments> @@ -114,7 +124,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupsubformula" file="math-for.mkiv"> + <cd:command name="setupsubformula" category="mathematics" level="style" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -125,66 +135,63 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupsubformulas" file="math-for.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupsubformula"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupsubformulas" category="mathematics" level="style" file="math-for.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupsubformula"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="formula" type="environment" generated="yes" variant="example" file="strc-mat.mkiv"> + <cd:command name="formula" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:sequence> - <cd:variable value="formula"/> + <cd:instance value="formula"/> <cd:string value="formula"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> <cd:instances> - <cd:constant value="sp"/> - <cd:constant value="sd"/> - <cd:constant value="mp"/> - <cd:constant value="md"/> + <cd:resolve name="instance-formula"/> </cd:instances> </cd:command> - <cd:command name="formula" type="environment" file="strc-mat.mkiv"> + <cd:command name="formula" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formula-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="spformula" type="environment" 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:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="spformula" type="environment" 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:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="sdformula" type="environment" 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:arguments> - <cd:resolve name="keyword-formula-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="mpformula" type="environment" 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:arguments> + <cd:resolve name="keyword-formula-list-optional"/> + </cd:arguments> + </cd:command> + + --> - <cd:command name="defineformulaalternative" file="strc-mat.mkiv"> + <cd:command name="defineformulaalternative" category="mathematics" level="system" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-csname"/> @@ -192,41 +199,41 @@ </cd:arguments> </cd:command> - <cd:command name="formula" file="strc-mat.mkiv"> + <cd:command name="formula" category="mathematics" level="document" 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" file="strc-mat.mkiv"/> + <cd:command name="displaymath" type="environment" category="mathematics" level="system" file="strc-mat.mkiv"/> - <cd:command name="formulas" type="environment" file="strc-mat.mkiv"> + <cd:command name="formulas" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="subformulas" type="environment" file="strc-mat.mkiv"> + <cd:command name="subformulas" type="environment" 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" file="strc-mat.mkiv"> + <cd:command name="namedsubformulas" type="environment" 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" file="strc-mat.mkiv"> + <cd:command name="placeformula" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="title"> @@ -242,31 +249,31 @@ </cd:arguments> </cd:command> - <cd:command name="placeformula" type="environment" variant="argument" file="strc-mat.mkiv"> + <cd:command name="placeformula" type="environment" variant="argument" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placenamedformula" file="strc-mat.mkiv"> + <cd:command name="placenamedformula" category="mathematics" level="document" 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" file="strc-mat.mkiv"> + <cd:command name="placesubformula" category="mathematics" level="document" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="formulanumber" file="strc-mat"> + <cd:command name="formulanumber" category="mathematics" file="strc-mat"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="placecurrentformulanumber" file="strc-mat"/> + <cd:command name="placecurrentformulanumber" category="mathematics" file="strc-mat"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-fraction.xml b/tex/context/interface/mkiv/i-fraction.xml index 2624b8a5c..f395b1ea5 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" file="math-frc.mkiv"> + <cd:command name="definemathfraction" category="mathematics" level="style" 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" file="math-frc.mkiv"> + <cd:command name="setupmathfraction" category="mathematics" level="style" file="math-frc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -67,117 +67,110 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupmathfractions" file="math-frc.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupmathfraction"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupmathfractions" category="mathematics" level="style" file="math-frc.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupmathfraction"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="fraction" generated="yes" variant="example" file="math-frc.mkiv"> + <cd:command name="fraction" generated="yes" variant="instance" category="mathematics" level="document" file="math-frc.mkiv"> <cd:sequence> - <cd:variable value="fraction"/> + <cd:instance value="fraction"/> </cd:sequence> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="xfrac"/> - <cd:constant value="xxfrac"/> - <cd:constant value="frac"/> - <cd:constant value="sfrac"/> - <cd:constant value="dfrac"/> - <cd:constant value="binom"/> - <cd:constant value="dbinom"/> - <cd:constant value="tbinom"/> + <cd:resolve name="instance-fraction"/> </cd:instances> </cd:command> - <cd:command name="frac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="xfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="frac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="xxfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="xfrac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="tfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="xxfrac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="sfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="tfrac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="dfrac" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="sfrac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="binom" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="dfrac" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="dbinom" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="binom" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="tbinom" file="math-frc.mkiv"> - <cd:arguments> - <cd:content/> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="dbinom" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="tbinom" file="math-frc.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + </cd:arguments> + </cd:command> + + --> - <cd:command name="splitfrac" file="math-frc.mkiv"> + <cd:command name="splitfrac" category="mathematics" level="document" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="splitdfrac" file="math-frc.mkiv"> + <cd:command name="splitdfrac" category="mathematics" level="document" file="math-frc.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="cfrac" file="math-frc.mkiv"> + <cd:command name="cfrac" category="mathematics" level="document" file="math-frc.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="l"/> diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index c7633aa91..db01f60cd 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" file="pack-rul.mkiv"> + <cd:command name="defineframed" level="style" 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" file="pack-rul.mkiv"> + <cd:command name="setupframed" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -232,7 +232,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" file="pack-rul.mkiv"> + <cd:command name="framed" level="document" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -241,9 +241,9 @@ </cd:arguments> </cd:command> - <cd:command name="framed" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framed"/> + <cd:instance value="framed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -252,8 +252,7 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="unframed"/> - <cd:constant value="fitfieldframed"/> + <cd:resolve name="instance-framed"/> </cd:instances> </cd:command> @@ -266,7 +265,7 @@ </cd:arguments> </cd:command> - <cd:command name="framed" type="environment" file="pack-rul.mkiv"> + <cd:command name="framed" type="environment" level="document" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -312,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="placeframed" file="pack-rul.mkiv"> + <cd:command name="placeframed" level="document" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -322,7 +321,7 @@ </cd:arguments> </cd:command> - <cd:command name="inframed" file="pack-rul.mkiv"> + <cd:command name="inframed" level="document" file="pack-rul.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupframed"/> @@ -331,16 +330,20 @@ </cd:arguments> </cd:command> - <cd:command name="unframed" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="definemathframed" file="pack-rul.mkiv"> + <cd:command name="unframed" file="pack-rul.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definemathframed" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -350,7 +353,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmathframed" file="pack-rul.mkiv"> + <cd:command name="setupmathframed" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -359,9 +362,9 @@ </cd:arguments> </cd:command> - <cd:command name="mathframed" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="mathframed" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="mathframed"/> + <cd:instance value="mathframed"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -370,40 +373,42 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="mframed"/> - <cd:constant value="inmframed"/> - <cd:constant value="mcframed"/> + <cd:resolve name="instance-mathframed"/> </cd:instances> </cd:command> - <cd:command name="mframed" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="inmframed" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="mframed" file="pack-rul.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="mcframed" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupmathframed"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <cd:command name="inmframed" file="pack-rul.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="defineformulaframed" file="math-for.mkiv"> + <cd:command name="mcframed" file="pack-rul.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupmathframed"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="defineformulaframed" level="style" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -413,7 +418,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupformulaframed" file="math-for.mkiv"> + <cd:command name="setupformulaframed" level="style" file="math-for.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -422,7 +427,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineframedtext" file="pack-rul.mkiv"> + <cd:command name="defineframedtext" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -432,7 +437,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedtext" file="pack-rul.mkiv"> + <cd:command name="setupframedtext" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -473,22 +478,18 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupframedtexts" file="pack-rul.mkiv"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupframedtexts" level="style" file="pack-rul.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="framedtext" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framedtext" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -497,13 +498,13 @@ <cd:content/> </cd:arguments> <cd:instances> - <cd:constant value="framedtext"/> + <cd:resolve name="instance-framedtext"/> </cd:instances> </cd:command> - <cd:command name="framedtext" type="environment" generated="yes" variant="example" file="pack-rul.mkiv"> + <cd:command name="framedtext" type="environment" generated="yes" variant="instance" level="document" file="pack-rul.mkiv"> <cd:sequence> - <cd:variable value="framedtext"/> + <cd:instance value="framedtext"/> </cd:sequence> <cd:arguments> <cd:keywords optional="yes"> @@ -517,34 +518,38 @@ </cd:assignments> </cd:arguments> <cd:instances> - <cd:constant value="framedtext"/> + <cd:resolve name="instance-framedtext"/> </cd:instances> </cd:command> - <cd:command name="framedtext" file="pack-rul.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="framedtext" type="environment" file="pack-rul.mkiv"> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="middle"/> - <cd:constant type="none"/> - </cd:keywords> - <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setupframedtext"/> - </cd:assignments> - </cd:arguments> - </cd:command> + <cd:command name="framedtext" file="pack-rul.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> + + <cd:command name="framedtext" type="environment" file="pack-rul.mkiv"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="none"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupframedtext"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> - <cd:command name="defineframedcontent" file="pack-rul.mkiv"> + <cd:command name="defineframedcontent" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -554,7 +559,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupframedcontent" file="pack-rul.mkiv"> + <cd:command name="setupframedcontent" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -594,28 +599,28 @@ </cd:arguments> </cd:command> - <cd:command name="installleftframerenderer" file="pack-fen.mkiv"> + <cd:command name="installleftframerenderer" level="system" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installrightframerenderer" file="pack-fen.mkiv"> + <cd:command name="installrightframerenderer" level="system" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installtopframerenderer" file="pack-fen.mkiv"> + <cd:command name="installtopframerenderer" level="system" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installbottomframerenderer" file="pack-fen.mkiv"> + <cd:command name="installbottomframerenderer" level="system" file="pack-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index e66a039dc..9d27f154d 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" file="grph-inc.mkiv"> + <cd:command name="defineexternalfigure" category="graphics" level="style" 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" file="grph-inc.mkvi"> + <cd:command name="setupexternalfigure" category="graphics" level="style" file="grph-inc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -251,7 +251,7 @@ --> - <cd:command name="useexternalfigure" file="grph-inc.mkiv"> + <cd:command name="useexternalfigure" category="graphics" level="style" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> @@ -262,7 +262,7 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigure" file="grph-inc.mkiv"> + <cd:command name="externalfigure" category="graphics" level="document" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -272,7 +272,7 @@ </cd:arguments> </cd:command> - <cd:command name="getfiguredimensions" file="grph-inc.mkiv"> + <cd:command name="getfiguredimensions" category="graphics" level="system" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -281,32 +281,32 @@ </cd:arguments> </cd:command> - <cd:command name="figurewidth" file="grph-inc.mkiv"/> + <cd:command name="figurewidth" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figureheight" file="grph-inc.mkiv"/> + <cd:command name="figureheight" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalwidth" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalwidth" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurenaturalheight" file="grph-inc.mkiv"/> + <cd:command name="figurenaturalheight" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurefullname" file="grph-inc.mkiv"/> + <cd:command name="figurefullname" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurefilename" file="grph-inc.mkiv"/> + <cd:command name="figurefilename" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurefilepath" file="grph-inc.mkiv"/> + <cd:command name="figurefilepath" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="figurefiletype" file="grph-inc.mkiv"/> + <cd:command name="figurefiletype" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="noffigurepages" file="grph-inc.mkiv"/> + <cd:command name="noffigurepages" category="graphics" level="system" file="grph-inc.mkiv"/> - <cd:command name="definegraphictypesynonym" file="grph-inc.mkiv"> + <cd:command name="definegraphictypesynonym" category="graphics" level="system" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefigure" file="grph-inc.mkiv"> + <cd:command name="doifelsefigure" category="graphics" level="system" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -314,7 +314,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffigureelse" file="grph-inc.mkiv"> + <cd:command name="doiffigureelse" category="graphics" level="system" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -322,7 +322,7 @@ </cd:arguments> </cd:command> - <cd:command name="registerexternalfigure" file="grph-inc.mkiv"> + <cd:command name="registerexternalfigure" category="graphics" level="system" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-optional"/> @@ -332,7 +332,7 @@ </cd:arguments> </cd:command> - <cd:command name="usefigurebase" file="grph-inc.mkiv"> + <cd:command name="usefigurebase" category="graphics" level="style" file="grph-inc.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -341,81 +341,81 @@ </cd:arguments> </cd:command> - <cd:command name="externalfigurecollection" type="environment" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollection" type="environment" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminwidth" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminwidth" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxwidth" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxwidth" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionminheight" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionminheight" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionmaxheight" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionmaxheight" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="externalfigurecollectionparameter" file="grph-inc.mkiv"> + <cd:command name="externalfigurecollectionparameter" 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" file="grph-inc.mkiv"> + <cd:command name="efcminwidth" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxwidth" file="grph-inc.mkiv"> + <cd:command name="efcmaxwidth" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcminheight" file="grph-inc.mkiv"> + <cd:command name="efcminheight" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcmaxheight" file="grph-inc.mkiv"> + <cd:command name="efcmaxheight" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="efcparameter" file="grph-inc.mkiv"> + <cd:command name="efcparameter" 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" file="grph-inc.mkiv"> + <cd:command name="overlayfigure" category="graphics" file="grph-inc.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="bitmapimage" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" category="graphics" level="document" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -442,7 +442,7 @@ </cd:arguments> </cd:command> - <cd:command name="bitmapimage" type="environment" file="grph-inc.mkiv"> + <cd:command name="bitmapimage" type="environment" category="graphics" level="document" file="grph-inc.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> @@ -466,7 +466,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetbuffer" file="grph-fig.mkiv"> + <cd:command name="typesetbuffer" level="document" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="*"/> @@ -478,7 +478,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetypesetting" file="grph-fig.mkiv"> + <cd:command name="definetypesetting" level="style" file="grph-fig.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text-optional"/> @@ -488,7 +488,7 @@ </cd:arguments> </cd:command> - <cd:command name="typesetfile" file="grph-fig.mkiv"> + <cd:command name="typesetfile" level="document" file="grph-fig.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -504,7 +504,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimage" file="pack-box.mkiv"> + <cd:command name="backgroundimage" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> @@ -513,7 +513,7 @@ </cd:arguments> </cd:command> - <cd:command name="backgroundimagefill" file="pack-box.mkiv"> + <cd:command name="backgroundimagefill" category="graphics" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-dimension"/> diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml index ac678e544..155930ef8 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" file="page-grd.mkiv"> + <cd:command name="showgrid" 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" file="spac-ver.mkiv"> + <cd:command name="definegridsnapping" 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" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="snaptogrid" variant="list" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="placeongrid" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="placeongrid" variant="list" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="gridsnapping" type="environment" variant="list" category="layout" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="usegridparameter" category="layout" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="showgridsnapping" file="spac-ver.mkiv"/> + <cd:command name="showgridsnapping" category="layout" file="spac-ver.mkiv"/> - <cd:command name="basegrid" file="meta-grd.mkiv"> + <cd:command name="basegrid" level="document" 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" file="meta-grd.mkiv"> + <cd:command name="grid" level="document" file="meta-grd.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="basegrid"/> diff --git a/tex/context/interface/mkiv/i-help.xml b/tex/context/interface/mkiv/i-help.xml index d0c0aa103..673c34895 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" file="scrn-hlp.mkvi"> + <cd:command name="definehelp" level="style" 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" file="scrn-hlp.mkvi"> + <cd:command name="setuphelp" level="style" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -23,9 +23,9 @@ </cd:arguments> </cd:command> - <cd:command name="help" generated="yes" variant="example" file="scrn-hlp.mkvi"> + <cd:command name="help" generated="yes" variant="instance" file="scrn-hlp.mkvi"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> @@ -33,30 +33,30 @@ <cd:resolve name="argument-text"/> </cd:arguments> <cd:instances> - <cd:constant value="helptext"/> + <cd:resolve name="instance-help"/> </cd:instances> </cd:command> - <cd:command name="help" type="environment" generated="yes" variant="example" file="scrn-hlp.mkvi"> + <cd:command name="help" type="environment" generated="yes" variant="instance" file="scrn-hlp.mkvi"> <cd:sequence> - <cd:variable value="help"/> + <cd:instance value="help"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-optional"/> </cd:arguments> <cd:instances> - <cd:constant value="helptext"/> + <cd:resolve name="instance-help"/> </cd:instances> </cd:command> - <cd:command name="doifelsehelp" file="scrn-hlp.mkvi"> + <cd:command name="doifelsehelp" level="system" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifhelpelse" file="scrn-hlp.mkvi"> + <cd:command name="doifhelpelse" level="system" file="scrn-hlp.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/tex/context/interface/mkiv/i-hemistich.xml b/tex/context/interface/mkiv/i-hemistich.xml new file mode 100644 index 000000000..673f861ee --- /dev/null +++ b/tex/context/interface/mkiv/i-hemistich.xml @@ -0,0 +1,92 @@ +<?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="definehemistich" level="style" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuphemistich"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuphemistich" level="style" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="width"> + <cd:constant type="local" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="separator"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="leftstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="leftcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rightstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="rightcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="separatorstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="separatorcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="hemistiches" level="document" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistiches" variant="assignment" level="document" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuphemistich"/> + </cd:assignments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistich" generated="yes" variant="instance" level="document" file="m-hemistich.mkiv"> + <cd:sequence> + <cd:instance value="hemistich"/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="hemistichescaesura" level="document" file="m-hemistich.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:command"/> + </cd:keywords> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-highlight.xml b/tex/context/interface/mkiv/i-highlight.xml index 7a990b13b..db66912c5 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" file="core-sys.mkiv"> + <cd:command name="definehighlight" category="fonts" level="style" 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" file="core-sys.mkiv"> + <cd:command name="setuphighlight" category="fonts" level="style" 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" file="core-sys.mkiv"> + <cd:command name="highlight" generated="yes" variant="example" category="fonts" level="document" file="core-sys.mkiv"> <cd:sequence> <cd:variable value="highlight"/> </cd:sequence> @@ -41,20 +41,20 @@ </cd:arguments> </cd:command> - <cd:command name="highlight" file="core-sys.mkiv"> + <cd:command name="highlight" category="fonts" level="document" 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" file="core-sys.mkiv"> + <cd:command name="highlight" type="environment" category="fonts" level="document" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="directhighlight" file="core-sys.mkiv"> + <cd:command name="directhighlight" category="fonts" level="document" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index 9b9c777a5..f07f67232 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" file="spac-hor.mkiv"> + <cd:command name="definehspace" level="style" file="spac-hor.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -62,7 +62,7 @@ <cd:command name="nonfrenchspacing" file="spac-hor.mkiv"/> - <cd:command name="setupspacing" file="spac-hor.mkiv"> + <cd:command name="setupspacing" level="style" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="fixed"/> @@ -74,17 +74,17 @@ <cd:command name="space" file="spac-hor.mkiv"/> - <cd:command name="removelastspace" file="spac-hor.mkiv"/> + <cd:command name="removelastspace" level="system" file="spac-hor.mkiv"/> - <cd:command name="nospace" file="spac-hor.mkiv"/> + <cd:command name="nospace" level="system" file="spac-hor.mkiv"/> <cd:command name="fixedspace" file="spac-hor.mkiv"/> <cd:command name="fixedspaces" file="spac-hor.mkiv"/> - <cd:command name="keepunwantedspaces" file="spac-hor.mkiv"/> + <cd:command name="keepunwantedspaces" level="system" file="spac-hor.mkiv"/> - <cd:command name="removeunwantedspaces" file="spac-hor.mkiv"/> + <cd:command name="removeunwantedspaces" level="system" file="spac-hor.mkiv"/> <cd:command name="thinspace" file="spac-hor.mkiv"/> @@ -106,11 +106,11 @@ </cd:arguments> </cd:command> - <cd:command name="leftskipadaption" file="spac-hor.mkiv"/> + <cd:command name="leftskipadaption" level="system" file="spac-hor.mkiv"/> - <cd:command name="rightskipadaption" file="spac-hor.mkiv"/> + <cd:command name="rightskipadaption" level="system" file="spac-hor.mkiv"/> - <cd:command name="dosetleftskipadaption" file="spac-hor.mkiv"> + <cd:command name="dosetleftskipadaption" level="system" 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" file="spac-hor.mkiv"> + <cd:command name="dosetrightskipadaption" level="system" 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" file="spac-hor.mkiv"> + <cd:command name="doadaptleftskip" level="system" 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" file="spac-hor.mkiv"> + <cd:command name="doadaptrightskip" level="system" 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" file="spac-hor.mkiv"> + <cd:command name="activatespacehandler" level="system" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="on"/> diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml index 36cbc67e4..4c2d93895 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" file="lang-hyp.mkiv"> + <cd:command name="setuphyphenation" level="style" file="lang-hyp.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="method"> @@ -34,7 +34,7 @@ </cd:arguments> </cd:command> - <cd:command name="definehypenationfeatures" file="lang-hyp.mkiv"> + <cd:command name="definehypenationfeatures" level="style" 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" file="lang-hyp.mkiv"> + <cd:command name="sethyphenationfeatures" level="style" file="lang-hyp.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -127,7 +127,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuphyphenmark" file="typo-del.mkiv"> + <cd:command name="setuphyphenmark" level="style" 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" file="typo-brk.mkiv"> + <cd:command name="definebreakpoints" level="style" file="typo-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebreakpoint" file="typo-brk.mkiv"> + <cd:command name="definebreakpoint" level="style" 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" file="typo-brk.mkiv"> + <cd:command name="setbreakpoints" level="style" file="typo-brk.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> diff --git a/tex/context/interface/mkiv/i-imposition.xml b/tex/context/interface/mkiv/i-imposition.xml index b4bd4dee5..2b315ad78 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" file="page-imp.mkiv"> + <cd:command name="installshipoutmethod" level="system" file="page-imp.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="invokepageheandler" file="page-imp.mkiv"> + <cd:command name="invokepageheandler" level="system" 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" file="page-imp.mkiv"> + <cd:command name="setuparranging" 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" file="page-imp.mkiv"> + <cd:command name="installpagearrangement" category="layout" level="system" 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" file="page-imp.mkiv"/> + <cd:command name="arrangedpages" type="environment" begin="push" end="pop" category="layout" level="system" file="page-imp.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml index 7e2fb5ca3..9f44e22dd 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" file="spac-hor.mkiv"> + <cd:command name="defineindenting" level="style" 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" file="spac-hor.mkiv"> + <cd:command name="setupindenting" level="style" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="small" prefix="cd:sign" method="none"/> @@ -54,9 +54,9 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizeindenting" file="spac-hor.mkiv"/> + <cd:command name="synchronizeindenting" level="system" file="spac-hor.mkiv"/> - <cd:command name="useindentingparameter" file="spac-hor.mkiv"> + <cd:command name="useindentingparameter" level="system" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -68,7 +68,7 @@ <cd:command name="doindentation" file="spac-hor.mkiv" coreprimitive="yes"/> - <cd:command name="checknextindentation" file="spac-hor.mkiv"> + <cd:command name="checknextindentation" level="system" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="yes"/> @@ -78,14 +78,14 @@ </cd:arguments> </cd:command> - <cd:command name="useindentnextparameter" file="spac-hor.mkiv"> + <cd:command name="useindentnextparameter" level="system" file="spac-hor.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorechecknextindentation" file="spac-hor.mkiv"/> + <cd:command name="dorechecknextindentation" level="system" file="spac-hor.mkiv"/> - <cd:command name="indentation" type="environment" begin="push" end="pop" file="spac-hor.mkiv"/> + <cd:command name="indentation" type="environment" begin="push" end="pop" level="system" 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 98812d5e0..3d1b470ac 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" file="strc-ind.mkiv"> + <cd:command name="defineindentedtext" level="style" 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" file="strc-ind.mkiv"> + <cd:command name="setupindentedtext" level="style" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -57,13 +57,13 @@ </cd:arguments> </cd:command> - <cd:command name="indentedtext" type="environment" generated="yes" variant="example" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" generated="yes" variant="example" level="document" file="strc-ind.mkiv"> <cd:sequence> <cd:variable value="indentedtext"/> </cd:sequence> </cd:command> - <cd:command name="indentedtext" type="environment" file="strc-ind.mkiv"> + <cd:command name="indentedtext" type="environment" level="document" file="strc-ind.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-initial.xml b/tex/context/interface/mkiv/i-initial.xml index d50a7bc61..4b7c2a607 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" file="typo-drp.mkiv"> + <cd:command name="defineinitial" category="fonts" level="style" 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" file="typo-drp.mkiv"> + <cd:command name="setupinitial" category="fonts" level="style" 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" file="typo-drp.mkiv"> + <cd:command name="placeinitial" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="setinitial" file="typo-drp.mkiv"> + <cd:command name="setinitial" category="fonts" file="typo-drp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-insertion.xml b/tex/context/interface/mkiv/i-insertion.xml index 9250c9ebf..943e10069 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" file="page-ins.mkiv"> + <cd:command name="defineinsertion" level="system" 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" file="page-ins.mkiv"> + <cd:command name="setupinsertion" level="system" 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" file="page-ins.mkiv"> + <cd:command name="doifelseinsertion" level="system" 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" file="page-ins.mkiv"> + <cd:command name="doifinsertionelse" level="system" file="page-ins.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-interaction.xml b/tex/context/interface/mkiv/i-interaction.xml index 1c3285b84..dd8fce866 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" file="scrn-ini.mkvi"> + <cd:command name="defineinteraction" level="style" 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" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" level="style" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -119,7 +119,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupinteraction" variant="name" file="scrn-ini.mkvi"> + <cd:command name="setupinteraction" variant="name" level="style" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> @@ -143,14 +143,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselocation" file="scrn-ini.mkvi"> + <cd:command name="doifelselocation" level="system" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiflocationelse" file="scrn-ini.mkvi"> + <cd:command name="doiflocationelse" level="system" file="scrn-ini.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/tex/context/interface/mkiv/i-interactionbar.xml b/tex/context/interface/mkiv/i-interactionbar.xml index 67c31216a..ecc707df9 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" file="scrn-bar.mkvi"> + <cd:command name="defineinteractionbar" level="style" 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" file="scrn-bar.mkvi"> + <cd:command name="setupinteractionbar" level="style" file="scrn-bar.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-interactionmenu.xml b/tex/context/interface/mkiv/i-interactionmenu.xml index 22b928a5a..78068d1f5 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" file="scrn-but.mkvi"> + <cd:command name="defineinteractionmenu" level="style" 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" file="scrn-but.mkvi"> + <cd:command name="setupinteractionmenu" level="style" file="scrn-but.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-interactionscreen.xml b/tex/context/interface/mkiv/i-interactionscreen.xml index 6e337f6d6..dafdb310f 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" file="scrn-pag.mkvi"> + <cd:command name="setupinteractionscreen" level="style" file="scrn-pag.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="width"> diff --git a/tex/context/interface/mkiv/i-interface.xml b/tex/context/interface/mkiv/i-interface.xml index a9b35bbe5..08c273812 100644 --- a/tex/context/interface/mkiv/i-interface.xml +++ b/tex/context/interface/mkiv/i-interface.xml @@ -4,13 +4,13 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defaultinterface" file="mult-ini.mkiv"/> + <cd:command name="defaultinterface" level="system" file="mult-ini.mkiv"/> - <cd:command name="currentinterface" file="mult-ini.mkiv"/> + <cd:command name="currentinterface" level="system" file="mult-ini.mkiv"/> - <cd:command name="currentresponses" file="mult-ini.mkiv"/> + <cd:command name="currentresponses" level="system" file="mult-ini.mkiv"/> - <cd:command name="interface" type="environment" file="mult-ini.mkiv"> + <cd:command name="interface" type="environment" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="all"/> @@ -19,53 +19,53 @@ </cd:arguments> </cd:command> - <cd:command name="defineinterfaceconstant" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfacevariable" file="mult-ini.mkiv"> + <cd:command name="defineinterfacevariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defineinterfaceelement" file="mult-ini.mkiv"> + <cd:command name="defineinterfaceelement" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definefileconstant" file="mult-ini.mkiv"> + <cd:command name="definefileconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemconstant" file="mult-ini.mkiv"> + <cd:command name="definesystemconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definemessageconstant" file="mult-ini.mkiv"> + <cd:command name="definemessageconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="definesystemvariable" file="mult-ini.mkiv"> + <cd:command name="definesystemvariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacemessage" file="mult-ini.mkiv"> + <cd:command name="setinterfacemessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmessagetext" file="mult-ini.mkiv"> + <cd:command name="setmessagetext" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -87,9 +87,9 @@ </cd:arguments> </cd:command> - <cd:command name="currentmessagetext" file="mult-ini.mkiv"/> + <cd:command name="currentmessagetext" level="system" file="mult-ini.mkiv"/> - <cd:command name="getmessage" file="mult-ini.mkiv"> + <cd:command name="getmessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -99,7 +99,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemessage" file="mult-ini.mkiv"> + <cd:command name="doifelsemessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmessageelse" file="mult-ini.mkiv"> + <cd:command name="doifmessageelse" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -123,7 +123,7 @@ </cd:arguments> </cd:command> - <cd:command name="showmessage" file="mult-ini.mkiv"> + <cd:command name="showmessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -134,32 +134,32 @@ </cd:arguments> </cd:command> - <cd:command name="writestatus" file="mult-ini.mkiv"> + <cd:command name="writestatus" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="message" file="mult-ini.mkiv"> + <cd:command name="message" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="inlinemessage" file="mult-ini.mkiv"> + <cd:command name="inlinemessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="displaymessage" file="mult-ini.mkiv"> + <cd:command name="displaymessage" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showwarning" file="mult-ini.mkiv"> + <cd:command name="showwarning" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -170,28 +170,28 @@ </cd:arguments> </cd:command> - <cd:command name="setinterfaceconstant" file="mult-ini.mkiv"> + <cd:command name="setinterfaceconstant" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacevariable" file="mult-ini.mkiv"> + <cd:command name="setinterfacevariable" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfaceelements" file="mult-ini.mkiv"> + <cd:command name="setinterfaceelement" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setinterfacecommand" file="mult-ini.mkiv"> + <cd:command name="setinterfacecommand" level="system" file="mult-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-interlinespace.xml b/tex/context/interface/mkiv/i-interlinespace.xml index b93bac7f5..6573a8e05 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" file="spac-ver.mkiv"> + <cd:command name="defineinterlinespace" level="style" 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" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" level="style" 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" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="argument" level="style" 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" file="spac-ver.mkiv"> + <cd:command name="setupinterlinespace" variant="name" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" level="style" 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" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="argument" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="on"/> @@ -100,7 +100,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplocalinterlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="setuplocalinterlinespace" variant="name" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -137,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" level="system" 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" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="argument" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="on"/> @@ -161,13 +161,13 @@ </cd:arguments> </cd:command> - <cd:command name="dosetupcheckedinterlinespace" variant="name" file="spac-ver.mkiv"> + <cd:command name="dosetupcheckedinterlinespace" variant="name" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="useinterlinespaceparameter" file="spac-ver.mkiv"> + <cd:command name="useinterlinespaceparameter" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-ipsum.xml b/tex/context/interface/mkiv/i-ipsum.xml index f96fc5229..b3fb7cfdd 100644 --- a/tex/context/interface/mkiv/i-ipsum.xml +++ b/tex/context/interface/mkiv/i-ipsum.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineipsum" file="m-ipsum.mkiv"> + <cd:command name="defineipsum" level="style" file="m-ipsum.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="setupipsum" file="m-ipsum.mkiv"> + <cd:command name="setupipsum" level="style" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="ipsum" file="m-ipsum.mkiv"> + <cd:command name="ipsum" level="document" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="directipsum" file="m-ipsum.mkiv"> + <cd:command name="directipsum" level="document" file="m-ipsum.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-italiccorrection.xml b/tex/context/interface/mkiv/i-italiccorrection.xml index f8d711ae8..def238233 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" file="typo-itc.mkvi"> + <cd:command name="setitaliccorrection" 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" file="typo-itc.mkvi"/> + <cd:command name="resetitaliccorrection" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="italiccorrection" file="typo-itc.mkvi"/> + <cd:command name="italiccorrection" category="fonts" file="typo-itc.mkvi"/> - <cd:command name="setupitaliccorrection" file="typo-itc.mkvi"> + <cd:command name="setupitaliccorrection" category="fonts" file="typo-itc.mkvi"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="text"/> diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml index 6fb28b635..7145ebfb3 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" file="strc-itm.mkvi"> + <cd:command name="defineitemgroup" level="style" 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" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" level="style" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -193,12 +193,15 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" variant="assignment" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" variant="assignment" level="style" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -376,12 +379,15 @@ <cd:parameter name="symcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:inherit name="setupcounter"/> + <cd:parameter name="grid"> + <cd:inherit name="definegridsnapping"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupitemgroups" file="strc-itm.mkvi"> + <cd:command name="setupitemgroups" level="style" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -393,7 +399,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupitemgroup" generated="yes" variant="instance" file="strc-itm.mkvi"> + <cd:command name="setupitemgroup" generated="yes" variant="instance" level="style" file="strc-itm.mkvi"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="itemgroup"/> @@ -415,7 +421,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" level="document" file="strc-itm.mkvi"> <cd:sequence> <cd:instance value="itemgroup"/> </cd:sequence> @@ -432,7 +438,7 @@ </cd:instances> </cd:command> - <cd:command name="itemgroup" type="environment" file="strc-itm.mkvi"> + <cd:command name="itemgroup" type="environment" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes" optional="yes"> @@ -444,15 +450,15 @@ </cd:arguments> </cd:command> - <cd:command name="item" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="item" scope="itemgroup" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="noitem" scope="itemgroup" file="strc-itm.mkvi"/> + <cd:command name="noitem" scope="itemgroup" level="document" file="strc-itm.mkvi"/> - <cd:command name="itemtag" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="itemtag" scope="itemgroup" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> @@ -521,20 +527,20 @@ --> - <cd:command name="item" type="environment" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="item" type="environment" scope="itemgroup" level="document" 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" file="strc-itm.mkvi"> + <cd:command name="head" type="environment" scope="itemgroup" level="document" 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" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="item" scope="itemgroup" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="item" default="yes"/> @@ -543,7 +549,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="symbol" scope="itemgroup" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sym"/> @@ -554,7 +560,7 @@ </cd:arguments> </cd:command> - <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" file="strc-itm.mkvi"> + <cd:command name="specialitem" type="environment" variant="none" scope="itemgroup" level="document" file="strc-itm.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="sub"/> diff --git a/tex/context/interface/mkiv/i-items.xml b/tex/context/interface/mkiv/i-items.xml index d3f68132a..b73524229 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" file="typo-itm.mkiv"> + <cd:command name="defineitems" level="style" 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" file="typo-itm.mkiv"> + <cd:command name="setupitems" level="style" 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" file="typo-itm.mkiv"> + <cd:command name="items" level="document" file="typo-itm.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupitems"/> diff --git a/tex/context/interface/mkiv/i-javascript.xml b/tex/context/interface/mkiv/i-javascript.xml index 965ed5388..4cf9dbf85 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" file="java-ini.mkiv"> + <cd:command name="JScode" type="environment" level="system" 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" file="java-ini.mkiv"> + <cd:command name="JSpreamble" type="environment" level="system" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:keywords delimiters="none"> @@ -27,21 +27,21 @@ </cd:arguments> </cd:command> - <cd:command name="setJSpreamble" file="java-ini.mkiv"> + <cd:command name="setJSpreamble" level="system" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="addtoJSpreamble" file="java-ini.mkiv"> + <cd:command name="addtoJSpreamble" level="system" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="useJSscripts" file="java-ini.mkiv"> + <cd:command name="useJSscripts" level="style" file="java-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-name-list-optional"/> diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml index aacb4a6ea..d2a332ab3 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" file="typo-krn.mkiv"> + <cd:command name="definecharacterkerning" level="style" 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" file="typo-krn.mkiv"> + <cd:command name="setupcharacterkerning" level="style" file="typo-krn.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -49,7 +49,7 @@ <cd:command name="resetcharacterkerning" file="typo-krn.mkiv"/> - <cd:command name="characterkerning" generated="yes" variant="example" file="typo-krn.mkiv"> + <cd:command name="characterkerning" generated="yes" variant="example" level="document" file="typo-krn.mkiv"> <cd:sequence> <cd:variable value="characterkerning"/> </cd:sequence> @@ -59,21 +59,21 @@ </cd:arguments> </cd:command> - <cd:command name="kerncharacters" file="typo-krn.mkiv"> + <cd:command name="kerncharacters" level="document" 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" file="typo-krn.mkiv"> + <cd:command name="letterspacing" level="document" 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" file="typo-krn.mkiv"> + <cd:command name="stretched" level="document" 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" file="typo-krn.mkiv"> + <cd:command name="setupstretched" level="style" file="typo-krn.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupcharacterkerning"/> diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml index fe7851d9d..ff2ebc005 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" file="strc-lab.mkiv"> + <cd:command name="definelabel" level="style" 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" file="strc-lab.mkiv"> + <cd:command name="setuplabel" level="style" file="strc-lab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -189,7 +189,7 @@ --> - <cd:command name="label" generated="yes" variant="example" file="strc-lab.mkiv"> + <cd:command name="label" generated="yes" variant="example" level="document" file="strc-lab.mkiv"> <cd:sequence> <cd:variable value="label"/> </cd:sequence> @@ -199,7 +199,7 @@ </cd:arguments> </cd:command> - <cd:command name="currentlabel" generated="yes" variant="example" file="strc-lab.mkiv"> + <cd:command name="currentlabel" generated="yes" variant="example" level="document" file="strc-lab.mkiv"> <cd:sequence> <cd:string value="current"/> <cd:variable value="label"/> diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml index 34c70231f..4a58a069c 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" file="lang-lab.mkiv"> + <cd:command name="definelabelclass" category="language" level="system" 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" file="lang-lab.mkiv"> + <cd:command name="setuplabeltext" generated="yes" variant="instance" category="language" level="style" 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" file="lang-lab.mkiv"> + <cd:command name="presetlabeltext" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="copylabeltext" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="labeltext" type="environment" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="labellanguage" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="labeltext" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="labeltexts" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="leftlabeltext" generated="yes" variant="instance" 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" file="lang-lab.mkiv"> + <cd:command name="rightlabeltext" generated="yes" variant="instance" category="language" file="lang-lab.mkiv"> <cd:sequence> <cd:string value="right"/> <cd:instance value="label"/> diff --git a/tex/context/interface/mkiv/i-language.xml b/tex/context/interface/mkiv/i-language.xml index 395e08c34..c60965a59 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" file="lang-ini.mkiv"> + <cd:command name="installlanguage" category="language" level="system" 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" file="lang-ini.mkiv"> + <cd:command name="installlanguage" variant="name" category="language" level="system" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="setuplanguage" file="lang-ini.mkiv"> + <cd:command name="setuplanguage" category="language" level="style" 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" file="lang-ini.mkiv"> + <cd:command name="doifelselanguage" category="language" level="system" 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" file="lang-ini.mkiv"> + <cd:command name="doiflanguageelse" category="language" level="system" 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" file="lang-ini.mkiv"> + <cd:command name="doifelsepatterns" category="language" level="system" 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" file="lang-ini.mkiv"> + <cd:command name="doifpatternselse" category="language" level="system" 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" file="lang-ini.mkiv"> + <cd:command name="language" generated="yes" variant="example" category="language" level="document" file="lang-ini.mkiv"> <cd:sequence> <cd:variable value="language"/> </cd:sequence> </cd:command> - <cd:command name="language" file="lang-ini.mkiv"> + <cd:command name="language" category="language" level="document" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="mainlanguage" file="lang-ini.mkiv"> + <cd:command name="mainlanguage" category="language" level="style" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="uselanguageparameter" file="lang-ini.mkiv"> + <cd:command name="uselanguageparameter" category="language" level="system" file="lang-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="exceptions" type="environment" file="lang-ini.mkiv"> + <cd:command name="exceptions" type="environment" category="language" level="style" file="lang-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-language"/> </cd:arguments> </cd:command> - <cd:command name="currentlanguage" file="lang-ini.mkiv"/> + <cd:command name="currentlanguage" category="language" file="lang-ini.mkiv"/> - <cd:command name="currentmainlanguage" file="lang-ini.mkiv"/> + <cd:command name="currentmainlanguage" category="language" file="lang-ini.mkiv"/> - <cd:command name="commalistsentence" file="lang-lab.mkiv"> + <cd:command name="commalistsentence" category="language" level="document" file="lang-lab.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:text"/> diff --git a/tex/context/interface/mkiv/i-layer.xml b/tex/context/interface/mkiv/i-layer.xml index 9157ecdbf..04704f75c 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" file="pack-box.mkiv"> + <cd:command name="setuplayeredtext" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -94,7 +94,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayer" file="pack-lyr.mkiv"> + <cd:command name="definelayer" level="style" 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" file="pack-lyr.mkiv"> + <cd:command name="setuplayer" level="style" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -267,7 +267,7 @@ </cd:arguments> </cd:command> - <cd:command name="definelayerpreset" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" level="system" 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" file="pack-lyr.mkiv"> + <cd:command name="definelayerpreset" variant="name" level="system" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelselayerdata" file="pack-lyr.mkiv"> + <cd:command name="doifelselayerdata" level="system" 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" file="pack-lyr.mkiv"> + <cd:command name="doiflayerdataelse" level="system" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index f3e42515e..15e60115e 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" file="page-lay.mkiv"> + <cd:command name="definelayout" category="layout" level="style" 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" file="page-lay.mkiv"> + <cd:command name="setuplayout" category="layout" level="style" 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" file="page-lay.mkiv"> + <cd:command name="setuplayout" variant="name" category="layout" level="style" file="page-lay.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> @@ -220,7 +220,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelselayoutdefined" file="page-lay.mkiv"> + <cd:command name="doifelselayoutdefined" category="layout" level="system" 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" file="page-lay.mkiv"> + <cd:command name="doiflayoutdefinedelse" category="layout" level="system" 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" file="page-lay.mkiv"> + <cd:command name="adaptlayout" category="layout" level="style" 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" file="page-lay.mkiv"> + <cd:command name="layout" type="environment" category="layout" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseoddpage" file="page-lay.mkiv"> + <cd:command name="doifelseoddpage" category="layout" level="system" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifoddpageelse" file="page-lay.mkiv"> + <cd:command name="doifoddpageelse" category="layout" level="system" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifbothsidesoverruled" file="page-lay.mkiv"> + <cd:command name="doifbothsidesoverruled" category="layout" level="system" 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" file="page-lay.mkiv"> + <cd:command name="doifbothsides" category="layout" level="system" 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" file="page-lay.mkiv"> + <cd:command name="rightorleftpageaction" category="layout" level="system" file="page-lay.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="showprint" file="page-run.mkiv"> + <cd:command name="showprint" 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" file="page-run.mkiv"> + <cd:command name="showframe" 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" file="page-run.mkiv"> + <cd:command name="showsetups" 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" file="page-run.mkiv"> + <cd:command name="showlayout" category="layout" file="page-run.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="pt" default="yes"/> @@ -363,8 +363,8 @@ </cd:arguments> </cd:command> - <cd:command name="showmargins" file="page-run.mkiv"/> + <cd:command name="showmargins" category="layout" file="page-run.mkiv"/> - <cd:command name="spread" type="environment" file="page-spr.mkiv"/> + <cd:command name="spread" type="environment" category="layout" file="page-spr.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml index 1c7ca2f75..7459d7142 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" file="page-lin.mkvi"> + <cd:command name="definelinenumbering" level="style" 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" file="page-lin.mkvi"> + <cd:command name="setuplinenumbering" level="style" 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" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" level="document" 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" file="page-lin.mkvi"> + <cd:command name="linenumbering" type="environment" variant="argument" level="document" 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" file="page-lin.mkvi"> + <cd:command name="someline" level="document" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="startline" file="page-lin.mkvi"> + <cd:command name="startline" level="document" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="stopline" file="page-lin.mkvi"> + <cd:command name="stopline" level="document" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesamelinereference" file="page-lin.mkvi"> + <cd:command name="doifelsesamelinereference" level="system" 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" file="page-lin.mkvi"> + <cd:command name="doifsamelinereferenceelse" level="system" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="argument-reference"/> <cd:resolve name="argument-true"/> @@ -156,14 +156,14 @@ </cd:arguments> </cd:command> - <cd:command name="inline" file="page-lin.mkvi"> + <cd:command name="inline" level="document" 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" file="page-lin.mkvi"> + <cd:command name="inlinerange" level="document" file="page-lin.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml index 32c3c6b70..0c46fbd10 100644 --- a/tex/context/interface/mkiv/i-lines.xml +++ b/tex/context/interface/mkiv/i-lines.xml @@ -4,33 +4,33 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="noflines" file="supp-box.mkiv"/> + <cd:command name="noflines" level="system" file="supp-box.mkiv"/> - <cd:command name="getnoflines" file="supp-box.mkiv"> + <cd:command name="getnoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getroundednoflines" file="supp-box.mkiv"> + <cd:command name="getroundednoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="getrawnoflines" file="supp-box.mkiv"> + <cd:command name="getrawnoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="determinenoflines" file="supp-box.mkiv"> + <cd:command name="determinenoflines" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelines" file="spac-lin.mkiv"> + <cd:command name="definelines" level="style" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -40,7 +40,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplines" file="spac-lin.mkiv"> + <cd:command name="setuplines" level="style" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="lines" type="environment" generated="yes" variant="instance" file="spac-lin.mkiv"> + <cd:command name="lines" type="environment" generated="yes" variant="instance" level="document" file="spac-lin.mkiv"> <cd:sequence> <cd:instance value="lines"/> </cd:sequence> @@ -114,7 +114,7 @@ --> - <cd:command name="emptylines" file="spac-lin.mkiv"> + <cd:command name="emptylines" level="document" file="spac-lin.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-linetable.xml b/tex/context/interface/mkiv/i-linetable.xml index 9b4cae16a..fdfddbf44 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" file="tabl-ltb.mkiv"> + <cd:command name="setuplinetable" category="tables" level="style" 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" file="tabl-ltb.mkiv"> + <cd:command name="linetablecell" type="environment" 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" file="tabl-ltb.mkiv"/> + <cd:command name="linetable" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> - <cd:command name="linetablehead" type="environment" file="tabl-ltb.mkiv"/> + <cd:command name="linetablehead" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> - <cd:command name="linetablebody" type="environment" file="tabl-ltb.mkiv"/> + <cd:command name="linetablebody" type="environment" category="tables" level="document" file="tabl-ltb.mkiv"/> - <cd:command name="processlinetablebuffer" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablebuffer" category="tables" level="document" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> </cd:command> - <cd:command name="processlinetablefile" file="tabl-ltb.mkiv"> + <cd:command name="processlinetablefile" category="tables" level="document" file="tabl-ltb.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-linewidth.xml b/tex/context/interface/mkiv/i-linewidth.xml index 65a967954..6b2e5274c 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" file="pack-rul.mkiv"> + <cd:command name="setuplinewidth" level="style" file="pack-rul.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="small"/> diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml index 7e0def052..bde2a69e6 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" file="strc-lst.mkvi"> + <cd:command name="definelist" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="setuplist" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="doifelselist" level="system" 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" file="strc-lst.mkvi"> + <cd:command name="doiflistelse" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-list"/> <cd:resolve name="argument-true"/> @@ -354,7 +354,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelist" file="strc-lst.mkvi"> + <cd:command name="placelist" level="document" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> @@ -372,7 +372,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelist" file="strc-lst.mkvi"> + <cd:command name="completelist" level="document" 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" file="strc-lst.mkvi"> + <cd:command name="definecombinedlist" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="setupcombinedlist" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" level="document" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> @@ -424,7 +424,7 @@ </cd:instances> </cd:command> - <cd:command name="placecombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi"> + <cd:command name="placecombinedlist" generated="yes" variant="instance" level="document" 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" file="strc-lst.mkvi"> + <cd:command name="completecombinedlist" generated="yes" variant="instance" level="document" file="strc-lst.mkvi"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="combinedlist"/> @@ -494,35 +494,35 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthaspage" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthaspage" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthaspageelse" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthaspageelse" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsestructurelisthasnumber" file="strc-lst.mkvi"> + <cd:command name="doifelsestructurelisthasnumber" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifstructurelisthasnumberelse" file="strc-lst.mkvi"> + <cd:command name="doifstructurelisthasnumberelse" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="definelistextra" file="strc-lst.mkvi"> + <cd:command name="definelistextra" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="setuplistextra" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="definelistalternative" level="style" 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" file="strc-lst.mkvi"> + <cd:command name="setuplistalternative" level="style" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -611,7 +611,7 @@ <cd:command name="currentlistentrywrapper" type="environment" file="strc-lst.mkvi"/> - <cd:command name="currentlistentryreferenceattribute" file="strc-lst.mkvi"> + <cd:command name="currentlistentryreferenceattribute" level="system" 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" file="strc-lst.mkvi"/> + <cd:command name="currentlistentrydestinationattribute" level="system" file="strc-lst.mkvi"/> - <cd:command name="currentlistentrylimitedtext" file="strc-lst.mkvi"> + <cd:command name="currentlistentrylimitedtext" level="system" file="strc-lst.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml index 1fe891b2c..9b31c5b96 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" file="typo-scr.mkiv"> + <cd:command name="definelow" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="setuplow" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="low" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="low"/> </cd:sequence> @@ -46,13 +46,13 @@ </cd:instances> </cd:command> - <cd:command name="low" file="typo-scr.mkiv"> + <cd:command name="low" level="document" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definehigh" file="typo-scr.mkiv"> + <cd:command name="definehigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="setuphigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="high" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="high"/> </cd:sequence> @@ -94,13 +94,13 @@ </cd:instances> </cd:command> - <cd:command name="high" file="typo-scr.mkiv"> + <cd:command name="high" level="document" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definelowhigh" file="typo-scr.mkiv"> + <cd:command name="definelowhigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="setuplowhigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="lowhigh" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowhigh"/> </cd:sequence> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="lohi" file="typo-scr.mkiv"> + <cd:command name="lohi" level="document" 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" file="typo-scr.mkiv"> + <cd:command name="hilo" level="document" 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" file="typo-scr.mkiv"> + <cd:command name="definelowmidhigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="setuplowmidhigh" level="style" 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" file="typo-scr.mkiv"> + <cd:command name="lowmidhigh" generated="yes" variant="instance" level="document" file="typo-scr.mkiv"> <cd:sequence> <cd:instance value="lowmidhigh"/> </cd:sequence> @@ -210,7 +210,7 @@ </cd:arguments> </cd:command> - <cd:command name="lomihi" file="typo-scr.mkiv"> + <cd:command name="lomihi" level="document" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -218,7 +218,7 @@ </cd:arguments> </cd:command> - <cd:command name="himilo" file="typo-scr.mkiv"> + <cd:command name="himilo" level="document" file="typo-scr.mkiv"> <cd:arguments> <cd:content/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml index ef970609b..b4aa8ab5c 100644 --- a/tex/context/interface/mkiv/i-lua.xml +++ b/tex/context/interface/mkiv/i-lua.xml @@ -4,187 +4,187 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="taggedctxcommand" file="back-exp.mkiv"> + <cd:command name="taggedctxcommand" level="system" file="back-exp.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luafunction" file="cldf-ini.mkiv"> + <cd:command name="luafunction" level="system" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldprocessfile" file="cldf-ini.mkiv"> + <cd:command name="cldprocessfile" level="system" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldloadfile" file="cldf-ini.mkiv"> + <cd:command name="cldloadfile" level="system" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="cldcontext" file="cldf-ini.mkiv"> + <cd:command name="cldcontext" level="system" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="cldcommand" file="cldf-ini.mkiv"> + <cd:command name="cldcommand" level="system" file="cldf-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectlua" file="luat-cod.mkiv"> + <cd:command name="ctxdirectlua" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatelua" file="luat-cod.mkiv"> + <cd:command name="ctxlatelua" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxsprint" file="luat-cod.mkiv"> + <cd:command name="ctxsprint" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxcommand" file="luat-cod.mkiv"> + <cd:command name="ctxcommand" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxdirectcommand" file="luat-cod.mkiv"> + <cd:command name="ctxdirectcommand" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlatecommand" file="luat-cod.mkiv"> + <cd:command name="ctxlatecommand" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxreport" file="luat-cod.mkiv"> + <cd:command name="ctxreport" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxlua" file="luat-cod.mkiv"> + <cd:command name="ctxlua" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luacode" file="luat-cod.mkiv"> + <cd:command name="luacode" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="lateluacode" file="luat-cod.mkiv"> + <cd:command name="lateluacode" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="directluacode" file="luat-cod.mkiv"> + <cd:command name="directluacode" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaversion" file="luat-cod.mkiv"/> + <cd:command name="luaversion" level="system" file="luat-cod.mkiv"/> - <cd:command name="registerctxluafile" file="luat-cod.mkiv"> + <cd:command name="registerctxluafile" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="ctxloadluafile" file="luat-cod.mkiv"> + <cd:command name="ctxloadluafile" level="system" file="luat-cod.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="lua" type="environment" file="luat-ini.mkiv"/> + <cd:command name="lua" type="environment" level="system" file="luat-ini.mkiv"/> - <cd:command name="luacode" type="environment" file="luat-ini.mkiv"/> + <cd:command name="luacode" type="environment" level="system" file="luat-ini.mkiv"/> - <cd:command name="luamajorversion" file="luat-ini.mkiv"/> + <cd:command name="luamajorversion" level="system" file="luat-ini.mkiv"/> - <cd:command name="luaminorversion" file="luat-ini.mkiv"/> + <cd:command name="luaminorversion" level="system" file="luat-ini.mkiv"/> - <cd:command name="luaexpanded" file="luat-ini.mkiv"> + <cd:command name="luaexpanded" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" type="environment" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" type="environment" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="luaparameterset" file="luat-ini.mkiv"> + <cd:command name="luaparameterset" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="luaconditional" file="luat-ini.mkiv"> + <cd:command name="luaconditional" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ctxluacode" file="luat-ini.mkiv"> + <cd:command name="ctxluacode" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" type="environment" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" type="environment" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" file="luat-ini.mkiv"> + <cd:command name="ctxfunctiondefinition" generated="yes" variant="example" level="system" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunctiondefinition"/> </cd:sequence> </cd:command> - <cd:command name="ctxfunction" type="environment" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" type="environment" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ctxfunction" generated="yes" variant="example" file="luat-ini.mkiv"> + <cd:command name="ctxfunction" generated="yes" variant="example" level="system" file="luat-ini.mkiv"> <cd:sequence> <cd:variable value="ctxfunction"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml index 8831a8b0b..39fe9d112 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" file="page-mak.mkvi"> + <cd:command name="definemakeup" level="style" 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" file="page-mak.mkvi"> + <cd:command name="setupmakeup" level="style" file="page-mak.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="makeup" type="environment" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" level="document" 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" file="page-mak.mkvi"> + <cd:command name="makeup" type="environment" generated="yes" variant="instance" level="document" file="page-mak.mkvi"> <cd:sequence> <cd:instance value="makeup"/> <cd:string value="makeup"/> diff --git a/tex/context/interface/mkiv/i-marginblock.xml b/tex/context/interface/mkiv/i-marginblock.xml index f40bf112a..89aca949a 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" file="page-mbk.mkvi"> + <cd:command name="definemarginblock" level="style" 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" file="page-mbk.mkvi"> + <cd:command name="setupmarginblock" level="style" file="page-mbk.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml index a54362fec..2f77e71a0 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" file="typo-mar.mkiv"> + <cd:command name="definemargindata" level="style" 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" file="typo-mar.mkiv"> + <cd:command name="setupmargindata" level="style" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -119,7 +119,7 @@ --> - <cd:command name="setupmarginframed" file="typo-mar.mkiv"> + <cd:command name="setupmarginframed" level="style" 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" file="typo-mar.mkiv"> + <cd:command name="margindata" generated="yes" variant="instance" level="document" file="typo-mar.mkiv"> <cd:sequence> <cd:instance value="margindata"/> </cd:sequence> @@ -149,7 +149,7 @@ </cd:instances> </cd:command> - <cd:command name="margindata" file="typo-mar.mkiv"> + <cd:command name="margindata" level="document" file="typo-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-marker.xml b/tex/context/interface/mkiv/i-marker.xml index fe491650e..d01aee822 100644 --- a/tex/context/interface/mkiv/i-marker.xml +++ b/tex/context/interface/mkiv/i-marker.xml @@ -4,26 +4,26 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarker" file="attr-mkr.mkiv"> + <cd:command name="definemarker" level="system" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setmarker" file="attr-mkr.mkiv"> + <cd:command name="setmarker" level="system" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="resetmarker" file="attr-mkr.mkiv"> + <cd:command name="resetmarker" level="system" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="boxmarker" file="attr-mkr.mkiv"> + <cd:command name="boxmarker" level="system" file="attr-mkr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml index 644f0ac5b..cb1bf11af 100644 --- a/tex/context/interface/mkiv/i-marking.xml +++ b/tex/context/interface/mkiv/i-marking.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definemarking" file="strc-mar.mkiv"> + <cd:command name="definemarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-mark-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupmarking" file="strc-mar.mkiv"> + <cd:command name="setupmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark-list-optional"/> <cd:assignments list="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="relatemarking" file="strc-mar.mkiv"> + <cd:command name="relatemarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-mark"/> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizemarking" file="strc-mar.mkiv"> + <cd:command name="synchronizemarking" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:resolve name="keyword-number"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsemarking" file="strc-mar.mkiv"> + <cd:command name="doifelsemarking" level="system" 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" file="strc-mar.mkiv"> + <cd:command name="doifmarkingelse" level="system" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="argument-mark"/> <cd:resolve name="argument-true"/> @@ -82,7 +82,7 @@ </cd:arguments> </cd:command> - <cd:command name="getmarking" file="strc-mar.mkiv"> + <cd:command name="getmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemark" file="strc-mar.mkiv"> + <cd:command name="fetchonemark" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -104,19 +104,19 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarks" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarks" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchallmarks" file="strc-mar.mkiv"> + <cd:command name="fetchallmarks" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> </cd:arguments> </cd:command> - <cd:command name="fetchmark" file="strc-mar.mkiv"> + <cd:command name="fetchmark" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords optional="yes"> @@ -125,7 +125,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchmarking" file="strc-mar.mkiv"> + <cd:command name="fetchmarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchonemarking" file="strc-mar.mkiv"> + <cd:command name="fetchonemarking" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -151,7 +151,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchtwomarkings" file="strc-mar.mkiv"> + <cd:command name="fetchtwomarkings" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> @@ -161,7 +161,7 @@ </cd:arguments> </cd:command> - <cd:command name="fetchallmarkings" file="strc-mar.mkiv"> + <cd:command name="fetchallmarkings" level="style" file="strc-mar.mkiv"> <cd:arguments> <cd:resolve name="keyword-mark"/> <cd:keywords> diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index 58890d6ea..d83acda68 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" file="math-ini.mkiv"> + <cd:command name="definemathematics" category="mathematics" level="style" 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" file="math-ini.mkiv"> + <cd:command name="setupmathematics" category="mathematics" level="style" 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" category="mathematics" file="math-ini.mkiv"> + <cd:command name="inlineordisplaymath" level="system" file="math-ini.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mathematics" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mathematics" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="math" category="mathematics" file="math-ini.mkiv"> + <cd:command name="math" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="m" category="mathematics" file="math-ini.mkiv"> + <cd:command name="m" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="definemathcommand" category="mathematics" file="math-ini.mkiv"> + <cd:command name="definemathcommand" category="mathematics" level="style" 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" file="math-ini.mkiv"> + <cd:command name="mathcommand" generated="yes" variant="example" category="mathematics" file="math-ini.mkiv"> <cd:sequence> <cd:variable value="mathcommand"/> </cd:sequence> @@ -174,7 +174,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathcommand" file="math-ini.mkiv"> + <cd:command name="mathcommand" category="mathematics" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -198,19 +198,19 @@ </cd:arguments> </cd:command> - <cd:command name="mathfunction" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mathfunction" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunction" category="mathematics" file="math-ini.mkiv"> + <cd:command name="mfunction" file="math-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mfunctionlabeltext" file="math-ini.mkiv"> + <cd:command name="mfunctionlabeltext" level="system" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -266,147 +266,147 @@ </cd:arguments> </cd:command> - <cd:command name="mathstyle" type="environment" begin="push" end="pop" file="math-ini.mkiv"/> + <cd:command name="mathstyle" type="environment" begin="push" end="pop" level="system" file="math-ini.mkiv"/> - <cd:command name="usemathstyleparameter" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" level="system" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="usemathstyleparameter" type="environment" file="math-ini.mkiv"> + <cd:command name="usemathstyleparameter" type="environment" level="system" file="math-ini.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="mathtext" file="math-ini.mkiv"> + <cd:command name="mathtext" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtexttf" file="math-ini.mkiv"> + <cd:command name="mathtexttf" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextit" file="math-ini.mkiv"> + <cd:command name="mathtextit" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextsl" file="math-ini.mkiv"> + <cd:command name="mathtextsl" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbf" file="math-ini.mkiv"> + <cd:command name="mathtextbf" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbi" file="math-ini.mkiv"> + <cd:command name="mathtextbi" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathtextbs" file="math-ini.mkiv"> + <cd:command name="mathtextbs" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathword" file="math-ini.mkiv"> + <cd:command name="mathword" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordtf" file="math-ini.mkiv"> + <cd:command name="mathwordtf" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordit" file="math-ini.mkiv"> + <cd:command name="mathwordit" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordsl" file="math-ini.mkiv"> + <cd:command name="mathwordsl" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbf" file="math-ini.mkiv"> + <cd:command name="mathwordbf" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbi" file="math-ini.mkiv"> + <cd:command name="mathwordbi" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathwordbs" file="math-ini.mkiv"> + <cd:command name="mathwordbs" category="mathematics" level="document" file="math-ini.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="mathrm" file="math-ini.mkiv"/> + <cd:command name="mathrm" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathss" file="math-ini.mkiv"/> + <cd:command name="mathss" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathtt" file="math-ini.mkiv"/> + <cd:command name="mathtt" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathtf" file="math-ini.mkiv"/> + <cd:command name="mathtf" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathsl" file="math-ini.mkiv"/> + <cd:command name="mathsl" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathit" file="math-ini.mkiv"/> + <cd:command name="mathit" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathbf" file="math-ini.mkiv"/> + <cd:command name="mathbf" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathbi" file="math-ini.mkiv"/> + <cd:command name="mathbi" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathbs" file="math-ini.mkiv"/> + <cd:command name="mathbs" category="mathematics" level="document" file="math-ini.mkiv"/> - <cd:command name="mathitalic" file="math-ini.mkiv"/> + <cd:command name="mathitalic" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathupright" file="math-ini.mkiv"/> + <cd:command name="mathupright" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathdefault" file="math-ini.mkiv"/> + <cd:command name="mathdefault" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathscript" file="math-ini.mkiv"/> + <cd:command name="mathscript" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathfraktur" file="math-ini.mkiv"/> + <cd:command name="mathfraktur" category="mathematics" file="math-ini.mkiv"/> - <cd:command name="mathblackboard" file="math-ini.mkiv"/> + <cd:command name="mathblackboard" category="mathematics" file="math-ini.mkiv"/> <cd:command name="displaymath" file="supp-mat.mkiv"> <cd:arguments> @@ -480,4 +480,12 @@ </cd:arguments> </cd:command> + <cd:command name="autointegral" file="math-del.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml index 5caa1348c..bae4d3d50 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" file="math-ali.mkiv"> + <cd:command name="definemathalignment" category="mathematics" level="style" 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" file="math-ali.mkiv"> + <cd:command name="setupmathalignment" category="mathematics" level="style" file="math-ali.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="mathalignment" type="environment" generated="yes" variant="instance" file="math-ali.mkiv"> + <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathalignment"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml index 8a27c4413..75f4040d1 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" file="math-ali.mkiv"> + <cd:command name="definemathcases" category="mathematics" level="style" 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" file="math-ali.mkiv"> + <cd:command name="setupmathcases" category="mathematics" level="style" 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" file="math-ali.mkiv"> + <cd:command name="mathcases" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathcases"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-mathfence.xml b/tex/context/interface/mkiv/i-mathfence.xml index 9676e2a37..d73241053 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" file="math-fen.mkiv"> + <cd:command name="definemathfence" category="mathematics" level="style" 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" file="math-fen.mkiv"> + <cd:command name="setupmathfence" category="mathematics" level="style" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,15 +41,15 @@ <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="factor"> - <cd:constant type="auto" default="yes"/> <cd:constant type="none"/> - <cd:constant type="number"/> + <cd:constant type="auto"/> + <cd:constant type="cd:number"/> </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="fence" generated="yes" variant="example" file="math-fen.mkiv"> + <cd:command name="fence" generated="yes" variant="example" category="mathematics" level="document" file="math-fen.mkiv"> <cd:sequence> <cd:variable value="fence"/> </cd:sequence> @@ -58,147 +58,147 @@ </cd:arguments> </cd:command> - <cd:command name="fenced" file="math-fen.mkiv"> + <cd:command name="fenced" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fence" file="math-fen.mkiv"/> + <cd:command name="fence" category="mathematics" level="document" file="math-fen.mkiv"/> - <cd:command name="left" file="math-fen.mkiv"> + <cd:command name="left" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="middle" file="math-fen.mkiv"> + <cd:command name="middle" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="right" file="math-fen.mkiv"> + <cd:command name="right" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="big" file="math-fen.mkiv"> + <cd:command name="big" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Big" file="math-fen.mkiv"> + <cd:command name="Big" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigg" file="math-fen.mkiv"> + <cd:command name="bigg" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigg" file="math-fen.mkiv"> + <cd:command name="Bigg" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigl" file="math-fen.mkiv"> + <cd:command name="bigl" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigm" file="math-fen.mkiv"> + <cd:command name="bigm" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="bigr" file="math-fen.mkiv"> + <cd:command name="bigr" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigl" file="math-fen.mkiv"> + <cd:command name="Bigl" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigm" file="math-fen.mkiv"> + <cd:command name="Bigm" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Bigr" file="math-fen.mkiv"> + <cd:command name="Bigr" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggl" file="math-fen.mkiv"> + <cd:command name="biggl" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggm" file="math-fen.mkiv"> + <cd:command name="biggm" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="biggr" file="math-fen.mkiv"> + <cd:command name="biggr" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggl" file="math-fen.mkiv"> + <cd:command name="Biggl" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggm" file="math-fen.mkiv"> + <cd:command name="Biggm" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="Biggr" file="math-fen.mkiv"> + <cd:command name="Biggr" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> </cd:arguments> </cd:command> - <cd:command name="lfence" file="math-fen.mkiv"> + <cd:command name="lfence" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="mfence" file="math-fen.mkiv"> + <cd:command name="mfence" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="rfence" file="math-fen.mkiv"> + <cd:command name="rfence" category="mathematics" level="document" file="math-fen.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> </cd:arguments> </cd:command> - <cd:command name="checkedfences" type="environment" file="math-fen.mkiv"/> + <cd:command name="checkedfences" category="mathematics" type="environment" file="math-fen.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml index 50f99205a..50a0f0e1e 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" file="math-ali.mkiv"> + <cd:command name="definemathmatrix" category="mathematics" level="style" 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" file="math-ali.mkiv"> + <cd:command name="setupmathmatrix" category="mathematics" level="style" 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" file="math-ali.mkiv"> + <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" category="mathematics" level="document" file="math-ali.mkiv"> <cd:sequence> <cd:instance value="mathmatrix"/> </cd:sequence> @@ -87,7 +87,7 @@ --> - <cd:command name="matrices" type="environment" file="math-ali.mkiv"> + <cd:command name="matrices" type="environment" category="mathematics" level="document" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmathmatrix"/> @@ -95,24 +95,24 @@ </cd:arguments> </cd:command> - <cd:command name="intertext" type="environment" file="math-ali.mkiv"/> + <cd:command name="intertext" type="environment" category="mathematics" level="document" file="math-ali.mkiv"/> - <cd:command name="intertext" file="math-ali.mkiv"> + <cd:command name="intertext" category="mathematics" level="document" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="substack" type="environment" file="math-ali.mkiv"/> + <cd:command name="substack" type="environment" category="mathematics" level="document" file="math-ali.mkiv"/> - <cd:command name="overset" file="math-ali.mkiv"> + <cd:command name="overset" category="mathematics" level="document" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="underset" file="math-ali.mkiv"> + <cd:command name="underset" category="mathematics" level="document" file="math-ali.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-mathornament.xml b/tex/context/interface/mkiv/i-mathornament.xml index cfa7b0d18..9aad469ed 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" file="math-rad.mkvi"> + <cd:command name="definemathornament" category="mathematics" level="style" 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" file="math-rad.mkvi"> + <cd:command name="setupmathornament" category="mathematics" level="style" 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" file="math-rad.mkvi"> + <cd:command name="mathornament" generated="yes" variant="example" category="mathematics" level="document" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathornament"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-mathradical.xml b/tex/context/interface/mkiv/i-mathradical.xml index e3ab9a6aa..5fa4876f4 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" file="math-rad.mkvi"> + <cd:command name="definemathradical" category="mathematics" level="style" 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" file="math-rad.mkvi"> + <cd:command name="setupmathradical" category="mathematics" level="style" 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" file="math-rad.mkvi"> + <cd:command name="mathradical" generated="yes" variant="example" category="mathematics" level="document" file="math-rad.mkvi"> <cd:sequence> <cd:variable value="mathradical"/> </cd:sequence> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="sqrt" file="math-rad.mkvi"> + <cd:command name="sqrt" category="mathematics" level="document" file="math-rad.mkvi"> <cd:arguments> <cd:resolve name="keyword-text-optional"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-mathstackers.xml b/tex/context/interface/mkiv/i-mathstackers.xml index ef8d9d5e3..7a130f74c 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" file="math-stc.mkvi"> + <cd:command name="definemathstackers" category="mathematics" level="style" 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" file="math-stc.mkvi"> + <cd:command name="setupmathstackers" category="mathematics" level="style" 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" file="math-sty.mkvi"> + <cd:command name="definemathextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="reverse"/> @@ -120,7 +120,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathextensible"/> </cd:sequence> @@ -136,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathoverextensible" file="math-sty.mkvi"> + <cd:command name="definemathoverextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathoverextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathoverextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathoverextensible"/> </cd:sequence> @@ -156,7 +156,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathunderextensible" file="math-sty.mkvi"> + <cd:command name="definemathunderextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bottom"/> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathunderextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathunderextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathunderextensible"/> </cd:sequence> @@ -176,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathdoubleextensible" file="math-sty.mkvi"> + <cd:command name="definemathdoubleextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="both"/> @@ -188,7 +188,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathdoubleextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathdoubleextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathdoubleextensible"/> </cd:sequence> @@ -197,7 +197,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathovertextextensible" file="math-sty.mkvi"> + <cd:command name="definemathovertextextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bothtext"/> @@ -207,7 +207,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathovertextextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathovertextextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathovertextextensible"/> </cd:sequence> @@ -217,7 +217,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathundertextextensible" file="math-sty.mkvi"> + <cd:command name="definemathundertextextensible" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="bothtext"/> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathundertextextensible" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathundertextextensible" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathundertextextensible"/> </cd:sequence> @@ -237,7 +237,7 @@ </cd:arguments> </cd:command> - <cd:command name="definemathtriplet" file="math-sty.mkvi"> + <cd:command name="definemathtriplet" category="mathematics" file="math-sty.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -245,7 +245,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathtriplet" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathtriplet" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathtriplet"/> </cd:sequence> @@ -257,7 +257,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathtriplet" file="math-stc.mkvi"> + <cd:command name="mathtriplet" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text-optional"/> @@ -266,7 +266,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrel" file="math-stc.mkvi"> + <cd:command name="xrel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -281,7 +281,7 @@ </cd:arguments> </cd:command> - <cd:command name="xequal" file="math-stc.mkvi"> + <cd:command name="xequal" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -296,7 +296,7 @@ </cd:arguments> </cd:command> - <cd:command name="xleftarrow" file="math-stc.mkvi"> + <cd:command name="xleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -311,7 +311,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrightarrow" file="math-stc.mkvi"> + <cd:command name="xrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -326,7 +326,7 @@ </cd:arguments> </cd:command> - <cd:command name="xleftrightarrow" file="math-stc.mkvi"> + <cd:command name="xleftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -341,7 +341,7 @@ </cd:arguments> </cd:command> - <cd:command name="xLeftarrow" file="math-stc.mkvi"> + <cd:command name="xLeftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -356,7 +356,7 @@ </cd:arguments> </cd:command> - <cd:command name="xRightarrow" file="math-stc.mkvi"> + <cd:command name="xRightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -371,7 +371,7 @@ </cd:arguments> </cd:command> - <cd:command name="xLeftrightarrow" file="math-stc.mkvi"> + <cd:command name="xLeftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -386,7 +386,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtwoheadleftarrow" file="math-stc.mkvi"> + <cd:command name="xtwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -401,7 +401,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtwoheadrightarrow" file="math-stc.mkvi"> + <cd:command name="xtwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -416,7 +416,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmapsto" file="math-stc.mkvi"> + <cd:command name="xmapsto" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -431,7 +431,7 @@ </cd:arguments> </cd:command> - <cd:command name="xhookleftarrow" file="math-stc.mkvi"> + <cd:command name="xhookleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -446,7 +446,7 @@ </cd:arguments> </cd:command> - <cd:command name="xhookrightarrow" file="math-stc.mkvi"> + <cd:command name="xhookrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -461,7 +461,7 @@ </cd:arguments> </cd:command> - <cd:command name="xleftharpoondown" file="math-stc.mkvi"> + <cd:command name="xleftharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="xleftharpoonup" file="math-stc.mkvi"> + <cd:command name="xleftharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -491,7 +491,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrightharpoondown" file="math-stc.mkvi"> + <cd:command name="xrightharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -506,7 +506,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrightharpoonup" file="math-stc.mkvi"> + <cd:command name="xrightharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -521,7 +521,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrightoverleftarrow" file="math-stc.mkvi"> + <cd:command name="xrightoverleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -536,7 +536,7 @@ </cd:arguments> </cd:command> - <cd:command name="xleftrightharpoons" file="math-stc.mkvi"> + <cd:command name="xleftrightharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -551,7 +551,7 @@ </cd:arguments> </cd:command> - <cd:command name="xrightleftharpoons" file="math-stc.mkvi"> + <cd:command name="xrightleftharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -566,7 +566,7 @@ </cd:arguments> </cd:command> - <cd:command name="xtriplerel" file="math-stc.mkvi"> + <cd:command name="xtriplerel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -581,7 +581,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrel" file="math-stc.mkvi"> + <cd:command name="mrel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -596,7 +596,7 @@ </cd:arguments> </cd:command> - <cd:command name="mequal" file="math-stc.mkvi"> + <cd:command name="mequal" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -611,7 +611,7 @@ </cd:arguments> </cd:command> - <cd:command name="mleftarrow" file="math-stc.mkvi"> + <cd:command name="mleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -626,7 +626,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrightarrow" file="math-stc.mkvi"> + <cd:command name="mrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -641,7 +641,7 @@ </cd:arguments> </cd:command> - <cd:command name="mleftrightarrow" file="math-stc.mkvi"> + <cd:command name="mleftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -656,7 +656,7 @@ </cd:arguments> </cd:command> - <cd:command name="mLeftarrow" file="math-stc.mkvi"> + <cd:command name="mLeftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -671,7 +671,7 @@ </cd:arguments> </cd:command> - <cd:command name="mRightarrow" file="math-stc.mkvi"> + <cd:command name="mRightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -686,7 +686,7 @@ </cd:arguments> </cd:command> - <cd:command name="mLeftrightarrow" file="math-stc.mkvi"> + <cd:command name="mLeftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -701,7 +701,7 @@ </cd:arguments> </cd:command> - <cd:command name="mtwoheadleftarrow" file="math-stc.mkvi"> + <cd:command name="mtwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -716,7 +716,7 @@ </cd:arguments> </cd:command> - <cd:command name="mtwoheadrightarrow" file="math-stc.mkvi"> + <cd:command name="mtwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -731,7 +731,7 @@ </cd:arguments> </cd:command> - <cd:command name="mmapsto" file="math-stc.mkvi"> + <cd:command name="mmapsto" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -746,7 +746,7 @@ </cd:arguments> </cd:command> - <cd:command name="mhookleftarrow" file="math-stc.mkvi"> + <cd:command name="mhookleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -761,7 +761,7 @@ </cd:arguments> </cd:command> - <cd:command name="mhookrightarrow" file="math-stc.mkvi"> + <cd:command name="mhookrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -776,7 +776,7 @@ </cd:arguments> </cd:command> - <cd:command name="mleftharpoondown" file="math-stc.mkvi"> + <cd:command name="mleftharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -791,7 +791,7 @@ </cd:arguments> </cd:command> - <cd:command name="mleftharpoonup" file="math-stc.mkvi"> + <cd:command name="mleftharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -806,7 +806,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrightharpoondown" file="math-stc.mkvi"> + <cd:command name="mrightharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -821,7 +821,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrightharpoonup" file="math-stc.mkvi"> + <cd:command name="mrightharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -836,7 +836,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrightoverleftarrow" file="math-stc.mkvi"> + <cd:command name="mrightoverleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -851,7 +851,7 @@ </cd:arguments> </cd:command> - <cd:command name="mleftrightharpoons" file="math-stc.mkvi"> + <cd:command name="mleftrightharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -866,7 +866,7 @@ </cd:arguments> </cd:command> - <cd:command name="mrightleftharpoons" file="math-stc.mkvi"> + <cd:command name="mrightleftharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -881,7 +881,7 @@ </cd:arguments> </cd:command> - <cd:command name="mtriplerel" file="math-stc.mkvi"> + <cd:command name="mtriplerel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -896,7 +896,7 @@ </cd:arguments> </cd:command> - <cd:command name="eleftarrowfill" file="math-stc.mkvi"> + <cd:command name="eleftarrowfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -911,7 +911,7 @@ </cd:arguments> </cd:command> - <cd:command name="erightarrowfill" file="math-stc.mkvi"> + <cd:command name="erightarrowfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -926,7 +926,7 @@ </cd:arguments> </cd:command> - <cd:command name="eleftrightarrowfill" file="math-stc.mkvi"> + <cd:command name="eleftrightarrowfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -941,7 +941,7 @@ </cd:arguments> </cd:command> - <cd:command name="etwoheadrightarrowfill" file="math-stc.mkvi"> + <cd:command name="etwoheadrightarrowfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -956,7 +956,7 @@ </cd:arguments> </cd:command> - <cd:command name="eleftharpoondownfill" file="math-stc.mkvi"> + <cd:command name="eleftharpoondownfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -971,7 +971,7 @@ </cd:arguments> </cd:command> - <cd:command name="eleftharpoonupfill" file="math-stc.mkvi"> + <cd:command name="eleftharpoonupfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -986,7 +986,7 @@ </cd:arguments> </cd:command> - <cd:command name="erightharpoondownfill" file="math-stc.mkvi"> + <cd:command name="erightharpoondownfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1001,7 +1001,7 @@ </cd:arguments> </cd:command> - <cd:command name="erightharpoonupfill" file="math-stc.mkvi"> + <cd:command name="erightharpoonupfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1016,7 +1016,7 @@ </cd:arguments> </cd:command> - <cd:command name="eoverbarfill" file="math-stc.mkvi"> + <cd:command name="eoverbarfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1031,7 +1031,7 @@ </cd:arguments> </cd:command> - <cd:command name="eunderbarfill" file="math-stc.mkvi"> + <cd:command name="eunderbarfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1046,7 +1046,7 @@ </cd:arguments> </cd:command> - <cd:command name="eoverbracefill" file="math-stc.mkvi"> + <cd:command name="eoverbracefill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1061,7 +1061,7 @@ </cd:arguments> </cd:command> - <cd:command name="eunderbracefill" file="math-stc.mkvi"> + <cd:command name="eunderbracefill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1076,7 +1076,7 @@ </cd:arguments> </cd:command> - <cd:command name="eoverparentfill" file="math-stc.mkvi"> + <cd:command name="eoverparentfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1091,7 +1091,7 @@ </cd:arguments> </cd:command> - <cd:command name="eunderparentfill" file="math-stc.mkvi"> + <cd:command name="eunderparentfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1106,7 +1106,7 @@ </cd:arguments> </cd:command> - <cd:command name="eoverbracketfill" file="math-stc.mkvi"> + <cd:command name="eoverbracketfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1121,7 +1121,7 @@ </cd:arguments> </cd:command> - <cd:command name="eunderbracketfill" file="math-stc.mkvi"> + <cd:command name="eunderbracketfill" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1136,7 +1136,7 @@ </cd:arguments> </cd:command> - <cd:command name="trel" file="math-stc.mkvi"> + <cd:command name="trel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1151,7 +1151,7 @@ </cd:arguments> </cd:command> - <cd:command name="tequal" file="math-stc.mkvi"> + <cd:command name="tequal" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1166,7 +1166,7 @@ </cd:arguments> </cd:command> - <cd:command name="tmapsto" file="math-stc.mkvi"> + <cd:command name="tmapsto" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1181,7 +1181,7 @@ </cd:arguments> </cd:command> - <cd:command name="tleftarrow" file="math-stc.mkvi"> + <cd:command name="tleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1196,7 +1196,7 @@ </cd:arguments> </cd:command> - <cd:command name="trightarrow" file="math-stc.mkvi"> + <cd:command name="trightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1211,7 +1211,7 @@ </cd:arguments> </cd:command> - <cd:command name="tleftrightarrow" file="math-stc.mkvi"> + <cd:command name="tleftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1226,7 +1226,7 @@ </cd:arguments> </cd:command> - <cd:command name="tLeftarrow" file="math-stc.mkvi"> + <cd:command name="tLeftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1241,7 +1241,7 @@ </cd:arguments> </cd:command> - <cd:command name="tRightarrow" file="math-stc.mkvi"> + <cd:command name="tRightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1256,7 +1256,7 @@ </cd:arguments> </cd:command> - <cd:command name="tLeftrightarrow" file="math-stc.mkvi"> + <cd:command name="tLeftrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1271,7 +1271,7 @@ </cd:arguments> </cd:command> - <cd:command name="ttwoheadleftarrow" file="math-stc.mkvi"> + <cd:command name="ttwoheadleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1286,7 +1286,7 @@ </cd:arguments> </cd:command> - <cd:command name="ttwoheadrightarrow" file="math-stc.mkvi"> + <cd:command name="ttwoheadrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1301,7 +1301,7 @@ </cd:arguments> </cd:command> - <cd:command name="thookleftarrow" file="math-stc.mkvi"> + <cd:command name="thookleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1316,7 +1316,7 @@ </cd:arguments> </cd:command> - <cd:command name="thookrightarrow" file="math-stc.mkvi"> + <cd:command name="thookrightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1331,7 +1331,7 @@ </cd:arguments> </cd:command> - <cd:command name="tleftharpoondown" file="math-stc.mkvi"> + <cd:command name="tleftharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1346,7 +1346,7 @@ </cd:arguments> </cd:command> - <cd:command name="tleftharpoonup" file="math-stc.mkvi"> + <cd:command name="tleftharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1361,7 +1361,7 @@ </cd:arguments> </cd:command> - <cd:command name="trightharpoondown" file="math-stc.mkvi"> + <cd:command name="trightharpoondown" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1376,7 +1376,7 @@ </cd:arguments> </cd:command> - <cd:command name="trightharpoonup" file="math-stc.mkvi"> + <cd:command name="trightharpoonup" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1391,7 +1391,7 @@ </cd:arguments> </cd:command> - <cd:command name="trightoverleftarrow" file="math-stc.mkvi"> + <cd:command name="trightoverleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1406,7 +1406,7 @@ </cd:arguments> </cd:command> - <cd:command name="tleftrightharpoons" file="math-stc.mkvi"> + <cd:command name="tleftrightharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1421,7 +1421,7 @@ </cd:arguments> </cd:command> - <cd:command name="trightleftharpoons" file="math-stc.mkvi"> + <cd:command name="trightleftharpoons" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1436,7 +1436,7 @@ </cd:arguments> </cd:command> - <cd:command name="ttriplerel" file="math-stc.mkvi"> + <cd:command name="ttriplerel" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1451,7 +1451,7 @@ </cd:arguments> </cd:command> - <cd:command name="cleftarrow" file="math-stc.mkvi"> + <cd:command name="cleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1466,7 +1466,7 @@ </cd:arguments> </cd:command> - <cd:command name="crightarrow" file="math-stc.mkvi"> + <cd:command name="crightarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1481,7 +1481,7 @@ </cd:arguments> </cd:command> - <cd:command name="crightoverleftarrow" file="math-stc.mkvi"> + <cd:command name="crightoverleftarrow" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <!-- <cd:keywords optional="yes"> @@ -1496,260 +1496,260 @@ </cd:arguments> </cd:command> - <cd:command name="underleftarrow" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <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" file="math-stc.mkvi"> + <cd:command name="overbracketunderbracket" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="overbartext" file="math-stc.mkvi"> + <cd:command name="overbartext" 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" file="math-stc.mkvi"> + <cd:command name="overbracetext" 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" file="math-stc.mkvi"> + <cd:command name="overparenttext" 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" file="math-stc.mkvi"> + <cd:command name="overbrackettext" 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" file="math-stc.mkvi"> + <cd:command name="underbartext" 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" file="math-stc.mkvi"> + <cd:command name="underbracetext" 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" file="math-stc.mkvi"> + <cd:command name="underparenttext" 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" file="math-stc.mkvi"> + <cd:command name="underbrackettext" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1762,7 +1762,7 @@ <cd:command name="triplebond" file="math-stc.mkvi"/> - <cd:command name="definemathunstacked" file="math-stc.mkvi"> + <cd:command name="definemathunstacked" category="mathematics" file="math-stc.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="wide"/> @@ -1772,7 +1772,7 @@ </cd:arguments> </cd:command> - <cd:command name="mathunstacked" generated="yes" variant="example" file="math-stc.mkvi"> + <cd:command name="mathunstacked" generated="yes" variant="example" category="mathematics" file="math-stc.mkvi"> <cd:sequence> <cd:variable value="mathunstacked"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-metapost.xml b/tex/context/interface/mkiv/i-metapost.xml index 00250f787..b12479a22 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" file="meta-ini.mkiv"> + <cd:command name="MPdefinitions" type="environment" category="graphics" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPextensions" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPextensions" type="environment" category="graphics" level="style" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPinitializations" type="environment" file="meta-ini.mkiv"/> + <cd:command name="MPinitializations" type="environment" category="graphics" level="style" file="meta-ini.mkiv"/> - <cd:command name="MPinclusions" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" type="environment" category="graphics" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="MPinclusions" category="graphics" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="defineMPinstance" category="graphics" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="setupMPinstance" category="graphics" level="style" 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" file="meta-ini.mkiv"> + <cd:command name="resetMPinstance" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="processMPfigurefile" file="meta-ini.mkiv"> + <cd:command name="processMPfigurefile" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="MPdrawing" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" type="environment" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="-"/> @@ -103,25 +103,25 @@ </cd:arguments> </cd:command> - <cd:command name="resetMPdrawing" file="meta-ini.mkiv"/> + <cd:command name="resetMPdrawing" category="graphics" file="meta-ini.mkiv"/> - <cd:command name="getMPdrawing" file="meta-ini.mkiv"/> + <cd:command name="getMPdrawing" category="graphics" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" type="environment" begin="push" end="pop" file="meta-ini.mkiv"/> + <cd:command name="MPdrawing" type="environment" begin="push" end="pop" category="graphics" file="meta-ini.mkiv"/> - <cd:command name="MPdrawing" file="meta-ini.mkiv"> + <cd:command name="MPdrawing" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPclip" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPclip" type="environment" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPfontsizehskip" file="meta-ini.mkiv"> + <cd:command name="MPfontsizehskip" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-font"/> </cd:arguments> @@ -174,14 +174,14 @@ </cd:arguments> </cd:command> - <cd:command name="uniqueMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPgraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="useMPgraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="usableMPgraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="reuseMPgraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="reusableMPgraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="uniqueMPpagegraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="processMPbuffer" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="runMPbuffer" file="meta-ini.mkiv"> + <cd:command name="runMPbuffer" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPenvironment" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPenvironment" type="environment" category="graphics" 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" file="meta-ini.mkiv"/> + <cd:command name="resetMPenvironment" category="graphics" file="meta-ini.mkiv"/> - <cd:command name="useMPenvironmentbuffer" file="meta-ini.mkiv"> + <cd:command name="useMPenvironmentbuffer" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPcode" type="environment" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="MPcode" file="meta-ini.mkiv"> + <cd:command name="MPcode" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="MPrun" type="environment" file="meta-ini.mkiv"> + <cd:command name="MPrun" type="environment" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="useMPrun" file="meta-ini.mkiv"> + <cd:command name="useMPrun" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="useMPlibrary" file="meta-ini.mkiv"> + <cd:command name="useMPlibrary" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="setMPtext" file="meta-ini.mkiv"> + <cd:command name="setMPtext" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="MPtext" file="meta-ini.mkiv"> + <cd:command name="MPtext" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPstring" file="meta-ini.mkiv"> + <cd:command name="MPstring" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="MPbetex" file="meta-ini.mkiv"> + <cd:command name="MPbetex" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseMPgraphic" file="meta-ini.mkiv"> + <cd:command name="doifelseMPgraphic" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="doifMPgraphicelse" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="staticMPfigure" type="environment" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="staticMPgraphic" type="environment" file="meta-ini.mkiv"> + <cd:command name="staticMPgraphic" type="environment" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="usestaticMPfigure" category="graphics" 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" file="meta-ini.mkiv"> + <cd:command name="setupMPgraphics" category="graphics" file="meta-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="color"> diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml index 6d0142536..447e0e761 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" file="page-mix.mkiv"> + <cd:command name="definemixedcolumns" level="style" 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" file="page-mix.mkiv"> + <cd:command name="setupmixedcolumns" level="style" 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" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" level="document" 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" file="page-mix.mkiv"> + <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" level="document" file="page-mix.mkiv"> <cd:sequence> <cd:instance value="mixedcolumns"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-modes.xml b/tex/context/interface/mkiv/i-modes.xml index 0a0abc7c7..b1e80c7dd 100644 --- a/tex/context/interface/mkiv/i-modes.xml +++ b/tex/context/interface/mkiv/i-modes.xml @@ -4,37 +4,37 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="newmode" file="core-env.mkiv"> + <cd:command name="newmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setmode" file="core-env.mkiv"> + <cd:command name="setmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetmode" file="core-env.mkiv"> + <cd:command name="resetmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsystemmode" file="core-env.mkiv"> + <cd:command name="newsystemmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setsystemmode" file="core-env.mkiv"> + <cd:command name="setsystemmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsystemmode" file="core-env.mkiv"> + <cd:command name="resetsystemmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -58,19 +58,19 @@ </cd:arguments> </cd:command> - <cd:command name="globalpreventmode" file="core-env.mkiv"> + <cd:command name="globalpreventmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globalenablemode" file="core-env.mkiv"> + <cd:command name="globalenablemode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="globaldisablemode" file="core-env.mkiv"> + <cd:command name="globaldisablemode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> @@ -87,7 +87,7 @@ </cd:arguments> </cd:command> - <cd:command name="booleanmodevalue" file="core-env.mkiv"> + <cd:command name="booleanmodevalue" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -189,25 +189,25 @@ </cd:arguments> </cd:command> - <cd:command name="pushmode" file="core-env.mkiv"> + <cd:command name="pushmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="popmode" file="core-env.mkiv"> + <cd:command name="popmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="pushsystemmode" file="core-env.mkiv"> + <cd:command name="pushsystemmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="popsystemmode" file="core-env.mkiv"> + <cd:command name="popsystemmode" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-modules.xml b/tex/context/interface/mkiv/i-modules.xml index d8eda7fba..2916090f8 100644 --- a/tex/context/interface/mkiv/i-modules.xml +++ b/tex/context/interface/mkiv/i-modules.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="usemodule" file="file-mod.mkvi"> + <cd:command name="usemodule" level="style" file="file-mod.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="m"/> @@ -62,19 +62,19 @@ </cd:arguments> </cd:command> - <cd:command name="module" type="environment" file="file-mod.mkvi"> + <cd:command name="module" type="environment" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="module" type="environment" variant="string" file="file-mod.mkvi"> + <cd:command name="module" type="environment" variant="string" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="setupmodule" file="file-mod.mkvi"> + <cd:command name="setupmodule" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file-optional"/> <cd:assignments list="yes"> @@ -89,35 +89,35 @@ </cd:arguments> </cd:command> - <cd:command name="moduleparameter" file="file-mod.mkvi"> + <cd:command name="moduleparameter" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="currentmoduleparameter" file="file-mod.mkvi"> + <cd:command name="currentmoduleparameter" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="moduletestsection" type="environment" file="file-mod.mkvi"/> + <cd:command name="moduletestsection" type="environment" level="system" file="file-mod.mkvi"/> - <cd:command name="fetchruntinecommand" file="file-mod.mkvi"> + <cd:command name="fetchruntinecommand" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="luaenvironment" file="file-mod.mkvi"> + <cd:command name="luaenvironment" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="string-file"/> </cd:arguments> </cd:command> - <cd:command name="useluamodule" file="file-mod.mkvi"> + <cd:command name="useluamodule" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml index 25e40fd08..0486dd4b6 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" file="spac-hor.mkiv"> + <cd:command name="definenarrower" level="style" 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" file="spac-hor.mkiv"> + <cd:command name="setupnarrower" level="style" 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" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" level="document" 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" file="spac-hor.mkiv"> + <cd:command name="narrower" type="environment" generated="yes" variant="example" level="document" 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" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" level="document" 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" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="name" level="document" 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" file="spac-hor.mkiv"> + <cd:command name="narrow" type="environment" variant="assignment" level="document" file="spac-hor.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnarrower"/> diff --git a/tex/context/interface/mkiv/i-naturaltable.xml b/tex/context/interface/mkiv/i-naturaltable.xml index e18be1b79..535b2be55 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" file="tabl-ntb.mkiv"> + <cd:command name="setupTABLE" category="tables" level="style" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TD" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TR" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TC" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TX" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TY" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TH" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TN" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" begin="b" end="e" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="defineTABLEsetup" category="tables" level="style" 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" file="tabl-ntb.mkiv"> + <cd:command name="TDs" type="environment" begin="b" end="e" 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" file="tabl-ntb.mkiv"> + <cd:command name="TRs" type="environment" begin="b" end="e" category="tables" file="tabl-ntb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="TABLE" type="environment" file="tabl-ntb.mkiv"> + <cd:command name="TABLE" type="environment" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEhead" type="environment" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEnext" type="environment" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEbody" type="environment" category="tables" level="document" 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" file="tabl-ntb.mkiv"> + <cd:command name="TABLEfoot" type="environment" category="tables" level="document" file="tabl-ntb.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupTABLE"/> diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index a7ecb5401..339bb58ad 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -18,7 +18,7 @@ --> - <cd:command name="setupnotation" file="strc-not.mkvi"> + <cd:command name="setupnotation" category="notes" level="style" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -183,7 +183,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnotations" file="strc-not.mkvi"> + <cd:command name="setupnotations" category="notes" level="style" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,7 +192,7 @@ </cd:arguments> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -204,7 +204,7 @@ </cd:instances> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="instance" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -216,7 +216,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance" category="notes" level="document" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -229,7 +229,7 @@ </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance:assignment" category="notes" level="document" file="strc-not.mkvi"> <cd:sequence> <cd:instance value="note"/> </cd:sequence> @@ -241,7 +241,7 @@ </cd:instances> </cd:command> - <cd:command name="definenote" file="strc-not.mkvi"> + <cd:command name="definenote" category="notes" level="style" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -251,7 +251,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupnote" file="strc-not.mkvi"> + <cd:command name="setupnote" category="notes" level="style" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -381,12 +381,20 @@ <cd:parameter name="anchor"> <cd:constant type="next"/> </cd:parameter> + <!-- begin root only --> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <!-- end root only --> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupnotes" file="strc-not.mkvi"> + <cd:command name="setupnotes" category="notes" level="style" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -395,7 +403,7 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" file="strc-not.mkvi"> + <cd:command name="setnote" category="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -403,14 +411,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" variant="assignment" file="strc-not.mkvi"> + <cd:command name="setnote" variant="assignment" category="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" file="strc-not.mkvi"> + <cd:command name="setnotetext" category="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -418,14 +426,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="assignment" file="strc-not.mkvi"> + <cd:command name="setnotetext" variant="assignment" category="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" file="strc-not.mkvi"> + <cd:command name="placenotes" category="notes" level="document" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:assignments list="yes" optional="yes"> @@ -434,13 +442,13 @@ </cd:arguments> </cd:command> - <cd:command name="localnotes" type="environment" file="strc-not.mkvi"> + <cd:command name="localnotes" type="environment" category="notes" level="document" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="placelocalnotes" file="strc-not.mkvi"> + <cd:command name="placelocalnotes" category="notes" level="document" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -449,11 +457,11 @@ </cd:arguments> </cd:command> - <cd:command name="postponenotes" file="strc-not.mkvi"/> + <cd:command name="postponenotes" category="notes" file="strc-not.mkvi"/> - <cd:command name="flushnotes" file="strc-not.mkvi"/> + <cd:command name="flushnotes" category="notes" file="strc-not.mkvi"/> - <cd:command name="doifelsenoteonsamepage" file="strc-not.mkvi"> + <cd:command name="doifelsenoteonsamepage" category="notes" level="system" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -461,7 +469,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnoteonsamepageelse" file="strc-not.mkvi"> + <cd:command name="doifnoteonsamepageelse" category="notes" level="system" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -469,21 +477,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotescollected" file="strc-not.mkvi"> + <cd:command name="doifnotescollected" category="notes" level="system" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="notesymbol" file="strc-not.mkvi"> + <cd:command name="notesymbol" category="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" file="strc-not.mkvi"> + <cd:command name="note" category="notes" level="document" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-reference"/> @@ -519,20 +527,20 @@ --> - <cd:command name="footnotetext" file="strc-not.mkvi"> + <cd:command name="footnotetext" category="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" file="strc-not.mkvi"> + <cd:command name="footnotetext" variant="assignment" category="notes" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="placefootnotes" file="strc-not.mkvi"> + <cd:command name="placefootnotes" category="notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -540,9 +548,9 @@ </cd:arguments> </cd:command> - <cd:command name="localfootnotes" type="environment" file="strc-not.mkvi"/> + <cd:command name="localfootnotes" type="environment" category="notes" file="strc-not.mkvi"/> - <cd:command name="placelocalfootnotes" file="strc-not.mkvi"> + <cd:command name="placelocalfootnotes" category="notes" file="strc-not.mkvi"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupnote"/> @@ -579,7 +587,7 @@ --> - <cd:command name="definelinenote" file="strc-lnt.mkvi"> + <cd:command name="definelinenote" category="notes" level="style" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -589,7 +597,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinenote" file="strc-lnt.mkvi"> + <cd:command name="setuplinenote" category="notes" level="style" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -613,7 +621,7 @@ </cd:arguments> </cd:command> - <cd:command name="linenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="linenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> <cd:sequence> <cd:instance value="linenote"/> </cd:sequence> @@ -625,7 +633,7 @@ </cd:instances> </cd:command> - <cd:command name="startlinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="start"/> <cd:instance value="linenote"/> @@ -639,7 +647,7 @@ </cd:instances> </cd:command> - <cd:command name="stoplinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" generated="yes" variant="instance" category="notes" level="document" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="stop"/> <cd:instance value="linenote"/> @@ -652,14 +660,14 @@ </cd:instances> </cd:command> - <cd:command name="fromlinenote" file="strc-lnt.mkvi"> + <cd:command name="fromlinenote" category="notes" level="document" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="tolinenote" file="strc-lnt.mkvi"> + <cd:command name="tolinenote" category="notes" level="document" file="strc-lnt.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-object.xml b/tex/context/interface/mkiv/i-object.xml index 6e105b377..9520ee567 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" file="pack-obj.mkiv"> + <cd:command name="ifinobject" level="system" 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" file="pack-obj.mkiv"/> + <cd:command name="objectmargin" level="system" file="pack-obj.mkiv"/> - <cd:command name="objectwidth" file="pack-obj.mkiv"/> + <cd:command name="objectwidth" level="system" file="pack-obj.mkiv"/> - <cd:command name="objectheight" file="pack-obj.mkiv"/> + <cd:command name="objectheight" level="system" file="pack-obj.mkiv"/> - <cd:command name="objectdepth" file="pack-obj.mkiv"/> + <cd:command name="objectdepth" level="system" file="pack-obj.mkiv"/> - <cd:command name="setreferencedobject" file="pack-obj.mkiv"> + <cd:command name="setreferencedobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="settightreferencedobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="setunreferencedobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="settightunreferencedobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="setobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="settightobject" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="getobject" level="system" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getobjectdimensions" file="pack-obj.mkiv"> + <cd:command name="getobjectdimensions" level="system" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="defaultobjectreference" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectreference" level="system" file="pack-obj.mkiv"/> - <cd:command name="defaultobjectpage" file="pack-obj.mkiv"/> + <cd:command name="defaultobjectpage" level="system" file="pack-obj.mkiv"/> - <cd:command name="doifelseobjectfound" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectfound" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="doifobjectfoundelse" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="doifelseobjectreferencefound" level="system" 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" file="pack-obj.mkiv"> + <cd:command name="doifobjectreferencefoundelse" level="system" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-offset.xml b/tex/context/interface/mkiv/i-offset.xml index fc759673d..a645d746c 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" file="pack-box.mkiv"> + <cd:command name="setupoffsetbox" level="style" 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" file="pack-box.mkiv"> + <cd:command name="setupoffset" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupoffsetbox"/> @@ -62,7 +62,7 @@ </cd:arguments> </cd:command> - <cd:command name="offset" file="pack-box.mkiv"> + <cd:command name="offset" level="document" file="pack-box.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupoffset"/> diff --git a/tex/context/interface/mkiv/i-opposite.xml b/tex/context/interface/mkiv/i-opposite.xml index 497b6d502..5ee68f94d 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" file="page-fac.mkiv"> + <cd:command name="setupoppositeplacing" level="style" 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" file="page-fac.mkiv"/> + <cd:command name="opposite" type="environment" level="document" file="page-fac.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-ornament.xml b/tex/context/interface/mkiv/i-ornament.xml index f4ae43a6d..d2e8d3f1c 100644 --- a/tex/context/interface/mkiv/i-ornament.xml +++ b/tex/context/interface/mkiv/i-ornament.xml @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineornament" variant="collector" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="collector" level="style" 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" file="pack-box.mkiv"> + <cd:command name="defineornament" variant="layer" level="style" file="pack-box.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-output.xml b/tex/context/interface/mkiv/i-output.xml index bf719ca6a..f336c07a4 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" file="page-otr.mkvi"> + <cd:command name="defineoutputroutine" level="system" 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" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" level="system" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -25,21 +25,21 @@ </cd:arguments> </cd:command> - <cd:command name="setupoutputroutine" variant="name" file="page-otr.mkvi"> + <cd:command name="setupoutputroutine" variant="name" level="system" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineoutputroutinecommand" file="page-otr.mkvi"> + <cd:command name="defineoutputroutinecommand" level="system" file="page-otr.mkvi"> <cd:arguments> <cd:resolve name="keyword-key-list"/> </cd:arguments> </cd:command> - <cd:command name="traceoutputroutines" file="page-otr.mkvi"/> + <cd:command name="traceoutputroutines" level="system" file="page-otr.mkvi"/> - <cd:command name="installoutputroutine" file="page-otr.mkvi"> + <cd:command name="installoutputroutine" level="system" file="page-otr.mkvi"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> diff --git a/tex/context/interface/mkiv/i-overlay.xml b/tex/context/interface/mkiv/i-overlay.xml index 91e9f4873..d2ce6d524 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" file="pack-lyr.mkiv"> + <cd:command name="defineoverlay" level="style" file="pack-lyr.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> <cd:resolve name="keyword-name-optional"/> @@ -26,7 +26,7 @@ <cd:command name="overlaylinewidth" file="pack-rul.mkiv"/> - <cd:command name="doifelseoverlay" file="pack-rul.mkiv"> + <cd:command name="doifelseoverlay" level="system" 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" file="pack-rul.mkiv"> + <cd:command name="doifoverlayelse" level="system" file="pack-rul.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-pagebreak.xml b/tex/context/interface/mkiv/i-pagebreak.xml index 917e4a718..f9e38d9fc 100644 --- a/tex/context/interface/mkiv/i-pagebreak.xml +++ b/tex/context/interface/mkiv/i-pagebreak.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagebreak" file="page-brk.mkiv"> + <cd:command name="definepagebreak" level="style" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagebreak" file="page-brk.mkiv"> + <cd:command name="pagebreak" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:resolve name="value-pagebreak"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="page" file="page-brk.mkiv"> + <cd:command name="page" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="pagebreak"/> @@ -30,7 +30,7 @@ </cd:arguments> </cd:command> - <cd:command name="definecolumnbreak" file="page-brk.mkiv"> + <cd:command name="definecolumnbreak" level="style" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords list="yes"> @@ -39,7 +39,7 @@ </cd:arguments> </cd:command> - <cd:command name="columnbreak" file="page-brk.mkiv"> + <cd:command name="columnbreak" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:resolve name="value-columnbreak"/> @@ -48,7 +48,7 @@ </cd:arguments> </cd:command> - <cd:command name="column" file="page-brk.mkiv"> + <cd:command name="column" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="columnbreak"/> @@ -56,7 +56,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagechecker" file="page-brk.mkiv"> + <cd:command name="definepagechecker" level="style" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagechecker" file="page-brk.mkiv"> + <cd:command name="setuppagechecker" level="style" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="checkpage" file="page-brk.mkiv"> + <cd:command name="checkpage" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="testpage" file="page-brk.mkiv"> + <cd:command name="testpage" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> @@ -125,7 +125,7 @@ </cd:arguments> </cd:command> - <cd:command name="testcolumn" file="page-brk.mkiv"> + <cd:command name="testcolumn" level="document" file="page-brk.mkiv"> <cd:arguments> <cd:resolve name="keyword-number"/> <cd:resolve name="keyword-dimension-optional"/> diff --git a/tex/context/interface/mkiv/i-pagecomment.xml b/tex/context/interface/mkiv/i-pagecomment.xml index 26678a4a0..211f08d3d 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" file="page-com.mkiv"> + <cd:command name="setuppagecomment" level="style" file="page-com.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="location"> diff --git a/tex/context/interface/mkiv/i-pagefigure.xml b/tex/context/interface/mkiv/i-pagefigure.xml index 5f776e835..8f76ace34 100644 --- a/tex/context/interface/mkiv/i-pagefigure.xml +++ b/tex/context/interface/mkiv/i-pagefigure.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pagefigure" file="page-app.mkiv"> + <cd:command name="pagefigure" category="graphics" level="document" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagefigure" type="environment" file="page-app.mkiv"> + <cd:command name="pagefigure" type="environment" category="graphics" level="document" file="page-app.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index 21f906a0c..d7aee5291 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" file="page-cst.mkiv"> + <cd:command name="definepagegrid" level="style" 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" file="page-cst.mkiv"> + <cd:command name="setuppagegrid" level="style" 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" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" 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" file="page-cst.mkiv"> + <cd:command name="pagegrid" type="environment" level="document" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagegridspan" file="page-cst.mkiv"> + <cd:command name="definepagegridspan" level="style" 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" file="page-cst.mkiv"> + <cd:command name="setuppagegridspan" level="style" 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" file="page-cst.mkiv"> + <cd:command name="pagegridspan" type="environment" level="document" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -144,7 +144,7 @@ </cd:arguments> </cd:command> - <cd:command name="definepagegridarea" file="page-cst.mkiv"> + <cd:command name="definepagegridarea" level="style" 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" file="page-cst.mkiv"> + <cd:command name="setuppagegridarea" level="style" 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" file="page-cst.mkiv"> + <cd:command name="setuppagegridareatext" level="style" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuppagegridlines" file="page-cst.mkiv"> + <cd:command name="setuppagegridlines" level="style" 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" file="page-cst.mkiv"> + <cd:command name="setuppagegridstart" level="style" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> diff --git a/tex/context/interface/mkiv/i-pageinjection.xml b/tex/context/interface/mkiv/i-pageinjection.xml index c069dbc8b..735d44e28 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" file="page-inj.mkvi"> + <cd:command name="definepageinjection" level="style" 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" file="page-inj.mkvi"> + <cd:command name="setuppageinjection" level="style" 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" file="page-inj.mkvi"> + <cd:command name="pageinjection" level="document" 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" file="page-inj.mkvi"> + <cd:command name="pageinjection" variant="assignment" level="document" 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" file="page-inj.mkvi"> + <cd:command name="definepageinjectionalternative" level="style" 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" file="page-inj.mkvi"> + <cd:command name="setuppageinjectionalternative" level="style" file="page-inj.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-pagelayout.xml b/tex/context/interface/mkiv/i-pagelayout.xml index dd4bc27f5..2e5ca2085 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" file="page-plg.mkiv"> + <cd:command name="pagearea" 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" file="page-plg.mkiv"> + <cd:command name="pagelayout" type="environment" category="layout" file="page-plg.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="page"/> diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml index d17df9425..830bdb351 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" file="strc-pag.mkiv"> + <cd:command name="setuprealpagenumber" 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" file="strc-pag.mkiv"> + <cd:command name="setupuserpagenumber" category="counter" level="style" 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" file="strc-pag.mkiv"> + <cd:command name="setupsubpagenumber" category="counter" level="style" 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" file="strc-pag.mkiv"> + <cd:command name="setuppagenumber" category="counter" level="style" file="strc-pag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:inherit name="setupuserpagenumber"/> @@ -52,13 +52,13 @@ --> - <cd:command name="resetuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetuserpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="resetpagenumber" file="strc-pag.mkiv"/> + <cd:command name="resetpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="setuppagenumbering" file="strc-pag.mkiv"> + <cd:command name="setuppagenumbering" category="counter" level="style" 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" file="strc-pag.mkiv"/> + <cd:command name="firstrealpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="firstuserpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="firstsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastrealpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastuserpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="lastsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevrealpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevuserpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prevsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextrealpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextuserpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="nextsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstrealpage" file="strc-pag.mkiv"/> + <cd:command name="firstrealpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstuserpage" file="strc-pag.mkiv"/> + <cd:command name="firstuserpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="firstsubpage" file="strc-pag.mkiv"/> + <cd:command name="firstsubpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevrealpage" file="strc-pag.mkiv"/> + <cd:command name="prevrealpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevuserpage" file="strc-pag.mkiv"/> + <cd:command name="prevuserpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prevsubpage" file="strc-pag.mkiv"/> + <cd:command name="prevsubpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextrealpage" file="strc-pag.mkiv"/> + <cd:command name="nextrealpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextuserpage" file="strc-pag.mkiv"/> + <cd:command name="nextuserpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="nextsubpage" file="strc-pag.mkiv"/> + <cd:command name="nextsubpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastrealpage" file="strc-pag.mkiv"/> + <cd:command name="lastrealpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastuserpage" file="strc-pag.mkiv"/> + <cd:command name="lastuserpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="lastsubpage" file="strc-pag.mkiv"/> + <cd:command name="lastsubpage" category="counter" file="strc-pag.mkiv"/> - <cd:command name="realpagenumber" file="strc-pag.mkiv"/> + <cd:command name="realpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="userpagenumber" file="strc-pag.mkiv"/> + <cd:command name="userpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="subpagenumber" file="strc-pag.mkiv"/> + <cd:command name="subpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="pagenumber" file="strc-pag.mkiv"/> + <cd:command name="pagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="prefixedpagenumber" file="strc-pag.mkiv"/> + <cd:command name="prefixedpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementpagenumber" file="strc-pag.mkiv"/> + <cd:command name="incrementpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="incrementsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="incrementsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementpagenumber" file="strc-pag.mkiv"/> + <cd:command name="decrementpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="decrementsubpagenumber" file="strc-pag.mkiv"/> + <cd:command name="decrementsubpagenumber" category="counter" file="strc-pag.mkiv"/> - <cd:command name="completepagenumber" file="strc-pag.mkiv"/> + <cd:command name="completepagenumber" category="counter" level="style" file="strc-pag.mkiv"/> - <cd:command name="placepagenumber" file="strc-pag.mkiv"/> + <cd:command name="placepagenumber" category="counter" level="style" file="strc-pag.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-pageselection.xml b/tex/context/interface/mkiv/i-pageselection.xml index 99d55bb8a..90d419bbc 100644 --- a/tex/context/interface/mkiv/i-pageselection.xml +++ b/tex/context/interface/mkiv/i-pageselection.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="insertpages" file="page-sel.mkvi"> + <cd:command name="insertpages" level="document" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:resolve name="keyword-number-list-optional"/> @@ -22,7 +22,7 @@ </cd:arguments> </cd:command> - <cd:command name="filterpages" file="page-sel.mkvi"> + <cd:command name="filterpages" level="document" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:keywords list="yes"> @@ -45,7 +45,7 @@ </cd:arguments> </cd:command> - <cd:command name="copypages" file="page-sel.mkvi"> + <cd:command name="copypages" level="document" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -66,7 +66,7 @@ </cd:arguments> </cd:command> - <cd:command name="combinepages" file="page-sel.mkvi"> + <cd:command name="combinepages" level="document" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> @@ -132,7 +132,7 @@ </cd:arguments> </cd:command> - <cd:command name="slicepages" file="page-sel.mkvi"> + <cd:command name="slicepages" level="document" file="page-sel.mkvi"> <cd:arguments> <cd:resolve name="keyword-file"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-pageshift.xml b/tex/context/interface/mkiv/i-pageshift.xml index 630a5af6c..779304d6c 100644 --- a/tex/context/interface/mkiv/i-pageshift.xml +++ b/tex/context/interface/mkiv/i-pageshift.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepageshift" file="page-imp.mkiv"> + <cd:command name="definepageshift" level="style" file="page-imp.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> @@ -15,7 +15,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppageshift" file="page-imp.mkiv"> + <cd:command name="setuppageshift" level="style" file="page-imp.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="page" default="yes"/> diff --git a/tex/context/interface/mkiv/i-pagestate.xml b/tex/context/interface/mkiv/i-pagestate.xml index 82396d000..e9b18bfed 100644 --- a/tex/context/interface/mkiv/i-pagestate.xml +++ b/tex/context/interface/mkiv/i-pagestate.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagestate" file="core-dat.mkiv"> + <cd:command name="definepagestate" level="system" file="core-dat.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="setuppagestate" file="core-dat.mkiv"> + <cd:command name="setuppagestate" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -26,7 +26,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestate" file="core-dat.mkiv"> + <cd:command name="setpagestate" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords optional="yes"> @@ -36,7 +36,7 @@ </cd:arguments> </cd:command> - <cd:command name="pagestaterealpage" file="core-dat.mkiv"> + <cd:command name="pagestaterealpage" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -46,7 +46,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpagestaterealpageno" file="core-dat.mkiv"> + <cd:command name="setpagestaterealpageno" level="system" file="core-dat.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml index bbab966ba..8001742e0 100644 --- a/tex/context/interface/mkiv/i-pairedbox.xml +++ b/tex/context/interface/mkiv/i-pairedbox.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepairedbox" file="pack-com.mkiv"> + <cd:command name="definepairedbox" level="style" 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="setuppairedbox" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" level="style" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -70,7 +70,7 @@ </cd:arguments> </cd:command> - <cd:command name="placepairedbox" file="pack-com.mkiv"> + <cd:command name="placepairedbox" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -81,7 +81,7 @@ </cd:arguments> </cd:command> - <cd:command name="placepairedbox" type="environment" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" level="document" file="pack-com.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -90,7 +90,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuppairedbox" generated="yes" variant="instance" file="pack-com.mkiv"> + <cd:command name="setuppairedbox" generated="yes" variant="instance" level="style" file="pack-com.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="pairedbox"/> @@ -105,7 +105,7 @@ </cd:instances> </cd:command> - <cd:command name="placepairedbox" generated="yes" variant="instance" file="pack-com.mkiv"> + <cd:command name="placepairedbox" generated="yes" variant="instance" level="document" file="pack-com.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> @@ -122,7 +122,7 @@ </cd:instances> </cd:command> - <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" file="pack-com.mkiv"> + <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" level="document" file="pack-com.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="pairedbox"/> diff --git a/tex/context/interface/mkiv/i-papersize.xml b/tex/context/interface/mkiv/i-papersize.xml index dab5e03bd..05bfb8a33 100644 --- a/tex/context/interface/mkiv/i-papersize.xml +++ b/tex/context/interface/mkiv/i-papersize.xml @@ -102,7 +102,7 @@ --> - <cd:command name="definepapersize" file="page-lay.mkiv"> + <cd:command name="definepapersize" level="style" 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" file="page-lay.mkiv"> + <cd:command name="definepapersize" variant="name" level="style" 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" file="page-lay.mkiv"> + <cd:command name="setuppapersize" variant="name" level="style" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="reset"/> @@ -197,7 +197,7 @@ --> - <cd:command name="setuppapersize" file="page-lay.mkiv"> + <cd:command name="setuppapersize" level="style" 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" file="page-lay.mkiv"> + <cd:command name="setuppaper" level="style" 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" file="page-lay.mkiv"> + <cd:command name="adaptpapersize" level="style" file="page-lay.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:inherit name="setuppapersize"/> diff --git a/tex/context/interface/mkiv/i-paragraph.xml b/tex/context/interface/mkiv/i-paragraph.xml index 8a88f72fc..1729e26d2 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" file="strc-tag.mkiv"> + <cd:command name="defineparagraph" level="style" 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" file="strc-tag.mkiv"> + <cd:command name="setupparagraph" level="style" 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" file="strc-tag.mkiv"> + <cd:command name="paragraph" type="environment" level="document" 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" file="strc-tag.mkiv"> + <cd:command name="par" type="environment" level="document" 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" file="strc-tag.mkiv"/> + <cd:command name="par" type="environment" begin="b" end ="e" level="document" file="strc-tag.mkiv"/> - <cd:command name="setupparagraphintro" file="spac-par.mkiv"> + <cd:command name="setupparagraphintro" level="style" file="spac-par.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="reset"/> diff --git a/tex/context/interface/mkiv/i-paragraphnumber.xml b/tex/context/interface/mkiv/i-paragraphnumber.xml index f3588f87c..615e95597 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" file="page-par.mkiv"> + <cd:command name="setupparagraphnumbering" level="style" file="page-par.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> diff --git a/tex/context/interface/mkiv/i-paragraphs.xml b/tex/context/interface/mkiv/i-paragraphs.xml index 99092f668..6cbbcd5b7 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" file="tabl-mis.mkiv"> + <cd:command name="defineparagraphs" level="style" 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" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" level="style" 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" file="tabl-mis.mkiv"> + <cd:command name="setupparagraphs" variant="assignment" level="style" 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" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" level="document" file="tabl-mis.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="nextparagraphs" file="tabl-mis.mkiv"/> + <cd:command name="nextparagraphs" level="document" file="tabl-mis.mkiv"/> - <cd:command name="paragraphs" type="environment" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" type="environment" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphs" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="paragraphs" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> <cd:sequence> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="nextparagraphs" generated="yes" variant="example" file="tabl-mis.mkiv"> + <cd:command name="nextparagraphs" generated="yes" variant="example" level="document" file="tabl-mis.mkiv"> <cd:sequence> <cd:string value="next"/> <cd:variable value="paragraphs"/> </cd:sequence> </cd:command> - <cd:command name="paragraphscell" type="environment" file="tabl-mis.mkiv"/> + <cd:command name="paragraphscell" type="environment" level="document" file="tabl-mis.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-parallel.xml b/tex/context/interface/mkiv/i-parallel.xml index ed1c50c86..c8d177fcd 100644 --- a/tex/context/interface/mkiv/i-parallel.xml +++ b/tex/context/interface/mkiv/i-parallel.xml @@ -4,14 +4,14 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineparallel" file="buff-par.mkvi"> + <cd:command name="defineparallel" level="style" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="setupparallel" file="buff-par.mkvi"> + <cd:command name="setupparallel" level="style" file="buff-par.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-list"/> diff --git a/tex/context/interface/mkiv/i-parbuilder.xml b/tex/context/interface/mkiv/i-parbuilder.xml index b7bf37417..70879546d 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" file="typo-bld.mkiv"> + <cd:command name="defineparbuilder" level="system" file="typo-bld.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="parbuilder" type="environment" file="typo-bld.mkiv"> + <cd:command name="parbuilder" type="environment" level="system" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> @@ -21,7 +21,7 @@ </cd:arguments> </cd:command> - <cd:command name="setmainparbuilder" file="typo-bld.mkiv"> + <cd:command name="setmainparbuilder" level="system" file="typo-bld.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="default"/> diff --git a/tex/context/interface/mkiv/i-pdf.xml b/tex/context/interface/mkiv/i-pdf.xml index 5b4eab2c3..e84f0a3aa 100644 --- a/tex/context/interface/mkiv/i-pdf.xml +++ b/tex/context/interface/mkiv/i-pdf.xml @@ -4,95 +4,95 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="pdfbackendsetcatalog" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcatalog" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetinfo" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetinfo" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetname" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetname" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageattribute" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageattribute" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpagesattribute" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpagesattribute" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpageresource" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpageresource" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetextgstate" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetextgstate" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetcolorspace" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetcolorspace" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetpattern" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetpattern" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendsetshade" file="back-pdf.mkiv"> + <cd:command name="pdfbackendsetshade" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="pdfbackendcurrentresources" file="back-pdf.mkiv"/> + <cd:command name="pdfbackendcurrentresources" level="system" file="back-pdf.mkiv"/> - <cd:command name="pdfcolor" file="back-pdf.mkiv"> + <cd:command name="pdfcolor" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="PDFcolor" file="back-pdf.mkiv"> + <cd:command name="PDFcolor" level="system" file="back-pdf.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="TransparencyHack" file="back-pdf.mkiv"/> + <cd:command name="TransparencyHack" level="system" file="back-pdf.mkiv"/> - <cd:command name="lastpredefinedsymbol" file="pack-obj.mkiv"/> + <cd:command name="lastpredefinedsymbol" level="system" file="pack-obj.mkiv"/> - <cd:command name="predefinesymbol" file="pack-obj.mkiv"> + <cd:command name="predefinesymbol" level="system" file="pack-obj.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> @@ -116,7 +116,7 @@ <cd:command name="positive" type="environment" file="attr-neg.mkiv"/> - <cd:command name="setuppagetransitions" file="scrn-pag.mkvi"> + <cd:command name="setuppagetransitions" level="style" file="scrn-pag.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="reset" default="yes"/> diff --git a/tex/context/interface/mkiv/i-periods.xml b/tex/context/interface/mkiv/i-periods.xml index 9114ae550..ec471faf6 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" file="enco-ini.mkiv"> + <cd:command name="setupperiods" level="style" 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" file="enco-ini.mkiv"> + <cd:command name="periods" level="document" file="enco-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="periods" variant="assignment" file="enco-ini.mkiv"> + <cd:command name="periods" variant="assignment" level="document" 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" file="enco-ini.mkiv"/> + <cd:command name="unknown" level="document" file="enco-ini.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-position.xml b/tex/context/interface/mkiv/i-position.xml index e43ee58ef..145a4eb8c 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" file="anch-pgr.mkiv"> + <cd:command name="doifpositionaction" level="system" 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" file="anch-pgr.mkiv"> + <cd:command name="doifelsepositionaction" level="system" 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" file="anch-pgr.mkiv"> + <cd:command name="doifpositionactionelse" level="system" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="dopositionaction" file="anch-pgr.mkiv"> + <cd:command name="dopositionaction" level="system" file="anch-pgr.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -321,19 +321,19 @@ </cd:arguments> </cd:command> - <cd:command name="setpositiononly" file="anch-pos.mkiv"> + <cd:command name="setpositiononly" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setposition" file="anch-pos.mkiv"> + <cd:command name="setposition" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setpositiondata" file="anch-pos.mkiv"> + <cd:command name="setpositiondata" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> @@ -342,7 +342,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionbox" file="anch-pos.mkiv"> + <cd:command name="setpositionbox" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> @@ -350,13 +350,13 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionstrut" file="anch-pos.mkiv"> + <cd:command name="setpositionstrut" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setpositiondataplus" file="anch-pos.mkiv"> + <cd:command name="setpositiondataplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-dimension"/> @@ -368,7 +368,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpositionplus" file="anch-pos.mkiv"> + <cd:command name="setpositionplus" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces" list="yes"> @@ -379,14 +379,14 @@ </cd:arguments> </cd:command> - <cd:command name="copyposition" file="anch-pos.mkiv"> + <cd:command name="copyposition" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifposition" file="anch-pos.mkiv"> + <cd:command name="doifposition" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifelseposition" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifpositionelse" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositiononpage" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifpositiononpageelse" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -428,33 +428,33 @@ </cd:arguments> </cd:command> - <cd:command name="xypos" file="anch-pos.mkiv"> + <cd:command name="xypos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="hpos" file="anch-pos.mkiv"> + <cd:command name="hpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vpos" file="anch-pos.mkiv"> + <cd:command name="vpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="bpos" file="anch-pos.mkiv"> + <cd:command name="bpos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="epos" file="anch-pos.mkiv"> + <cd:command name="epos" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> @@ -463,11 +463,11 @@ <cd:command name="tracepositions" file="anch-pos.mkiv"/> - <cd:command name="enableparpositions" file="anch-pos.mkiv"/> + <cd:command name="enableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="disableparpositions" file="anch-pos.mkiv"/> + <cd:command name="disableparpositions" level="system" file="anch-pos.mkiv"/> - <cd:command name="doifelseoverlapping" file="anch-pos.mkiv"> + <cd:command name="doifelseoverlapping" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifoverlappingelse" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonsamepage" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonsamepageelse" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsonthispage" level="system" 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" file="anch-pos.mkiv"> + <cd:command name="doifpositionsonthispageelse" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -517,14 +517,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsepositionsused" file="anch-pos.mkiv"> + <cd:command name="doifelsepositionsused" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifpositionsusedelse" file="anch-pos.mkiv"> + <cd:command name="doifpositionsusedelse" level="system" file="anch-pos.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/tex/context/interface/mkiv/i-positionbar.xml b/tex/context/interface/mkiv/i-positionbar.xml index 481540691..6777227b0 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" file="pack-bar.mkiv"> + <cd:command name="setuppositionbar" level="style" file="pack-bar.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="style"> diff --git a/tex/context/interface/mkiv/i-positioning.xml b/tex/context/interface/mkiv/i-positioning.xml index 98898c7cc..9a91eecd5 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" file="pack-pos.mkiv"> + <cd:command name="definepositioning" level="style" 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" file="pack-pos.mkiv"> + <cd:command name="setuppositioning" level="style" 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" file="pack-pos.mkiv"> + <cd:command name="positioning" type="environment" level="document" 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" file="pack-pos.mkiv"> + <cd:command name="position" level="document" file="pack-pos.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuppositioning"/> diff --git a/tex/context/interface/mkiv/i-postponing.xml b/tex/context/interface/mkiv/i-postponing.xml index 619a77552..477359626 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" file="page-pst.mkiv"> + <cd:command name="postponing" type="environment" level="document" file="page-pst.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:number" prefix="cd:sign" method="none"/> diff --git a/tex/context/interface/mkiv/i-processor.xml b/tex/context/interface/mkiv/i-processor.xml index 0c313c77a..8dc9a28c4 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" file="typo-prc.mkvi"> + <cd:command name="defineprocessor" level="style" 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" file="typo-prc.mkvi"> + <cd:command name="setupprocessor" level="style" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="applyprocessor" file="typo-prc.mkvi"> + <cd:command name="applyprocessor" level="system" file="typo-prc.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-profile.xml b/tex/context/interface/mkiv/i-profile.xml index a3fe7ea6e..90027ffd3 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" file="spac-prf.mkvi"> + <cd:command name="defineprofile" level="style" 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" file="spac-prf.mkvi"> + <cd:command name="setupprofile" level="style" file="spac-prf.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -58,13 +58,13 @@ <cd:command name="resetprofile" file="spac-prf.mkvi"/> - <cd:command name="useprofileparameter" file="spac-prf.mkvi"> + <cd:command name="useprofileparameter" level="system" file="spac-prf.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="profiledbox" file="spac-prf.mkvi"> + <cd:command name="profiledbox" level="system" 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" file="spac-prf.mkvi"> + <cd:command name="profilegivenbox" level="system" file="spac-prf.mkvi"> <cd:arguments> <cd:keywords delimiters="braces" optional="yes"> <cd:constant type="none"/> diff --git a/tex/context/interface/mkiv/i-publication.xml b/tex/context/interface/mkiv/i-publication.xml index 83cb6c2c8..d981c4acd 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" file="publ-ini.mkiv"> + <cd:command name="btxrenderingdefinitions" type="environment" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxdefinitionfile" file="publ-ini.mkiv"> + <cd:command name="loadbtxdefinitionfile" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="loadbtxreplacementfile" file="publ-ini.mkiv"> + <cd:command name="loadbtxreplacementfile" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="definebtx" file="publ-ini.mkiv"> + <cd:command name="definebtx" 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" file="publ-ini.mkiv"> + <cd:command name="setupbtx" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -114,19 +114,19 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtx" variant="name" file="publ-ini.mkiv"> + <cd:command name="setupbtx" variant="name" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="usingbtxspecification" type="environment" file="publ-ini.mkiv"> + <cd:command name="usingbtxspecification" type="environment" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definebtxdataset" file="publ-ini.mkiv"> + <cd:command name="definebtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -136,7 +136,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxdataset" file="publ-ini.mkiv"> + <cd:command name="setupbtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxregister" file="publ-ini.mkiv"> + <cd:command name="definebtxregister" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -157,7 +157,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxregister" file="publ-ini.mkiv"> + <cd:command name="setupbtxregister" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -194,7 +194,7 @@ </cd:arguments> </cd:command> - <cd:command name="definebtxrendering" file="publ-ini.mkiv"> + <cd:command name="definebtxrendering" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -204,7 +204,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupbtxrendering" file="publ-ini.mkiv"> + <cd:command name="setupbtxrendering" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -293,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="usebtxdataset" file="publ-ini.mkiv"> + <cd:command name="usebtxdataset" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file"/> @@ -305,7 +305,7 @@ </cd:arguments> </cd:command> - <cd:command name="publication" type="environment" file="publ-ini.mkiv"> + <cd:command name="publication" type="environment" category="bibliography" file="publ-ini.mkiv"> <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="setupbtxlist" file="publ-ini.mkiv"> + <cd:command name="setupbtxlist" category="bibliography" level="style" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes"> @@ -334,7 +334,7 @@ </cd:arguments> </cd:command> - <cd:command name="completebtxrendering" file="publ-ini.mkiv"> + <cd:command name="completebtxrendering" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -343,7 +343,7 @@ </cd:arguments> </cd:command> - <cd:command name="placebtxrendering" file="publ-ini.mkiv"> + <cd:command name="placebtxrendering" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -352,7 +352,7 @@ </cd:arguments> </cd:command> - <cd:command name="completelistofpublications" file="publ-ini.mkiv"> + <cd:command name="completelistofpublications" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -361,7 +361,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofpublications" file="publ-ini.mkiv"> + <cd:command name="placelistofpublications" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -370,319 +370,319 @@ </cd:arguments> </cd:command> - <cd:command name="btxhybridcite" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" 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" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="btxhybridcite" variant="direct" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="btxlistcitation" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" 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" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="btxlistcitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" 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" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="btxtextcitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" 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" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="btxalwayscitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="bthiddencitation" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="listcitation" file="publ-ini.mkiv"> + <cd:command name="listcitation" 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" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="listcitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="listcite" 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" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="listcite" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="textcitation" 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" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="textcitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="textcite" 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" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="textcite" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscitation" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscite" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="userdata" 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" file="publ-ini.mkiv"> + <cd:command name="alwayscite" variant="alternative" 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" file="publ-ini.mkiv"> + <cd:command name="hiddencitation" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="hiddencite" file="publ-ini.mkiv"> + <cd:command name="hiddencite" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="citation" file="publ-ini.mkiv"> + <cd:command name="citation" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="citation" variant="userdata" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="citation" variant="alternative" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="citation" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="cite" file="publ-ini.mkiv"> + <cd:command name="cite" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="cite" variant="userdata" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="cite" variant="alternative" category="bibliography" level="document" 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" file="publ-ini.mkiv"> + <cd:command name="cite" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" file="publ-ini.mkiv"> + <cd:command name="nocitation" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocitation" variant="direct" file="publ-ini.mkiv"> + <cd:command name="nocitation" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" file="publ-ini.mkiv"> + <cd:command name="nocite" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="nocite" variant="direct" file="publ-ini.mkiv"> + <cd:command name="nocite" variant="direct" category="bibliography" level="document" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-reference"/> </cd:arguments> </cd:command> - <cd:command name="savebtxdataset" file="publ-ini.mkiv"> + <cd:command name="savebtxdataset" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-file-optional"/> @@ -717,67 +717,67 @@ </cd:arguments> </cd:command> - <cd:command name="placecitation" file="publ-ini.mkiv"> + <cd:command name="placecitation" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="usebtxdefinitions" file="publ-ini.mkiv"> + <cd:command name="usebtxdefinitions" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxfield" file="publ-ini.mkiv"> + <cd:command name="btxfield" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdetail" file="publ-ini.mkiv"> + <cd:command name="btxdetail" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxflush" file="publ-ini.mkiv"> + <cd:command name="btxflush" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxdirect" file="publ-ini.mkiv"> + <cd:command name="btxdirect" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldname" file="publ-ini.mkiv"> + <cd:command name="btxfieldname" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfieldtype" file="publ-ini.mkiv"> + <cd:command name="btxfieldtype" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundname" file="publ-ini.mkiv"> + <cd:command name="btxfoundname" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxfoundtype" file="publ-ini.mkiv"> + <cd:command name="btxfoundtype" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> </cd:arguments> </cd:command> - <cd:command name="btxauthorfield" file="publ-ini.mkiv"> + <cd:command name="btxauthorfield" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="initials"/> @@ -789,7 +789,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifelse" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -797,27 +797,27 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoif" file="publ-ini.mkiv"> + <cd:command name="btxdoif" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifnot" file="publ-ini.mkiv"> + <cd:command name="btxdoifnot" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="btxsetup" file="publ-ini.mkiv"> + <cd:command name="btxsetup" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameaspreviouschecked" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameaspreviouschecked" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -829,7 +829,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsesameasprevious" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsesameasprevious" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -837,7 +837,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifelsecombiinlist" file="publ-ini.mkiv"> + <cd:command name="btxdoifelsecombiinlist" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -846,7 +846,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouscheckedelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouscheckedelse" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="always"/> @@ -858,7 +858,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifsameaspreviouselse" file="publ-ini.mkiv"> + <cd:command name="btxdoifsameaspreviouselse" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxfield"/> <cd:resolve name="argument-true"/> @@ -866,7 +866,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifcombiinlistelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifcombiinlistelse" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -875,13 +875,13 @@ </cd:arguments> </cd:command> - <cd:command name="currentbtxuservariable" file="publ-ini.mkiv"> + <cd:command name="currentbtxuservariable" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="btxdoifelseuservariable" file="publ-ini.mkiv"> + <cd:command name="btxdoifelseuservariable" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -889,7 +889,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxdoifuservariableelse" file="publ-ini.mkiv"> + <cd:command name="btxdoifuservariableelse" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -897,14 +897,14 @@ </cd:arguments> </cd:command> - <cd:command name="btxremapauthor" file="publ-ini.mkiv"> + <cd:command name="btxremapauthor" 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" file="publ-ini.mkiv"> + <cd:command name="btxflushauthor" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="num"/> @@ -917,39 +917,39 @@ </cd:arguments> </cd:command> - <cd:command name="btxflushsuffix" file="publ-ini.mkiv"/> + <cd:command name="btxflushsuffix" category="bibliography" file="publ-ini.mkiv"/> - <cd:command name="btxflushauthorname" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorname" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormal" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormal" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthornormalshort" file="publ-ini.mkiv"> + <cd:command name="btxflushauthornormalshort" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinverted" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinverted" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxflushauthorinvertedshort" file="publ-ini.mkiv"> + <cd:command name="btxflushauthorinvertedshort" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-btxauthor"/> </cd:arguments> </cd:command> - <cd:command name="btxsingularplural" file="publ-ini.mkiv"> + <cd:command name="btxsingularplural" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -961,7 +961,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxsingularorplural" file="publ-ini.mkiv"> + <cd:command name="btxsingularorplural" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="editor"/> @@ -973,7 +973,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxoneorrange" file="publ-ini.mkiv"> + <cd:command name="btxoneorrange" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -984,7 +984,7 @@ </cd:arguments> </cd:command> - <cd:command name="btxfirstofrange" file="publ-ini.mkiv"> + <cd:command name="btxfirstofrange" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="volume"/> @@ -993,38 +993,38 @@ </cd:arguments> </cd:command> - <cd:command name="btxloadjournalist" file="publ-ini.mkiv"> + <cd:command name="btxloadjournalist" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxsavejournalist" file="publ-ini.mkiv"> + <cd:command name="btxsavejournalist" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="btxaddjournal" file="publ-ini.mkiv"> + <cd:command name="btxaddjournal" 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" file="publ-ini.mkiv"> + <cd:command name="btxexpandedjournal" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="btxabbreviatedjournal" file="publ-ini.mkiv"> + <cd:command name="btxabbreviatedjournal" category="bibliography" file="publ-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1040,13 +1040,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetfields" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetfields" variant="argument" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1062,13 +1062,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetcompleteness" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetcompleteness" variant="argument" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="specification"> @@ -1084,19 +1084,19 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxdatasetauthors" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxdatasetauthors" variant="argument" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxhashedauthors" file="publ-tra.mkiv"> + <cd:command name="showbtxhashedauthors" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxfields" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:parameter name="rotation"> @@ -1109,13 +1109,13 @@ </cd:arguments> </cd:command> - <cd:command name="showbtxfields" variant="argument" file="publ-tra.mkiv"> + <cd:command name="showbtxfields" variant="argument" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="showbtxtables" file="publ-tra.mkiv"> + <cd:command name="showbtxtables" category="bibliography" file="publ-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-random.xml b/tex/context/interface/mkiv/i-random.xml index 54dc66c5f..ad842c138 100644 --- a/tex/context/interface/mkiv/i-random.xml +++ b/tex/context/interface/mkiv/i-random.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="getrandomcount" file="supp-ran.mkiv"> + <cd:command name="getrandomcount" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomdimen" file="supp-ran.mkiv"> + <cd:command name="getrandomdimen" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomnumber" file="supp-ran.mkiv"> + <cd:command name="getrandomnumber" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomfloat" file="supp-ran.mkiv"> + <cd:command name="getrandomfloat" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> @@ -42,15 +42,15 @@ </cd:arguments> </cd:command> - <cd:command name="getrandomseed" file="supp-ran.mkiv"> + <cd:command name="getrandomseed" level="system" file="supp-ran.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="randomseed" type="environment" begin="push" end="pop" file="supp-ran.mkiv"/> + <cd:command name="randomseed" type="environment" begin="push" end="pop" level="system" file="supp-ran.mkiv"/> - <cd:command name="reuserandomseed" file="supp-ran.mkiv"/> + <cd:command name="reuserandomseed" level="system" file="supp-ran.mkiv"/> <cd:command name="randomnumber" file="supp-ran.mkiv"> <cd:arguments> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 9c05491bc..95d456ece 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 e7a713796..423106115 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" file="strc-ref.mkvi"> + <cd:command name="setupreferencing" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="textreference" category="references" level="document" 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" file="strc-ref.mkvi"> + <cd:command name="pagereference" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> </cd:arguments> </cd:command> - <cd:command name="reference" file="strc-ref.mkvi"> + <cd:command name="reference" category="references" level="document" 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" file="strc-ref.mkvi"> + <cd:command name="setreference" 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" file="strc-ref.mkvi"> + <cd:command name="usereferenceparameter" category="references" level="system" file="strc-ref.mkvi"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="boxreference" file="strc-ref.mkvi"> + <cd:command name="boxreference" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="hboxreference" category="references" level="system" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vboxreference" file="strc-ref.mkvi"> + <cd:command name="vboxreference" category="references" level="system" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="contentreference" file="strc-ref.mkvi"> + <cd:command name="contentreference" 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" file="strc-ref.mkvi"> + <cd:command name="definereference" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="resetreference" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setpagereference" file="strc-ref.mkvi"> + <cd:command name="setpagereference" 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" file="strc-ref.mkvi"> + <cd:command name="doifelsereferencefound" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="doifreferencefoundelse" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="setupreferenceprefix" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="setupglobalreferenceprefix" 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" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="push" end="pop" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="referenceprefix" type="environment" begin="globalpush" end="globalpop" category="references" level="system" 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" file="strc-ref.mkvi"/> + <cd:command name="referenceprefix" category="references" file="strc-ref.mkvi"/> - <cd:command name="in" file="strc-ref.mkvi"> + <cd:command name="in" category="references" level="document" 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" file="strc-ref.mkvi"> + <cd:command name="at" category="references" level="document" 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" file="strc-ref.mkvi"> + <cd:command name="about" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="from" file="strc-ref.mkvi"> + <cd:command name="from" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="over" file="strc-ref.mkvi"> + <cd:command name="over" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="filterreference" file="strc-ref.mkvi"> + <cd:command name="filterreference" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="getreferenceentry" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="getreference" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="ref" 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" file="strc-ref.mkvi"> + <cd:command name="somewhere" category="references" level="document" 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" file="strc-ref.mkvi"> + <cd:command name="docheckedpagestate" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="someplace" 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" file="strc-ref.mkvi"> + <cd:command name="atpage" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="symbolreference" file="strc-ref.mkvi"> + <cd:command name="symbolreference" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="definereferenceformat" file="strc-ref.mkvi"> + <cd:command name="definereferenceformat" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="setupreferenceformat" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="referenceformat" generated="yes" variant="example" category="references" level="document" file="strc-ref.mkvi"> <cd:sequence> <cd:variable value="referenceformat"/> </cd:sequence> @@ -357,27 +357,27 @@ </cd:arguments> </cd:command> - <cd:command name="goto" file="strc-ref.mkvi"> + <cd:command name="goto" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="goto" type="environment" file="strc-ref.mkvi"> + <cd:command name="goto" type="environment" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="gotobox" file="strc-ref.mkvi"> + <cd:command name="gotobox" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:content/> <cd:resolve name="keyword-reference"/> </cd:arguments> </cd:command> - <cd:command name="useurl" file="strc-ref.mkvi"> + <cd:command name="useurl" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="useURL" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="usefile" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="useexternaldocument" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="doifelseurldefined" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="doifurldefinedelse" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="doifelsefiledefined" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="doiffiledefinedelse" category="references" level="system" 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" file="strc-ref.mkvi"> + <cd:command name="setupurl" category="references" level="style" 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" file="strc-ref.mkvi"> + <cd:command name="url" category="references" level="document" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="defineprogram" file="strc-ref.mkvi"> + <cd:command name="defineprogram" 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" file="strc-ref.mkvi"> + <cd:command name="setupprograms" 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" file="strc-ref.mkvi"> + <cd:command name="program" category="references" file="strc-ref.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="definepage" file="strc-ref.mkvi"> + <cd:command name="definepage" 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" file="strc-ref.mkvi"> + <cd:command name="gotopage" 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" file="strc-ref.mkvi"> + <cd:command name="setupreferencestructureprefix" category="references" level="style" file="strc-ref.mkvi"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> diff --git a/tex/context/interface/mkiv/i-regime.xml b/tex/context/interface/mkiv/i-regime.xml index cd0374023..7a05afd32 100644 --- a/tex/context/interface/mkiv/i-regime.xml +++ b/tex/context/interface/mkiv/i-regime.xml @@ -8,7 +8,7 @@ <cd:command name="disableregime" file="regi-ini.mkiv"/> - <cd:command name="enableregime" file="regi-ini.mkiv"> + <cd:command name="enableregime" level="style" file="regi-ini.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cp1250"/> diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index e13b009ea..d41fe8ef7 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" file="strc-reg.mkiv"> + <cd:command name="defineregister" level="style" 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" file="strc-reg.mkiv"> + <cd:command name="setupregister" variant="argument" level="style" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -47,6 +47,7 @@ <cd:constant type="yes"/> <cd:constant type="no" default="yes"/> <cd:constant type="all"/> + <cd:constant type="packed"/> </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> @@ -178,7 +179,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregister" file="strc-reg.mkiv"> + <cd:command name="setupregister" level="style" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -344,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv"> + <cd:command name="setupregisters" variant="argument" level="style" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-number-list-optional"/> @@ -354,7 +355,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupregisters" file="strc-reg.mkiv"> + <cd:command name="setupregisters" level="style" file="strc-reg.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -366,7 +367,7 @@ </cd:arguments> </cd:command> - <cd:command name="register" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -382,7 +383,7 @@ </cd:instances> </cd:command> - <cd:command name="register" generated="yes" variant="instance:ownnumber" file="strc-reg.mkiv"> + <cd:command name="register" generated="yes" variant="instance:ownnumber" level="document" file="strc-reg.mkiv"> <cd:sequence> <cd:instance value="register"/> </cd:sequence> @@ -399,7 +400,7 @@ </cd:instances> </cd:command> - <cd:command name="seeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="seeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="see"/> <cd:instance value="register"/> @@ -420,7 +421,7 @@ </cd:instances> </cd:command> - <cd:command name="placeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="placeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="place"/> <cd:instance value="register"/> @@ -435,7 +436,7 @@ </cd:instances> </cd:command> - <cd:command name="completeregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="completeregister" generated="yes" variant="instance" level="document" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="complete"/> <cd:instance value="register"/> @@ -450,7 +451,7 @@ </cd:instances> </cd:command> - <cd:command name="setupregister" generated="yes" variant="instance" file="strc-reg.mkiv"> + <cd:command name="setupregister" generated="yes" variant="instance" level="style" file="strc-reg.mkiv"> <cd:sequence> <cd:string value="setup"/> <cd:instance value="register"/> @@ -657,7 +658,7 @@ </cd:arguments> </cd:command> - <cd:command name="currentregisterpageuserdata" file="strc-reg.mkiv"> + <cd:command name="currentregisterpageuserdata" level="system" file="strc-reg.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-renderingwindow.xml b/tex/context/interface/mkiv/i-renderingwindow.xml index 219fda285..c07bf4430 100644 --- a/tex/context/interface/mkiv/i-renderingwindow.xml +++ b/tex/context/interface/mkiv/i-renderingwindow.xml @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="definerenderingwindow" file="scrn-wid.mkvi"> + <cd:command name="definerenderingwindow" level="style" 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" file="scrn-wid.mkvi"> + <cd:command name="setuprenderingwindow" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml index 95b6272e7..82e2532f6 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" file="lang-rep.mkiv"> + <cd:command name="replaceword" level="style" 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" file="lang-rep.mkiv"> + <cd:command name="setreplacement" level="style" file="lang-rep.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="reset"/> diff --git a/tex/context/interface/mkiv/i-rotatation.xml b/tex/context/interface/mkiv/i-rotatation.xml index 3e8eb6699..ee151b0be 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" file="grph-trf.mkiv"> + <cd:command name="mirror" level="document" file="grph-trf.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuprotate" file="grph-trf.mkiv"> + <cd:command name="setuprotate" level="style" 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" file="grph-trf.mkiv"> + <cd:command name="rotate" level="document" 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" file="grph-trf.mkiv"> + <cd:command name="dorotatebox" level="system" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml index 698e4f24f..4684f780f 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" file="typo-rub.mkiv"> + <cd:command name="defineruby" level="style" 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" file="typo-rub.mkiv"> + <cd:command name="setupruby" level="style" 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" file="typo-rub.mkiv"> + <cd:command name="ruby" level="document" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-text"/> @@ -67,7 +67,7 @@ </cd:arguments> </cd:command> - <cd:command name="ruby" type="environment" file="typo-rub.mkiv"> + <cd:command name="ruby" type="environment" level="document" file="typo-rub.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml index 135d6fba8..df1cf37a6 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" file="grph-trf.mkiv"> + <cd:command name="definescale" level="style" 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" file="grph-trf.mkiv"> + <cd:command name="setupscale" level="style" 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" file="grph-trf.mkiv"> + <cd:command name="scale" level="document" file="grph-trf.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml index 10ae6a79e..c60afad09 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" file="scrp-ini.mkvi"> + <cd:command name="definescript" category="language" level="style" 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" file="scrp-ini.mkvi"> + <cd:command name="setupscript" category="language" level="style" 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" file="scrp-ini.mkvi"> + <cd:command name="setupscripts" category="language" level="style" 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" file="scrp-ini.mkvi"> + <cd:command name="setscript" category="language" level="style" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -59,9 +59,9 @@ </cd:arguments> </cd:command> - <cd:command name="resetscript" file="scrp-ini.mkvi"/> + <cd:command name="resetscript" category="language" file="scrp-ini.mkvi"/> - <cd:command name="script" type="environment" file="scrp-ini.mkvi"> + <cd:command name="script" type="environment" category="language" file="scrp-ini.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="hangul"/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="script" generated="yes" varianet="instance" file="scrp-ini.mkvi"> + <cd:command name="script" generated="yes" variant="instance" category="language" file="scrp-ini.mkvi"> <cd:sequence> <cd:instance value="script"/> </cd:sequence> diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index bcdc836af..3130085a6 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" file="strc-sec.mkiv"> + <cd:command name="definehead" level="style" 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" file="strc-sec.mkiv"> + <cd:command name="setuphead" level="style" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -200,10 +200,6 @@ <cd:constant type="margintext"/> <cd:constant type="cd:name"/> </cd:parameter> - <cd:parameter name="location"> - <!-- optional margin location --> - <cd:constant type="cd:name"/> - </cd:parameter> <cd:parameter name="width"> <cd:constant type="cd:dimension"/> </cd:parameter> @@ -240,11 +236,15 @@ <cd:parameter name="deepnumbercommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="location"> + <!-- optional margin location --> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setupheads" file="strc-sec.mkiv"> + <cd:command name="setupheads" level="style" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section-list-optional"/> <cd:assignments list="yes"> @@ -253,7 +253,7 @@ </cd:arguments> </cd:command> - <cd:command name="section" generated="yes" variant="instance" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance" level="document" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -266,7 +266,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:ownnumber" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:ownnumber" level="document" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -280,7 +280,7 @@ </cd:instances> </cd:command> - <cd:command name="section" generated="yes" variant="instance:assignment" file="strc-sec.mkiv"> + <cd:command name="section" generated="yes" variant="instance:assignment" level="document" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -292,7 +292,7 @@ </cd:instances> </cd:command> - <cd:command name="section" type="environment" generated="yes" variant="instance" file="strc-sec.mkiv"> + <cd:command name="section" type="environment" generated="yes" variant="instance" level="document" file="strc-sec.mkiv"> <cd:sequence> <cd:instance value="section"/> </cd:sequence> @@ -491,7 +491,7 @@ --> - <cd:command name="namedsection" type="environment" file="strc-sec.mkiv"> + <cd:command name="namedsection" type="environment" level="document" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="keyword-section"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -579,7 +579,7 @@ </cd:arguments> </cd:command> - <cd:command name="namedstructureheadlocation" file="strc-sec.mkiv"> + <cd:command name="namedstructureheadlocation" level="system" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> </cd:arguments> @@ -601,14 +601,14 @@ </cd:arguments> </cd:command> - <cd:command name="namedstructurevariable" file="strc-sec.mkiv"> + <cd:command name="namedstructurevariable" level="system" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> </cd:arguments> </cd:command> - <cd:command name="namedstructureuservariable" file="strc-sec.mkiv"> + <cd:command name="namedstructureuservariable" level="system" file="strc-sec.mkiv"> <cd:arguments> <cd:resolve name="argument-section"/> <cd:resolve name="argument-key"/> @@ -622,7 +622,7 @@ </cd:arguments> </cd:command> - <cd:command name="sectionlevel" type="environment" file="strc-lev.mkvi"> + <cd:command name="sectionlevel" type="environment" level="document" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -630,7 +630,7 @@ </cd:arguments> </cd:command> - <cd:command name="subjectlevel" type="environment" file="strc-lev.mkvi"> + <cd:command name="subjectlevel" type="environment" level="document" file="strc-lev.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="assignment-sectiondata-list-optional"/> @@ -638,7 +638,7 @@ </cd:arguments> </cd:command> - <cd:command name="defineheadalternative" file="strc-ren.mkiv"> + <cd:command name="defineheadalternative" level="style" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -648,7 +648,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupheadalternative" file="strc-ren.mkiv"> + <cd:command name="setupheadalternative" level="style" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -666,21 +666,21 @@ <cd:command name="localheadsetup" type="environment" file="strc-ren.mkiv"/> - <cd:command name="headhbox" file="strc-ren.mkiv"> + <cd:command name="headhbox" level="system" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headvbox" file="strc-ren.mkiv"> + <cd:command name="headvbox" level="system" file="strc-ren.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="headreferenceattributes" file="strc-ren.mkiv"/> + <cd:command name="headreferenceattributes" level="system" file="strc-ren.mkiv"/> <cd:command name="headnumbercontent" file="strc-ren.mkiv"/> diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml index d6fc97ee0..fb59e16af 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" file="strc-sbe.mkiv"> + <cd:command name="definesectionblock" level="style" 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" file="strc-sbe.mkiv"> + <cd:command name="setupsectionblock" level="style" file="strc-sbe.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="sectionblock" type="environment" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" level="document" 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" file="strc-sbe.mkiv"> + <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" level="document" 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" file="strc-sbe.mkiv"> + <cd:command name="sectionblockenvironment" type="environment" level="style" file="strc-sbe.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-selector.xml b/tex/context/interface/mkiv/i-selector.xml index e593e9117..6a68fb328 100644 --- a/tex/context/interface/mkiv/i-selector.xml +++ b/tex/context/interface/mkiv/i-selector.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="defineselector" file="core-env.mkiv"> + <cd:command name="defineselector" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -13,7 +13,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupselector" file="core-env.mkiv"> + <cd:command name="setupselector" level="style" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes"> @@ -27,7 +27,7 @@ </cd:arguments> </cd:command> - <cd:command name="select" file="core-env.mkiv"> + <cd:command name="select" level="document" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content optional="yes"/> diff --git a/tex/context/interface/mkiv/i-setups.xml b/tex/context/interface/mkiv/i-setups.xml index d6b7b4d5a..5d3a7c9b1 100644 --- a/tex/context/interface/mkiv/i-setups.xml +++ b/tex/context/interface/mkiv/i-setups.xml @@ -70,35 +70,35 @@ </cd:arguments> </cd:command> - <cd:command name="setupwithargument" file="core-env.mkiv"> + <cd:command name="setupwithargument" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargument" file="core-env.mkiv"> + <cd:command name="fastsetupwithargument" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setupwithargumentswapped" file="core-env.mkiv"> + <cd:command name="setupwithargumentswapped" level="system" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="fastsetupwithargumentswapped" file="core-env.mkiv"> + <cd:command name="fastsetupwithargumentswapped" level="system" file="core-env.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="usesetupsparameter" file="core-env.mkiv"> + <cd:command name="usesetupsparameter" level="system" file="core-env.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -110,13 +110,13 @@ </cd:arguments> </cd:command> - <cd:command name="doprocesslocalsetups" file="core-env.mkiv"> + <cd:command name="doprocesslocalsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesetups" file="core-env.mkiv"> + <cd:command name="doifelsesetups" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifsetupselse" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -132,14 +132,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifsetups" file="core-env.mkiv"> + <cd:command name="doifsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotsetups" file="core-env.mkiv"> + <cd:command name="doifnotsetups" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -176,7 +176,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" level="system" file="core-env.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="grid"/> @@ -185,7 +185,7 @@ </cd:arguments> </cd:command> - <cd:command name="rawsetups" type="environment" variant="string" file="core-env.mkiv"> + <cd:command name="rawsetups" type="environment" variant="string" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml index 792a8d84f..c9611e3bf 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" file="node.rul.mkiv"> + <cd:command name="defineshift" level="style" 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" file="node-rul.mkiv"> + <cd:command name="setupshift" level="style" 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" file="node-rul.mkiv"> + <cd:command name="shift" generated="yes" variant="instance" level="document" 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" file="node-rul.mkiv"> + <cd:command name="shift" type="environment" level="document" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-sidebar.xml b/tex/context/interface/mkiv/i-sidebar.xml index 25a7ed306..8926954e3 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" file="anch-bar.mkiv"> + <cd:command name="definesidebar" level="style" 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" file="anch-bar.mkiv"> + <cd:command name="setupsidebar" level="style" 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" file="anch-bar.mkiv"> + <cd:command name="sidebar" type="environment" level="document" 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" file="anch-bar.mkiv"> + <cd:command name="setupmarginrule" level="style" 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" file="anch-bar.mkiv"> + <cd:command name="setupmarginrules" level="style" 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" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" level="document" file="anch-bar.mkiv"> <cd:arguments> <cd:resolve name="keyword-number-optional"/> </cd:arguments> </cd:command> - <cd:command name="marginrule" type="environment" variant="assignment" file="anch-bar.mkiv"> + <cd:command name="marginrule" type="environment" variant="assignment" level="document" file="anch-bar.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupmarginrule"/> diff --git a/tex/context/interface/mkiv/i-smash.xml b/tex/context/interface/mkiv/i-smash.xml index 16c1046bd..74df570e2 100644 --- a/tex/context/interface/mkiv/i-smash.xml +++ b/tex/context/interface/mkiv/i-smash.xml @@ -4,69 +4,69 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="smashbox" file="supp-box.mkiv"> + <cd:command name="smashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="smashboxed" file="supp-box.mkiv"> + <cd:command name="smashboxed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmashbox" file="supp-box.mkiv"> + <cd:command name="hsmashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="vsmashbox" file="supp-box.mkiv"> + <cd:command name="vsmashbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-box"/> </cd:arguments> </cd:command> - <cd:command name="hsmash" file="supp-box.mkiv"> + <cd:command name="hsmash" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmash" file="supp-box.mkiv"> + <cd:command name="vsmash" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="hsmashed" file="supp-box.mkiv"> + <cd:command name="hsmashed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="vsmashed" file="supp-box.mkiv"> + <cd:command name="vsmashed" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedhbox" file="supp-box.mkiv"> + <cd:command name="smashedhbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smashedvbox" file="supp-box.mkiv"> + <cd:command name="smashedvbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="smash" file="supp-box.mkiv"> + <cd:command name="smash" level="document" file="supp-box.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="w"/> diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml index a72df624b..b5e4e40f1 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" file="strc-syn.mkiv"> + <cd:command name="definesorting" category="language" level="style" 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" file="strc-syn.mkiv"> + <cd:command name="setupsorting" category="language" level="style" 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" file="strc-syn.mkiv"> + <cd:command name="sorting" generated="yes" variant="instance" category="language" level="document" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="sorting"/> </cd:sequence> @@ -91,7 +91,7 @@ </cd:instances> </cd:command> - <cd:command name="definesort" file="strc-syn.mkiv"> + <cd:command name="definesort" 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" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" generated="yes" variant="instance" category="language" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" generated="yes" variant="instance" category="language" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsortingused" category="language" level="system" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="resetusedsortings" file="strc-syn.mkiv"> + <cd:command name="resetusedsortings" category="language" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> </cd:arguments> </cd:command> - <cd:command name="registersort" file="strc-syn.mkiv"> + <cd:command name="registersort" 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" file="strc-syn.mkiv"> + <cd:command name="placelistofsorts" category="language" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="completelistofsorts" category="language" level="document" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="keyword-singular"/> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-soundtrack.xml b/tex/context/interface/mkiv/i-soundtrack.xml index b0f460352..2351476b3 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" file="scrn-wid.mkvi"> + <cd:command name="setupexternalsoundtracks" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="option"> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="useexternalsoundtrack" file="scrn-wid.mkvi"> + <cd:command name="useexternalsoundtrack" level="style" file="scrn-wid.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> diff --git a/tex/context/interface/mkiv/i-spellchecking.xml b/tex/context/interface/mkiv/i-spellchecking.xml index 615ba390b..7b328eea6 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" file="lang-wrd.mkiv"> + <cd:command name="setupspellchecking" category="language" level="style" file="lang-wrd.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -23,7 +23,7 @@ </cd:arguments> </cd:command> - <cd:command name="loadspellchecklist" file="lang-wrd.mkiv"> + <cd:command name="loadspellchecklist" category="language" level="style" file="lang-wrd.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-file"/> diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml index 9f6273891..51aad21f2 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" file="m-spreadsheet.mkiv"> + <cd:command name="definespreadsheet" level="style" 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" file="m-spreadsheet.mkiv"> + <cd:command name="setupspreadsheet" level="style" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -74,7 +74,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsespreadsheetcell" file="m-spreadsheet.mkiv"> + <cd:command name="doifelsespreadsheetcell" level="system" 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" file="m-spreadsheet.mkiv"> + <cd:command name="doifspreadsheetcellelse" level="system" file="m-spreadsheet.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="argument-number"/> @@ -118,7 +118,7 @@ </cd:arguments> </cd:command> - <cd:command name="spreadsheettable" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="spreadsheettable" type="environment" level="document" 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" file="m-spreadsheet.mkiv"/> + <cd:command name="row" type="environment" level="document" file="m-spreadsheet.mkiv"/> - <cd:command name="cell" type="environment" file="m-spreadsheet.mkiv"> + <cd:command name="cell" type="environment" level="document" 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 2a6be1393..08c5d2ba0 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" file="core-sys.mkiv"> + <cd:command name="definestartstop" level="style" 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" file="core-sys.mkiv"> + <cd:command name="setupstartstop" level="style" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-steps.xml b/tex/context/interface/mkiv/i-steps.xml index 47a3b45ca..e27fe5f16 100644 --- a/tex/context/interface/mkiv/i-steps.xml +++ b/tex/context/interface/mkiv/i-steps.xml @@ -41,7 +41,7 @@ --> - <cd:command name="setupSTEPcharts" file="m-steps.mkvi"> + <cd:command name="setupSTEPcharts" level="style" 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" file="m-steps.mkvi"> + <cd:command name="setupSTEPcells" level="style" 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" file="m-steps.mkvi"> + <cd:command name="setupSTEPtexts" level="style" 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" file="m-steps.mkvi"> + <cd:command name="setupSTEPlines" level="style" file="m-steps.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:resolve name="keyword-name-optional"/> diff --git a/tex/context/interface/mkiv/i-stream.xml b/tex/context/interface/mkiv/i-stream.xml index 97be35774..b392fd001 100644 --- a/tex/context/interface/mkiv/i-stream.xml +++ b/tex/context/interface/mkiv/i-stream.xml @@ -4,9 +4,9 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="currentoutputstream" file="page-str.mkiv"/> + <cd:command name="currentoutputstream" level="system" file="page-str.mkiv"/> - <cd:command name="ifinoutputstream" file="page-str.mkiv"> + <cd:command name="ifinoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -15,57 +15,57 @@ </cd:arguments> </cd:command> - <cd:command name="enableoutputstream" file="page-str.mkiv"> + <cd:command name="enableoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="disableoutputstream" file="page-str.mkiv"/> + <cd:command name="disableoutputstream" level="system" file="page-str.mkiv"/> - <cd:command name="outputstream" type="environment" file="page-str.mkiv"> + <cd:command name="outputstream" type="environment" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushoutputstream" file="page-str.mkiv"> + <cd:command name="flushoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreambox" file="page-str.mkiv"> + <cd:command name="outputstreambox" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamcopy" file="page-str.mkiv"> + <cd:command name="outputstreamcopy" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvbox" file="page-str.mkiv"> + <cd:command name="outputstreamunvbox" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="outputstreamunvcopy" file="page-str.mkiv"> + <cd:command name="outputstreamunvcopy" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="synchronizeoutputstreams" file="page-str.mkiv"> + <cd:command name="synchronizeoutputstreams" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="pushoutputstream" file="page-str.mkiv"> + <cd:command name="pushoutputstream" level="system" file="page-str.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-string.xml b/tex/context/interface/mkiv/i-string.xml index 7a7eb1c98..567881602 100644 --- a/tex/context/interface/mkiv/i-string.xml +++ b/tex/context/interface/mkiv/i-string.xml @@ -4,61 +4,61 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="wdofstring" file="blob-ini.mkiv"> + <cd:command name="wdofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htofstring" file="blob-ini.mkiv"> + <cd:command name="htofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="dpofstring" file="blob-ini.mkiv"> + <cd:command name="dpofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="hdofstring" file="blob-ini.mkiv"> + <cd:command name="hdofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="htdpofstring" file="blob-ini.mkiv"> + <cd:command name="htdpofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="widthofstring" file="blob-ini.mkiv"> + <cd:command name="widthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightofstring" file="blob-ini.mkiv"> + <cd:command name="heightofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="depthofstring" file="blob-ini.mkiv"> + <cd:command name="depthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="heightanddepthofstring" file="blob-ini.mkiv"> + <cd:command name="heightanddepthofstring" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setwidthof" file="blob-ini.mkiv"> + <cd:command name="setwidthof" level="system" file="blob-ini.mkiv"> <cd:arguments> <cd:text/> <cd:delimiter name="to"/> diff --git a/tex/context/interface/mkiv/i-strut.xml b/tex/context/interface/mkiv/i-strut.xml index 1fd12a3bb..a11c6c13d 100644 --- a/tex/context/interface/mkiv/i-strut.xml +++ b/tex/context/interface/mkiv/i-strut.xml @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="synchronizestrut" file="spac-ver.mkiv"> + <cd:command name="synchronizestrut" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:resolve name="value-strut"/> @@ -30,24 +30,24 @@ <cd:command name="strut" file="spac-ver.mkiv"/> - <cd:command name="setstrut" file="spac-ver.mkiv"/> + <cd:command name="setstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setcharstrut" file="spac-ver.mkiv"> + <cd:command name="setcharstrut" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setfontstrut" file="spac-ver.mkiv"/> + <cd:command name="setfontstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setcapstrut" file="spac-ver.mkiv"/> + <cd:command name="setcapstrut" level="system" file="spac-ver.mkiv"/> - <cd:command name="setnostrut" file="spac-ver.mkiv"/> + <cd:command name="setnostrut" level="system" file="spac-ver.mkiv"/> <cd:command name="showstruts" file="spac-ver.mkiv"/> <cd:command name="showcolorstruts" file="spac-ver.mkiv"/> - <cd:command name="strut" type="environment" begin="beg" end="end" file="spac-ver.mkiv"/> + <cd:command name="strut" type="environment" begin="beg" end="end" level="system" file="spac-ver.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index 7797a3bee..d7e1e5926 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" file="symb-ini.mkiv"> + <cd:command name="definesymbol" category="symbols" level="style" 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" file="symb-ini.mkiv"> + <cd:command name="doifelseinsymbolset" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolsetelse" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="doifinsymbolset" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="doifelsesymbolset" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="doifsymbolsetelse" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="symbol" category="symbols" level="document" 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" file="symb-ini.mkiv"> + <cd:command name="symbol" variant="direct" category="symbols" level="document" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="directsymbol" file="symb-ini.mkiv"> + <cd:command name="directsymbol" 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" file="symb-ini.mkiv"> + <cd:command name="definefiguresymbol" category="symbols" level="style" 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" file="symb-ini.mkiv"> + <cd:command name="figuresymbol" category="symbols" level="document" 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" file="symb-ini.mkiv"> + <cd:command name="doifelsesymboldefined" category="symbols" level="system" 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" file="symb-ini.mkiv"> + <cd:command name="doifsymboldefinedelse" category="symbols" level="system" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -116,27 +116,27 @@ </cd:arguments> </cd:command> - <cd:command name="symbolset" type="environment" file="symb-ini.mkiv"> + <cd:command name="symbolset" type="environment" category="symbols" level="style" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setupsymbolset" file="symb-ini.mkiv"> + <cd:command name="setupsymbolset" category="symbols" level="style" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="resetsymbolset" file="symb-ini.mkiv"/> + <cd:command name="resetsymbolset" category="symbols" file="symb-ini.mkiv"/> - <cd:command name="usesymbols" file="symb-ini.mkiv"> + <cd:command name="usesymbols" category="symbols" level="style" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-file"/> </cd:arguments> </cd:command> - <cd:command name="showsymbolset" file="symb-run.mkiv"> + <cd:command name="showsymbolset" category="symbols" level="document" file="symb-run.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml index 6c615b12a..75c623210 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" file="strc-syn.mkiv"> + <cd:command name="definesynonyms" level="style" 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" file="strc-syn.mkiv"> + <cd:command name="setupsynonyms" level="style" 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" file="strc-syn.mkiv"> + <cd:command name="synonym" generated="yes" variant="instance" level="document" file="strc-syn.mkiv"> <cd:sequence> <cd:instance value="synonym"/> </cd:sequence> @@ -94,7 +94,7 @@ </cd:instances> </cd:command> - <cd:command name="definesynonym" file="strc-syn.mkiv"> + <cd:command name="definesynonym" level="style" 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" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" generated="yes" variant="instance" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" generated="yes" variant="instance" level="document" file="strc-syn.mkiv"> <cd:sequence> <cd:string value="completelistof"/> <cd:instance value="synonyms"/> @@ -144,14 +144,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymused" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymused" level="system" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecurrentsynonymshown" file="strc-syn.mkiv"> + <cd:command name="doifelsecurrentsynonymshown" level="system" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> @@ -170,7 +170,7 @@ </cd:arguments> </cd:command> - <cd:command name="placelistofsynonyms" file="strc-syn.mkiv"> + <cd:command name="placelistofsynonyms" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="completelistofsynonyms" level="document" 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" file="strc-syn.mkiv"> + <cd:command name="infull" level="document" file="strc-syn.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml index aa12bd779..ba622940c 100644 --- a/tex/context/interface/mkiv/i-system.xml +++ b/tex/context/interface/mkiv/i-system.xml @@ -4,28 +4,28 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="expanded" file="syst-aux.mkiv"> + <cd:command name="expanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="expanded" type="environment" file="syst-aux.mkiv"/> + <cd:command name="expanded" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="gobbleoneargument" file="syst-aux.mkiv"> + <cd:command name="gobbleoneargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobbletwoarguments" file="syst-aux.mkiv"> + <cd:command name="gobbletwoarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="gobblethreearguments" file="syst-aux.mkiv"> + <cd:command name="gobblethreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -33,7 +33,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefourarguments" file="syst-aux.mkiv"> + <cd:command name="gobblefourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -42,7 +42,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefivearguments" file="syst-aux.mkiv"> + <cd:command name="gobblefivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -52,7 +52,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesixarguments" file="syst-aux.mkiv"> + <cd:command name="gobblesixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblesevenarguments" file="syst-aux.mkiv"> + <cd:command name="gobblesevenarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -75,7 +75,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleeightarguments" file="syst-aux.mkiv"> + <cd:command name="gobbleeightarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -88,7 +88,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleninearguments" file="syst-aux.mkiv"> + <cd:command name="gobbleninearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -102,7 +102,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobbletenarguments" file="syst-aux.mkiv"> + <cd:command name="gobbletenarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -117,20 +117,20 @@ </cd:arguments> </cd:command> - <cd:command name="gobbleoneoptional" file="syst-aux.mkiv"> + <cd:command name="gobbleoneoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="gobbletwooptionals" file="syst-aux.mkiv"> + <cd:command name="gobbletwooptionals" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="gobblethreeoptionals" file="syst-aux.mkiv"> + <cd:command name="gobblethreeoptionals" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -138,7 +138,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefouroptionals" file="syst-aux.mkiv"> + <cd:command name="gobblefouroptionals" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="gobblefiveoptionals" file="syst-aux.mkiv"> + <cd:command name="gobblefiveoptionals" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy"/> <cd:resolve name="keyword-dummy"/> @@ -157,9 +157,9 @@ </cd:arguments> </cd:command> - <cd:command name="donothing" file="syst-aux.mkiv"/> + <cd:command name="donothing" level="system" file="syst-aux.mkiv"/> - <cd:command name="doifelsenextchar" file="syst-aux.mkiv"> + <cd:command name="doifelsenextchar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-true"/> @@ -167,7 +167,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnextcharelse" file="syst-aux.mkiv"> + <cd:command name="doifnextcharelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-true"/> @@ -175,212 +175,212 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenextoptional" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalelse" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextoptionalcs" file="syst-aux.mkiv"> + <cd:command name="doifelsenextoptionalcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextoptionalcselse" file="syst-aux.mkiv"> + <cd:command name="doifnextoptionalcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroup" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroup" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupelse" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextbgroupcs" file="syst-aux.mkiv"> + <cd:command name="doifelsenextbgroupcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifnextbgroupcselse" file="syst-aux.mkiv"> + <cd:command name="doifnextbgroupcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doifelsenextparenthesis" file="syst-aux.mkiv"> + <cd:command name="doifelsenextparenthesis" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifnextparenthesiselse" file="syst-aux.mkiv"> + <cd:command name="doifnextparenthesiselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheck" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheck" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckelse" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefastoptionalcheckcs" file="syst-aux.mkiv"> + <cd:command name="doifelsefastoptionalcheckcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doiffastoptionalcheckcselse" file="syst-aux.mkiv"> + <cd:command name="doiffastoptionalcheckcselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="assumelongusagecs" file="syst-aux.mkiv"> + <cd:command name="assumelongusagecs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setvalue" file="syst-aux.mkiv"> + <cd:command name="setvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setgvalue" file="syst-aux.mkiv"> + <cd:command name="setgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setevalue" file="syst-aux.mkiv"> + <cd:command name="setevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setxvalue" file="syst-aux.mkiv"> + <cd:command name="setxvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getvalue" file="syst-aux.mkiv"> + <cd:command name="getvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvalue" file="syst-aux.mkiv"> + <cd:command name="letvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letgvalue" file="syst-aux.mkiv"> + <cd:command name="letgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="resetvalue" file="syst-aux.mkiv"> + <cd:command name="resetvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="undefinevalue" file="syst-aux.mkiv"> + <cd:command name="undefinevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="ignorevalue" file="syst-aux.mkiv"> + <cd:command name="ignorevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="setuvalue" file="syst-aux.mkiv"> + <cd:command name="setuvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuevalue" file="syst-aux.mkiv"> + <cd:command name="setuevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setugvalue" file="syst-aux.mkiv"> + <cd:command name="setugvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="setuxvalue" file="syst-aux.mkiv"> + <cd:command name="setuxvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="getuvalue" file="syst-aux.mkiv"> + <cd:command name="getuvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseundefined" file="syst-aux.mkiv"> + <cd:command name="doifelseundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -388,7 +388,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifundefinedelse" file="syst-aux.mkiv"> + <cd:command name="doifundefinedelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -396,7 +396,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedefined" file="syst-aux.mkiv"> + <cd:command name="doifelsedefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -404,7 +404,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdefinedelse" file="syst-aux.mkiv"> + <cd:command name="doifdefinedelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -412,39 +412,39 @@ </cd:arguments> </cd:command> - <cd:command name="doifundefined" file="syst-aux.mkiv"> + <cd:command name="doifundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifdefined" file="syst-aux.mkiv"> + <cd:command name="doifdefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="letbeundefined" file="syst-aux.mkiv"> + <cd:command name="letbeundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="localundefine" file="syst-aux.mkiv"> + <cd:command name="localundefine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="globalundefine" file="syst-aux.mkiv"> + <cd:command name="globalundefine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsealldefined" file="syst-aux.mkiv"> + <cd:command name="doifelsealldefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -452,7 +452,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifalldefinedelse" file="syst-aux.mkiv"> + <cd:command name="doifalldefinedelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name-list"/> <cd:resolve name="argument-true"/> @@ -460,7 +460,7 @@ </cd:arguments> </cd:command> - <cd:command name="doif" file="syst-aux.mkiv"> + <cd:command name="doif" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -468,7 +468,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnot" file="syst-aux.mkiv"> + <cd:command name="doifnot" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -476,7 +476,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelse" file="syst-aux.mkiv"> + <cd:command name="doifelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:content/> @@ -485,7 +485,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseempty" file="syst-aux.mkiv"> + <cd:command name="doifelseempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> @@ -493,7 +493,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyelse" file="syst-aux.mkiv"> + <cd:command name="doifemptyelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> @@ -501,161 +501,161 @@ </cd:arguments> </cd:command> - <cd:command name="doifempty" file="syst-aux.mkiv"> + <cd:command name="doifempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotempty" file="syst-aux.mkiv"> + <cd:command name="doifnotempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinset" file="syst-aux.mkiv"> + <cd:command name="doifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifinsetelse" file="syst-aux.mkiv"> + <cd:command name="doifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifinset" file="syst-aux.mkiv"> + <cd:command name="doifinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotinset" file="syst-aux.mkiv"> + <cd:command name="doifnotinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsecommon" file="syst-aux.mkiv"> + <cd:command name="doifelsecommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcommonelse" file="syst-aux.mkiv"> + <cd:command name="doifcommonelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifcommon" file="syst-aux.mkiv"> + <cd:command name="doifcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotcommon" file="syst-aux.mkiv"> + <cd:command name="doifnotcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="processcommalist" file="syst-aux.mkiv"> + <cd:command name="processcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="quitcommalist" file="syst-aux.mkiv"/> + <cd:command name="quitcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="quitprevcommalist" file="syst-aux.mkiv"/> + <cd:command name="quitprevcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="processcommacommand" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processcommalistwithparameters" file="syst-aux.mkiv"> + <cd:command name="processcommalistwithparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processcommalist" type="environment" file="syst-aux.mkiv"> + <cd:command name="processcommalist" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="processcommacommand" type="environment" file="syst-aux.mkiv"> + <cd:command name="processcommacommand" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="currentcommalistitem" file="syst-aux.mkiv"/> + <cd:command name="currentcommalistitem" level="system" file="syst-aux.mkiv"/> - <cd:command name="processaction" file="syst-aux.mkiv"> + <cd:command name="processaction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processfirstactioninset" file="syst-aux.mkiv"> + <cd:command name="processfirstactioninset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="processallactionsinset" file="syst-aux.mkiv"> + <cd:command name="processallactionsinset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="commalistelement" file="syst-aux.mkiv"/> + <cd:command name="commalistelement" level="system" file="syst-aux.mkiv"/> - <cd:command name="firstcharacter" file="syst-aux.mkiv"/> + <cd:command name="firstcharacter" level="system" file="syst-aux.mkiv"/> - <cd:command name="remainingcharacters" file="syst-aux.mkiv"/> + <cd:command name="remainingcharacters" level="system" file="syst-aux.mkiv"/> - <cd:command name="getfirstcharacter" file="syst-aux.mkiv"> + <cd:command name="getfirstcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsefirstchar" file="syst-aux.mkiv"> + <cd:command name="doifelsefirstchar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -664,7 +664,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiffirstcharelse" file="syst-aux.mkiv"> + <cd:command name="doiffirstcharelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -673,19 +673,19 @@ </cd:arguments> </cd:command> - <cd:command name="thefirstcharacter" file="syst-aux.mkiv"> + <cd:command name="thefirstcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="theremainingcharacters" file="syst-aux.mkiv"> + <cd:command name="theremainingcharacters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelseinstring" file="syst-aux.mkiv"> + <cd:command name="doifelseinstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -694,7 +694,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinstringelse" file="syst-aux.mkiv"> + <cd:command name="doifinstringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -703,7 +703,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifinstring" file="syst-aux.mkiv"> + <cd:command name="doifinstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -711,7 +711,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotinstring" file="syst-aux.mkiv"> + <cd:command name="doifnotinstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -719,7 +719,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseincsname" file="syst-aux.mkiv"> + <cd:command name="doifelseincsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-csname"/> @@ -728,7 +728,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifincsnameelse" file="syst-aux.mkiv"> + <cd:command name="doifincsnameelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-csname"/> @@ -737,7 +737,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenumber" file="syst-aux.mkiv"> + <cd:command name="doifelsenumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -745,7 +745,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnumberelse" file="syst-aux.mkiv"> + <cd:command name="doifnumberelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -753,21 +753,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnumber" file="syst-aux.mkiv"> + <cd:command name="doifnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotnumber" file="syst-aux.mkiv"> + <cd:command name="doifnotnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="percentdimen" file="syst-aux.mkiv"> + <cd:command name="percentdimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -780,7 +780,7 @@ </cd:arguments> </cd:command> - <cd:command name="setpercentdimen" file="syst-aux.mkiv"> + <cd:command name="setpercentdimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:dimension"/> @@ -793,170 +793,170 @@ </cd:arguments> </cd:command> - <cd:command name="makerawcommalist" file="syst-aux.mkiv"> + <cd:command name="makerawcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommalist" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawprocesscommacommand" file="syst-aux.mkiv"> + <cd:command name="rawprocesscommacommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="rawdoifelseinset" file="syst-aux.mkiv"> + <cd:command name="rawdoifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="rawdoifinsetelse" file="syst-aux.mkiv"> + <cd:command name="rawdoifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="rawdoifinset" file="syst-aux.mkiv"> + <cd:command name="rawdoifinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:content/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="rawprocessaction" file="syst-aux.mkiv"> + <cd:command name="rawprocessaction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command"/> <cd:apply list="yes"/> </cd:arguments> </cd:command> - <cd:command name="currentvalue" file="syst-aux.mkiv"/> + <cd:command name="currentvalue" level="system" file="syst-aux.mkiv"/> - <cd:command name="getparameters" file="syst-aux.mkiv"> + <cd:command name="getparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="geteparameters" file="syst-aux.mkiv"> + <cd:command name="geteparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getgparameters" file="syst-aux.mkiv"> + <cd:command name="getgparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getxparameters" file="syst-aux.mkiv"> + <cd:command name="getxparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="forgetparameters" file="syst-aux.mkiv"> + <cd:command name="forgetparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getexpandedparameters" file="syst-aux.mkiv"> + <cd:command name="getexpandedparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="doassign" file="syst-aux.mkiv"> + <cd:command name="doassign" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="doeassign" file="syst-aux.mkiv"> + <cd:command name="doeassign" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="undoassign" file="syst-aux.mkiv"> + <cd:command name="undoassign" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="doassignempty" file="syst-aux.mkiv"> + <cd:command name="doassignempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata"/> </cd:arguments> </cd:command> - <cd:command name="processassignmentlist" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processassignmentlist" type="environment" file="syst-aux.mkiv"> + <cd:command name="processassignmentlist" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="processassignmentcommand" type="environment" file="syst-aux.mkiv"> + <cd:command name="processassignmentcommand" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="currentassignmentlistkey" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistkey" level="system" file="syst-aux.mkiv"/> - <cd:command name="currentassignmentlistvalue" file="syst-aux.mkiv"/> + <cd:command name="currentassignmentlistvalue" level="system" file="syst-aux.mkiv"/> - <cd:command name="getemptyparameters" file="syst-aux.mkiv"> + <cd:command name="getemptyparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="copyparameters" file="syst-aux.mkiv"> + <cd:command name="copyparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -964,13 +964,13 @@ </cd:arguments> </cd:command> - <cd:command name="checkparameters" file="syst-aux.mkiv"> + <cd:command name="checkparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="ifparameters" file="syst-aux.mkiv"> + <cd:command name="ifparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -979,35 +979,35 @@ </cd:arguments> </cd:command> - <cd:command name="commalistsize" file="syst-aux.mkiv"/> + <cd:command name="commalistsize" level="system" file="syst-aux.mkiv"/> - <cd:command name="getcommalistsize" file="syst-aux.mkiv"> + <cd:command name="getcommalistsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getcommacommandsize" file="syst-aux.mkiv"> + <cd:command name="getcommacommandsize" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="getfromcommalist" file="syst-aux.mkiv"> + <cd:command name="getfromcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="getfromcommacommand" file="syst-aux.mkiv"> + <cd:command name="getfromcommacommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> <cd:resolve name="keyword-number"/> </cd:arguments> </cd:command> - <cd:command name="dogetcommacommandelement" file="syst-aux.mkiv"> + <cd:command name="dogetcommacommandelement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> <cd:delimiter name="from"/> @@ -1017,14 +1017,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleempty" file="syst-aux.mkiv"> + <cd:command name="dosingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleempty" file="syst-aux.mkiv"> + <cd:command name="dodoubleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1032,7 +1032,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleempty" file="syst-aux.mkiv"> + <cd:command name="dotripleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1041,7 +1041,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleempty" file="syst-aux.mkiv"> + <cd:command name="doquadrupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1051,7 +1051,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleempty" file="syst-aux.mkiv"> + <cd:command name="doquintupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1062,7 +1062,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleempty" file="syst-aux.mkiv"> + <cd:command name="dosixtupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1074,7 +1074,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleempty" file="syst-aux.mkiv"> + <cd:command name="doseventupleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-optional"/> @@ -1087,14 +1087,14 @@ </cd:arguments> </cd:command> - <cd:command name="dosingleargument" file="syst-aux.mkiv"> + <cd:command name="dosingleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleargument" file="syst-aux.mkiv"> + <cd:command name="dodoubleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1102,7 +1102,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargument" file="syst-aux.mkiv"> + <cd:command name="dotripleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1111,7 +1111,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadrupleargument" file="syst-aux.mkiv"> + <cd:command name="doquadrupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1121,7 +1121,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintupleargument" file="syst-aux.mkiv"> + <cd:command name="doquintupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1132,7 +1132,7 @@ </cd:arguments> </cd:command> - <cd:command name="dosixtupleargument" file="syst-aux.mkiv"> + <cd:command name="dosixtupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1144,7 +1144,7 @@ </cd:arguments> </cd:command> - <cd:command name="doseventupleargument" file="syst-aux.mkiv"> + <cd:command name="doseventupleargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy"/> @@ -1157,13 +1157,13 @@ </cd:arguments> </cd:command> - <cd:command name="strippedcsname" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="strippedcsname" variant="string" file="syst-aux.mkiv"> + <cd:command name="strippedcsname" variant="string" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none"> <cd:constant type="cd:text"/> @@ -1171,13 +1171,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimple" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimple" variant="argument" file="syst-aux.mkiv"> + <cd:command name="complexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1186,13 +1186,13 @@ </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="complexorsimpleempty" variant="argument" file="syst-aux.mkiv"> + <cd:command name="complexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1201,13 +1201,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimple" variant="argument" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimple" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1216,13 +1216,13 @@ </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="definecomplexorsimpleempty" variant="argument" file="syst-aux.mkiv"> + <cd:command name="definecomplexorsimpleempty" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> @@ -1231,18 +1231,18 @@ </cd:arguments> </cd:command> - <cd:command name="permitspacesbetweengroups" file="syst-aux.mkiv"/> + <cd:command name="permitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> - <cd:command name="dontpermitspacesbetweengroups" file="syst-aux.mkiv"/> + <cd:command name="dontpermitspacesbetweengroups" level="system" file="syst-aux.mkiv"/> - <cd:command name="dosinglegroupempty" file="syst-aux.mkiv"> + <cd:command name="dosinglegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dodoublegroupempty" file="syst-aux.mkiv"> + <cd:command name="dodoublegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1250,7 +1250,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotriplegroupempty" file="syst-aux.mkiv"> + <cd:command name="dotriplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1259,7 +1259,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquadruplegroupempty" file="syst-aux.mkiv"> + <cd:command name="doquadruplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1269,7 +1269,7 @@ </cd:arguments> </cd:command> - <cd:command name="doquintuplegroupempty" file="syst-aux.mkiv"> + <cd:command name="doquintuplegroupempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dummy-optional"/> @@ -1280,27 +1280,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneargument" file="syst-aux.mkiv"> + <cd:command name="firstofoneargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwoarguments" file="syst-aux.mkiv"> + <cd:command name="firstoftwoarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="secondoftwoarguments" file="syst-aux.mkiv"> + <cd:command name="secondoftwoarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstofthreearguments" file="syst-aux.mkiv"> + <cd:command name="firstofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1308,7 +1308,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreearguments" file="syst-aux.mkiv"> + <cd:command name="secondofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1316,7 +1316,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreearguments" file="syst-aux.mkiv"> + <cd:command name="thirdofthreearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1324,7 +1324,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffourarguments" file="syst-aux.mkiv"> + <cd:command name="firstoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1333,7 +1333,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffourarguments" file="syst-aux.mkiv"> + <cd:command name="secondoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1342,7 +1342,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffourarguments" file="syst-aux.mkiv"> + <cd:command name="thirdoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1351,7 +1351,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffourarguments" file="syst-aux.mkiv"> + <cd:command name="fourthoffourarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1360,7 +1360,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstoffivearguments" file="syst-aux.mkiv"> + <cd:command name="firstoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1370,7 +1370,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondoffivearguments" file="syst-aux.mkiv"> + <cd:command name="secondoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1380,7 +1380,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdoffivearguments" file="syst-aux.mkiv"> + <cd:command name="thirdoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1390,7 +1390,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthoffivearguments" file="syst-aux.mkiv"> + <cd:command name="fourthoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1400,7 +1400,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthoffivearguments" file="syst-aux.mkiv"> + <cd:command name="fifthoffivearguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1410,7 +1410,7 @@ </cd:arguments> </cd:command> - <cd:command name="firstofsixarguments" file="syst-aux.mkiv"> + <cd:command name="firstofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1421,7 +1421,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofsixarguments" file="syst-aux.mkiv"> + <cd:command name="secondofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1432,7 +1432,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofsixarguments" file="syst-aux.mkiv"> + <cd:command name="thirdofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1443,7 +1443,7 @@ </cd:arguments> </cd:command> - <cd:command name="fourthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="fourthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1454,7 +1454,7 @@ </cd:arguments> </cd:command> - <cd:command name="fifthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="fifthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1465,7 +1465,7 @@ </cd:arguments> </cd:command> - <cd:command name="sixthofsixarguments" file="syst-aux.mkiv"> + <cd:command name="sixthofsixarguments" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1476,27 +1476,27 @@ </cd:arguments> </cd:command> - <cd:command name="firstofoneunexpanded" file="syst-aux.mkiv"> + <cd:command name="firstofoneunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstoftwounexpanded" file="syst-aux.mkiv"> + <cd:command name="firstoftwounexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="secondoftwounexpanded" file="syst-aux.mkiv"> + <cd:command name="secondoftwounexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> </cd:arguments> </cd:command> - <cd:command name="firstofthreeunexpanded" file="syst-aux.mkiv"> + <cd:command name="firstofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1504,7 +1504,7 @@ </cd:arguments> </cd:command> - <cd:command name="secondofthreeunexpanded" file="syst-aux.mkiv"> + <cd:command name="secondofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1512,7 +1512,7 @@ </cd:arguments> </cd:command> - <cd:command name="thirdofthreeunexpanded" file="syst-aux.mkiv"> + <cd:command name="thirdofthreeunexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dummy"/> <cd:resolve name="argument-dummy"/> @@ -1520,56 +1520,56 @@ </cd:arguments> </cd:command> - <cd:command name="letempty" file="syst-aux.mkiv"> + <cd:command name="letempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalletempty" file="syst-aux.mkiv"> + <cd:command name="globalletempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="letvalueempty" file="syst-aux.mkiv"> + <cd:command name="letvalueempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalueempty" file="syst-aux.mkiv"> + <cd:command name="letgvalueempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letvaluerelax" file="syst-aux.mkiv"> + <cd:command name="letvaluerelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="letgvalurelax" file="syst-aux.mkiv"> + <cd:command name="letgvalurelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="relaxvalueifundefined" file="syst-aux.mkiv"> + <cd:command name="relaxvalueifundefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="rawgetparameters" file="syst-aux.mkiv"> + <cd:command name="rawgetparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="texdefinition" type="environment" file="syst-aux.mkiv"> + <cd:command name="texdefinition" type="environment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="none" optional="yes"> <cd:constant type="spaces"/> @@ -1584,6 +1584,20 @@ <cd:keywords delimiters="none" optional="yes"> <cd:constant type="expanded"/> </cd:keywords> + <cd:keywords delimiters="none" optional="yes"> + <cd:constant type="singleempty"/> + <cd:constant type="doubleempty"/> + <cd:constant type="tripleempty"/> + <cd:constant type="quadrupleempty"/> + <cd:constant type="quintupleempty"/> + <cd:constant type="sixtupleempty"/> + <cd:constant type="singleargument"/> + <cd:constant type="doubleargument"/> + <cd:constant type="tripleargument"/> + <cd:constant type="quadrupleargument"/> + <cd:constant type="quintupleargument"/> + <cd:constant type="sixtupleargument"/> + </cd:keywords> <cd:keywords delimiters="none"> <cd:constant type="cd:name"/> </cd:keywords> @@ -1593,39 +1607,39 @@ </cd:arguments> </cd:command> - <cd:command name="texdefinition" file="syst-aux.mkiv"> + <cd:command name="texdefinition" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="texcode" type="environment" file="syst-aux.mkiv"/> + <cd:command name="texcode" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="newcounter" file="syst-aux.mkiv"> + <cd:command name="newcounter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastincrement" file="syst-aux.mkiv"> + <cd:command name="fastincrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="fastdecrement" file="syst-aux.mkiv"> + <cd:command name="fastdecrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" file="syst-aux.mkiv"> + <cd:command name="increment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="increment" variant="argument" file="syst-aux.mkiv"> + <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -1634,13 +1648,13 @@ </cd:arguments> </cd:command> - <cd:command name="decrement" file="syst-aux.mkiv"> + <cd:command name="decrement" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="decrement" variant="argument" file="syst-aux.mkiv"> + <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="parentheses" list="yes"> <cd:constant type="cd:csname"/> @@ -1649,47 +1663,49 @@ </cd:arguments> </cd:command> - <cd:command name="incrementvalue" file="syst-aux.mkiv"> + <cd:command name="incrementvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="decrementvalue" file="syst-aux.mkiv"> + <cd:command name="decrementvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="newsignal" file="syst-aux.mkiv"> + <cd:command name="newsignal" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" file="syst-aux.mkiv"> + <cd:command name="checkedstrippedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="checkedstrippedcsname" variant="string" file="syst-aux.mkiv"> + <cd:command name="checkedstrippedcsname" variant="string" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> </cd:arguments> </cd:command> - <cd:command name="savenormalmeaning" file="syst-aux.mkiv"> + <cd:command name="savenormalmeaning" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="recursedepth" file="syst-aux.mkiv"/> + <cd:command name="recursedepth" level="system" file="syst-aux.mkiv"/> - <cd:command name="recurselevel" file="syst-aux.mkiv"/> + <cd:command name="recurselevel" level="system" file="syst-aux.mkiv"/> - <cd:command name="dostepwiserecurse" file="syst-aux.mkiv"> + <cd:command name="resetrecurselevel" level="system" file="syst-aux.mkiv"/> + + <cd:command name="dostepwiserecurse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -1700,75 +1716,79 @@ </cd:arguments> </cd:command> - <cd:command name="dorecurse" file="syst-aux.mkiv"> + <cd:command name="dorecurse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doexpandedrecurse" file="syst-aux.mkiv"> + <cd:command name="doexpandedrecurse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="dowith" file="syst-aux.mkiv"> + <cd:command name="dowith" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command-list"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doloop" file="syst-aux.mkiv"> + <cd:command name="doloop" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="exitloop" file="syst-aux.mkiv"/> + <cd:command name="exitloop" level="system" file="syst-aux.mkiv"/> - <cd:command name="exitloopnow" file="syst-aux.mkiv"/> + <cd:command name="exitloopnow" level="system" file="syst-aux.mkiv"/> - <cd:command name="dorecurse" file="syst-aux.mkiv"> + <cd:command name="dofastloopcs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="doloopoverlist" file="syst-aux.mkiv"> + <cd:command name="fastloopindex" level="system" file="syst-aux.mkiv"/> + + <cd:command name="fastloopfinal" level="system" file="syst-aux.mkiv"/> + + <cd:command name="doloopoverlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="recursestring" file="syst-aux.mkiv"/> + <cd:command name="recursestring" level="system" file="syst-aux.mkiv"/> - <cd:command name="newevery" file="syst-aux.mkiv"> + <cd:command name="newevery" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="EveryPar" file="syst-aux.mkiv"> + <cd:command name="EveryPar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="EveryLine" file="syst-aux.mkiv"> + <cd:command name="EveryLine" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="forgeteverypar" file="syst-aux.mkiv"/> + <cd:command name="forgeteverypar" level="system" file="syst-aux.mkiv"/> - <cd:command name="convertvalue" file="syst-aux.mkiv"> + <cd:command name="convertvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-name"/> <cd:delimiter name="to"/> @@ -1776,14 +1796,14 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedvalue" file="syst-aux.mkiv"> + <cd:command name="defconvertedvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseassignment" file="syst-aux.mkiv"> + <cd:command name="doifelseassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1791,7 +1811,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifassignmentelse" file="syst-aux.mkiv"> + <cd:command name="doifassignmentelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -1799,13 +1819,13 @@ </cd:arguments> </cd:command> - <cd:command name="docheckassignment" file="syst-aux.mkiv"> + <cd:command name="docheckassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="ifassignment" file="syst-aux.mkiv"> + <cd:command name="ifassignment" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -1814,7 +1834,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertargument" file="syst-aux.mkiv"> + <cd:command name="convertargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -1822,7 +1842,7 @@ </cd:arguments> </cd:command> - <cd:command name="convertcommand" file="syst-aux.mkiv"> + <cd:command name="convertcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="to"/> @@ -1830,55 +1850,55 @@ </cd:arguments> </cd:command> - <cd:command name="defconvertedargument" file="syst-aux.mkiv"> + <cd:command name="defconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="defconvertedcommand" file="syst-aux.mkiv"> + <cd:command name="defconvertedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="edefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="edefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="gdefconvertedcommand" file="syst-aux.mkiv"> + <cd:command name="gdefconvertedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xdefconvertedargument" file="syst-aux.mkiv"> + <cd:command name="xdefconvertedargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="showvalue" file="syst-aux.mkiv"> + <cd:command name="showvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelsemeaning" file="syst-aux.mkiv"> + <cd:command name="doifelsemeaning" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1887,7 +1907,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifmeaningelse" file="syst-aux.mkiv"> + <cd:command name="doifmeaningelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> @@ -1896,7 +1916,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesamestring" file="syst-aux.mkiv"> + <cd:command name="doifelsesamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1905,7 +1925,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestringelse" file="syst-aux.mkiv"> + <cd:command name="doifsamestringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1914,7 +1934,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsamestring" file="syst-aux.mkiv"> + <cd:command name="doifsamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1922,7 +1942,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotsamestring" file="syst-aux.mkiv"> + <cd:command name="doifnotsamestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -1930,7 +1950,7 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertToConstant" file="syst-aux.mkiv"> + <cd:command name="ConvertToConstant" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1938,7 +1958,7 @@ </cd:arguments> </cd:command> - <cd:command name="ConvertConstantAfter" file="syst-aux.mkiv"> + <cd:command name="ConvertConstantAfter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> @@ -1946,61 +1966,61 @@ </cd:arguments> </cd:command> - <cd:command name="assignifempty" file="syst-aux.mkiv"> + <cd:command name="assignifempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="grabuntil" file="syst-aux.mkiv"> + <cd:command name="grabuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="processbetween" file="syst-aux.mkiv"> + <cd:command name="processbetween" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntil" file="syst-aux.mkiv"> + <cd:command name="gobbleuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="gobbleuntilrelax" file="syst-aux.mkiv"> + <cd:command name="gobbleuntilrelax" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="relax"/> </cd:arguments> </cd:command> - <cd:command name="processuntil" file="syst-aux.mkiv"> + <cd:command name="processuntil" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="groupedcommand" file="syst-aux.mkiv"> + <cd:command name="groupedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="simplegroupedcommand" file="syst-aux.mkiv"> + <cd:command name="simplegroupedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="pickupgroupedcommand" file="syst-aux.mkiv"> + <cd:command name="pickupgroupedcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2008,35 +2028,35 @@ </cd:arguments> </cd:command> - <cd:command name="BeforePar" file="syst-aux.mkiv"> + <cd:command name="BeforePar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="AfterPar" file="syst-aux.mkiv"> + <cd:command name="AfterPar" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="GetPar" file="syst-aux.mkiv"/> + <cd:command name="GetPar" level="system" file="syst-aux.mkiv"/> - <cd:command name="GotoPar" file="syst-aux.mkiv"/> + <cd:command name="GotoPar" level="system" file="syst-aux.mkiv"/> - <cd:command name="dowithpargument" file="syst-aux.mkiv"> + <cd:command name="dowithpargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dowithwargument" file="syst-aux.mkiv"> + <cd:command name="dowithwargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dorepeatwithcommand" file="syst-aux.mkiv"> + <cd:command name="dorepeatwithcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:text"/> @@ -2046,7 +2066,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsestringinstring" file="syst-aux.mkiv"> + <cd:command name="doifelsestringinstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2055,7 +2075,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifstringinstringelse" file="syst-aux.mkiv"> + <cd:command name="doifstringinstringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2064,7 +2084,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoks" file="syst-aux.mkiv"> + <cd:command name="appendtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2072,7 +2092,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoks" file="syst-aux.mkiv"> + <cd:command name="prependtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2080,7 +2100,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendtoksonce" file="syst-aux.mkiv"> + <cd:command name="appendtoksonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2088,7 +2108,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependtoksonce" file="syst-aux.mkiv"> + <cd:command name="prependtoksonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2096,7 +2116,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseintoks" file="syst-aux.mkiv"> + <cd:command name="doifelseintoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2105,7 +2125,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifintokselse" file="syst-aux.mkiv"> + <cd:command name="doifintokselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-command"/> <cd:resolve name="argument-command"/> @@ -2114,25 +2134,25 @@ </cd:arguments> </cd:command> - <cd:command name="collecting" type="environment" file="syst-aux.mkiv"/> + <cd:command name="collecting" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="collect" type="environment" file="syst-aux.mkiv"/> + <cd:command name="collect" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="expandedcollect" type="environment" file="syst-aux.mkiv"/> + <cd:command name="expandedcollect" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="collect" file="syst-aux.mkiv"> + <cd:command name="collect" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="collectexpanded" file="syst-aux.mkiv"> + <cd:command name="collectexpanded" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="removetoks" file="syst-aux.mkiv"> + <cd:command name="removetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="from"/> @@ -2140,7 +2160,7 @@ </cd:arguments> </cd:command> - <cd:command name="appendetoks" file="syst-aux.mkiv"> + <cd:command name="appendetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2148,7 +2168,7 @@ </cd:arguments> </cd:command> - <cd:command name="prependetoks" file="syst-aux.mkiv"> + <cd:command name="prependetoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-command"/> <cd:delimiter name="to"/> @@ -2156,19 +2176,19 @@ </cd:arguments> </cd:command> - <cd:command name="flushtoks" file="syst-aux.mkiv"> + <cd:command name="flushtoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dotoks" file="syst-aux.mkiv"> + <cd:command name="dotoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="beforesplitstring" file="syst-aux.mkiv"> + <cd:command name="beforesplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2178,7 +2198,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftersplitstring" file="syst-aux.mkiv"> + <cd:command name="aftersplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2188,7 +2208,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitstring" file="syst-aux.mkiv"> + <cd:command name="splitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2200,7 +2220,7 @@ </cd:arguments> </cd:command> - <cd:command name="greedysplitstring" file="syst-aux.mkiv"> + <cd:command name="greedysplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2212,7 +2232,7 @@ </cd:arguments> </cd:command> - <cd:command name="beforetestandsplitstring" file="syst-aux.mkiv"> + <cd:command name="beforetestandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2222,7 +2242,7 @@ </cd:arguments> </cd:command> - <cd:command name="aftertestandsplitstring" file="syst-aux.mkiv"> + <cd:command name="aftertestandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2232,7 +2252,7 @@ </cd:arguments> </cd:command> - <cd:command name="testandsplitstring" file="syst-aux.mkiv"> + <cd:command name="testandsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="at"/> @@ -2244,7 +2264,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolon" file="syst-aux.mkiv"> + <cd:command name="splitatperiod" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2252,7 +2272,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcomma" file="syst-aux.mkiv"> + <cd:command name="splitatcomma" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2260,7 +2280,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatasterisk" file="syst-aux.mkiv"> + <cd:command name="splitatasterisk" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2268,7 +2288,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolon" file="syst-aux.mkiv"> + <cd:command name="splitatcolon" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2276,7 +2296,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitatcolons" file="syst-aux.mkiv"> + <cd:command name="splitatcolons" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:csname/> @@ -2284,7 +2304,7 @@ </cd:arguments> </cd:command> - <cd:command name="removesubstring" file="syst-aux.mkiv"> + <cd:command name="removesubstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2294,81 +2314,81 @@ </cd:arguments> </cd:command> - <cd:command name="appendtocommalist" file="syst-aux.mkiv"> + <cd:command name="appendtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="prependtocommalist" file="syst-aux.mkiv"> + <cd:command name="prependtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="addtocommalist" file="syst-aux.mkiv"> + <cd:command name="addtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pretocommalist" file="syst-aux.mkiv"> + <cd:command name="pretocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustdoifelseinset" file="syst-aux.mkiv"> + <cd:command name="robustdoifelseinset" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="robustdoifinsetelse" file="syst-aux.mkiv"> + <cd:command name="robustdoifinsetelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="robustaddtocommalist" file="syst-aux.mkiv"> + <cd:command name="robustaddtocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="robustpretocommalist" file="syst-aux.mkiv"> + <cd:command name="robustpretocommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="xsplitstring" file="syst-aux.mkiv"> + <cd:command name="xsplitstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="removefromcommalist" file="syst-aux.mkiv"> + <cd:command name="removefromcommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="substituteincommalist" file="syst-aux.mkiv"> + <cd:command name="substituteincommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-text"/> @@ -2376,14 +2396,14 @@ </cd:arguments> </cd:command> - <cd:command name="replaceincommalist" file="syst-aux.mkiv"> + <cd:command name="replaceincommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="globalprocesscommalist" file="syst-aux.mkiv"> + <cd:command name="globalprocesscommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="cd:command"/> @@ -2392,104 +2412,104 @@ </cd:arguments> </cd:command> - <cd:command name="withoutpt" file="syst-aux.mkiv"> + <cd:command name="withoutpt" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="PtToCm" file="syst-aux.mkiv"> + <cd:command name="PtToCm" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="dimensiontocount" file="syst-aux.mkiv"> + <cd:command name="dimensiontocount" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="numberofpoints" file="syst-aux.mkiv"> + <cd:command name="numberofpoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="swapdimens" file="syst-aux.mkiv"> + <cd:command name="swapdimens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapcounts" file="syst-aux.mkiv"> + <cd:command name="swapcounts" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="swapmacros" file="syst-aux.mkiv"> + <cd:command name="swapmacros" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapdimens" file="syst-aux.mkiv"> + <cd:command name="globalswapdimens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapcounts" file="syst-aux.mkiv"> + <cd:command name="globalswapcounts" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalswapmacros" file="syst-aux.mkiv"> + <cd:command name="globalswapmacros" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpushmacro" file="syst-aux.mkiv"> + <cd:command name="globalpushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpushmacro" file="syst-aux.mkiv"> + <cd:command name="localpushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="globalpopmacro" file="syst-aux.mkiv"> + <cd:command name="globalpopmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="localpopmacro" file="syst-aux.mkiv"> + <cd:command name="localpopmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="pushmacro" file="syst-aux.mkiv"> + <cd:command name="pushmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="popmacro" file="syst-aux.mkiv"> + <cd:command name="popmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -2515,14 +2535,14 @@ </cd:arguments> </cd:command> - <cd:command name="hsizefraction" file="syst-aux.mkiv"> + <cd:command name="hsizefraction" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="doifvalue" file="syst-aux.mkiv"> + <cd:command name="doifvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2530,7 +2550,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotvalue" file="syst-aux.mkiv"> + <cd:command name="doifnotvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2538,7 +2558,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsevalue" file="syst-aux.mkiv"> + <cd:command name="doifelsevalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2547,7 +2567,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvalueelse" file="syst-aux.mkiv"> + <cd:command name="doifvalueelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -2556,21 +2576,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothing" file="syst-aux.mkiv"> + <cd:command name="doifnothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifsomething" file="syst-aux.mkiv"> + <cd:command name="doifsomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsenothing" file="syst-aux.mkiv"> + <cd:command name="doifelsenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2578,7 +2598,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnothingelse" file="syst-aux.mkiv"> + <cd:command name="doifnothingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2586,7 +2606,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsesomething" file="syst-aux.mkiv"> + <cd:command name="doifelsesomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2594,7 +2614,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomethingelse" file="syst-aux.mkiv"> + <cd:command name="doifsomethingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2602,21 +2622,21 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothing" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifvaluesomething" file="syst-aux.mkiv"> + <cd:command name="doifvaluesomething" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsevaluenothing" file="syst-aux.mkiv"> + <cd:command name="doifelsevaluenothing" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2624,7 +2644,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifvaluenothingelse" file="syst-aux.mkiv"> + <cd:command name="doifvaluenothingelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2632,7 +2652,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifelseemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2640,7 +2660,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalueelse" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalueelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -2648,55 +2668,55 @@ </cd:arguments> </cd:command> - <cd:command name="doifemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotemptyvalue" file="syst-aux.mkiv"> + <cd:command name="doifnotemptyvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelseallcommon" file="syst-aux.mkiv"> + <cd:command name="doifelseallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifallcommonelse" file="syst-aux.mkiv"> + <cd:command name="doifallcommonelse" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doifallcommon" file="syst-aux.mkiv"> + <cd:command name="doifallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotallcommon" file="syst-aux.mkiv"> + <cd:command name="doifnotallcommon" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:resolve name="argument-content-list"/> - <cd:resolve name="argument-content-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="dodoubleemptywithset" file="syst-aux.mkiv"> + <cd:command name="dodoubleemptywithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2704,7 +2724,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleemptywithset" file="syst-aux.mkiv"> + <cd:command name="dotripleemptywithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list-optional"/> @@ -2713,7 +2733,7 @@ </cd:arguments> </cd:command> - <cd:command name="dodoubleargumentwithset" file="syst-aux.mkiv"> + <cd:command name="dodoubleargumentwithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2721,7 +2741,7 @@ </cd:arguments> </cd:command> - <cd:command name="dotripleargumentwithset" file="syst-aux.mkiv"> + <cd:command name="dotripleargumentwithset" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="keyword-dummy-list"/> @@ -2730,7 +2750,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripcharacter" file="syst-aux.mkiv"> + <cd:command name="stripcharacter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-character"/> <cd:delimiter name="from"/> @@ -2740,7 +2760,7 @@ </cd:arguments> </cd:command> - <cd:command name="stripspaces" file="syst-aux.mkiv"> + <cd:command name="stripspaces" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="from"/> <cd:resolve name="string-text"/> @@ -2749,7 +2769,7 @@ </cd:arguments> </cd:command> - <cd:command name="unspacestring" file="syst-aux.mkiv"> + <cd:command name="unspacestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2757,14 +2777,14 @@ </cd:arguments> </cd:command> - <cd:command name="executeifdefined" file="syst-aux.mkiv"> + <cd:command name="executeifdefined" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesomespace" file="syst-aux.mkiv"> + <cd:command name="doifelsesomespace" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2772,7 +2792,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsomespaceelse" file="syst-aux.mkiv"> + <cd:command name="doifsomespaceelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -2780,7 +2800,7 @@ </cd:arguments> </cd:command> - <cd:command name="processseparatedlist" file="syst-aux.mkiv"> + <cd:command name="processseparatedlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -2791,7 +2811,7 @@ </cd:arguments> </cd:command> - <cd:command name="processlist" file="syst-aux.mkiv"> + <cd:command name="processlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-character"/> <cd:resolve name="argument-character"/> @@ -2800,14 +2820,14 @@ </cd:arguments> </cd:command> - <cd:command name="processassignlist" file="syst-aux.mkiv"> + <cd:command name="processassignlist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text-list"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="untexargument" file="syst-aux.mkiv"> + <cd:command name="untexargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:delimiter name="to"/> @@ -2815,7 +2835,7 @@ </cd:arguments> </cd:command> - <cd:command name="untexcommand" file="syst-aux.mkiv"> + <cd:command name="untexcommand" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-csname"/> <cd:delimiter name="to"/> @@ -2823,35 +2843,35 @@ </cd:arguments> </cd:command> - <cd:command name="PointsToBigPoints" file="syst-aux.mkiv"> + <cd:command name="PointsToBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToWholeBigPoints" file="syst-aux.mkiv"> + <cd:command name="PointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToBigPoints" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="ScaledPointsToWholeBigPoints" file="syst-aux.mkiv"> + <cd:command name="ScaledPointsToWholeBigPoints" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="PointsToReal" file="syst-aux.mkiv"> + <cd:command name="PointsToReal" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:csname/> @@ -2860,19 +2880,19 @@ <cd:command name="dontleavehmode" file="syst-aux.mkiv"/> - <cd:command name="utfupper" file="syst-aux.mkiv"> + <cd:command name="utfupper" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="utflower" file="syst-aux.mkiv"> + <cd:command name="utflower" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="uppercasestring" file="syst-aux.mkiv"> + <cd:command name="uppercasestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2880,7 +2900,7 @@ </cd:arguments> </cd:command> - <cd:command name="lowercasestring" file="syst-aux.mkiv"> + <cd:command name="lowercasestring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2888,7 +2908,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttoken" file="syst-aux.mkiv"> + <cd:command name="counttoken" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="in"/> @@ -2898,7 +2918,7 @@ </cd:arguments> </cd:command> - <cd:command name="counttokens" file="syst-aux.mkiv"> + <cd:command name="counttokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -2906,7 +2926,7 @@ </cd:arguments> </cd:command> - <cd:command name="splitofftokens" file="syst-aux.mkiv"> + <cd:command name="splitofftokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="from"/> @@ -2916,7 +2936,7 @@ </cd:arguments> </cd:command> - <cd:command name="handletokens" file="syst-aux.mkiv"> + <cd:command name="handletokens" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="with"/> @@ -2924,11 +2944,11 @@ </cd:arguments> </cd:command> - <cd:command name="settrialtypesetting" file="syst-aux.mkiv"/> + <cd:command name="settrialtypesetting" level="system" file="syst-aux.mkiv"/> - <cd:command name="resettrialtypesetting" file="syst-aux.mkiv"/> + <cd:command name="resettrialtypesetting" level="system" file="syst-aux.mkiv"/> - <cd:command name="iftrialtypesetting" file="syst-aux.mkiv"> + <cd:command name="iftrialtypesetting" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-true"/> <cd:delimiter name="else"/> @@ -2937,64 +2957,64 @@ </cd:arguments> </cd:command> - <cd:command name="integerrounding" file="syst-aux.mkiv"> + <cd:command name="integerrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="onedigitrounding" file="syst-aux.mkiv"> + <cd:command name="onedigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="twodigitrounding" file="syst-aux.mkiv"> + <cd:command name="twodigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="threedigitrounding" file="syst-aux.mkiv"> + <cd:command name="threedigitrounding" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="processcontent" file="syst-aux.mkiv"> + <cd:command name="processcontent" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="dogobblesingleempty" file="syst-aux.mkiv"> + <cd:command name="dogobblesingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="dogobbledoubleempty" file="syst-aux.mkiv"> + <cd:command name="dogobbledoubleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="gobblesingleempty" file="syst-aux.mkiv"> + <cd:command name="gobblesingleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="gobbledoubleempty" file="syst-aux.mkiv"> + <cd:command name="gobbledoubleempty" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-dummy-optional"/> <cd:resolve name="keyword-dummy-optional"/> </cd:arguments> </cd:command> - <cd:command name="doifelsesometoks" file="syst-aux.mkiv"> + <cd:command name="doifelsesometoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3002,7 +3022,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometokselse" file="syst-aux.mkiv"> + <cd:command name="doifsometokselse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> @@ -3010,71 +3030,71 @@ </cd:arguments> </cd:command> - <cd:command name="doifsometoks" file="syst-aux.mkiv"> + <cd:command name="doifsometoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifemptytoks" file="syst-aux.mkiv"> + <cd:command name="doifemptytoks" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="strictinspectnextcharacter" type="environment" file="syst-aux.mkiv"/> + <cd:command name="strictinspectnextcharacter" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="strictdoifelsenextoptional" file="syst-aux.mkiv"> + <cd:command name="strictdoifelsenextoptional" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="strictdoifnextoptionalelse" file="syst-aux.mkiv"> + <cd:command name="strictdoifnextoptionalelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="gobblespacetokens" file="syst-aux.mkiv"/> + <cd:command name="gobblespacetokens" level="system" file="syst-aux.mkiv"/> - <cd:command name="verbatimstring" file="syst-aux.mkiv"> + <cd:command name="verbatimstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="lastdigit" file="syst-aux.mkiv"> + <cd:command name="lastdigit" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="lasttwodigits" file="syst-aux.mkiv"> + <cd:command name="lasttwodigits" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="serializedcommalist" file="syst-aux.mkiv"/> + <cd:command name="serializedcommalist" level="system" file="syst-aux.mkiv"/> - <cd:command name="serializecommalist" file="syst-aux.mkiv"> + <cd:command name="serializecommalist" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-command-list"/> </cd:arguments> </cd:command> - <cd:command name="purenumber" file="syst-aux.mkiv"> + <cd:command name="purenumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="filterfromvalue" file="syst-aux.mkiv"> + <cd:command name="filterfromvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -3082,15 +3102,15 @@ </cd:arguments> </cd:command> - <cd:command name="filterfromnext" file="syst-aux.mkiv"> + <cd:command name="filterfromnext" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> - <cd:resolve name="argument-content-optional"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> + <cd:content optional="yes"/> </cd:arguments> </cd:command> @@ -3156,7 +3176,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimension" file="syst-aux.mkiv"> + <cd:command name="doifelsedimension" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3164,7 +3184,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimensionelse" file="syst-aux.mkiv"> + <cd:command name="doifdimensionelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3172,7 +3192,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedimenstring" file="syst-aux.mkiv"> + <cd:command name="doifelsedimenstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3180,7 +3200,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifdimenstringelse" file="syst-aux.mkiv"> + <cd:command name="doifdimenstringelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3188,23 +3208,23 @@ </cd:arguments> </cd:command> - <cd:command name="compresult" file="syst-aux.mkiv"/> + <cd:command name="compresult" level="system" file="syst-aux.mkiv"/> - <cd:command name="comparedimension" file="syst-aux.mkiv"> + <cd:command name="comparedimension" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="comparedimensioneps" file="syst-aux.mkiv"> + <cd:command name="comparedimensioneps" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="letcscsname" file="syst-aux.mkiv"> + <cd:command name="letcscsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:delimiter name="csname"/> @@ -3213,7 +3233,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecs" file="syst-aux.mkiv"> + <cd:command name="letcsnamecs" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3222,7 +3242,7 @@ </cd:arguments> </cd:command> - <cd:command name="letcsnamecsname" file="syst-aux.mkiv"> + <cd:command name="letcsnamecsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:delimiter name="csname"/> <cd:resolve name="string-name"/> @@ -3233,20 +3253,20 @@ </cd:arguments> </cd:command> - <cd:command name="addvalue" file="syst-aux.mkiv"> + <cd:command name="addvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="unspaced" file="syst-aux.mkiv"> + <cd:command name="unspaced" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="unspaceargument" file="syst-aux.mkiv"> + <cd:command name="unspaceargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-text"/> <cd:delimiter name="to"/> @@ -3254,14 +3274,14 @@ </cd:arguments> </cd:command> - <cd:command name="unspaceafter" file="syst-aux.mkiv"> + <cd:command name="unspaceafter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="doifelsehasspace" file="syst-aux.mkiv"> + <cd:command name="doifelsehasspace" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3269,7 +3289,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifhasspaceelse" file="syst-aux.mkiv"> + <cd:command name="doifhasspaceelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-true"/> @@ -3277,25 +3297,25 @@ </cd:arguments> </cd:command> - <cd:command name="setflag" file="syst-aux.mkiv"> + <cd:command name="setflag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="resetflag" file="syst-aux.mkiv"> + <cd:command name="resetflag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="flag" file="syst-aux.mkiv"> + <cd:command name="flag" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseflagged" file="syst-aux.mkiv"> + <cd:command name="doifelseflagged" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3303,7 +3323,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifflaggedelse" file="syst-aux.mkiv"> + <cd:command name="doifflaggedelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> @@ -3311,14 +3331,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifnotflagged" file="syst-aux.mkiv"> + <cd:command name="doifnotflagged" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="inheritparameter" file="syst-aux.mkiv"> + <cd:command name="inheritparameter" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> @@ -3326,7 +3346,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsenonzeropositive" file="syst-aux.mkiv"> + <cd:command name="doifelsenonzeropositive" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3334,7 +3354,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifnonzeropositiveelse" file="syst-aux.mkiv"> + <cd:command name="doifnonzeropositiveelse" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -3342,53 +3362,53 @@ </cd:arguments> </cd:command> - <cd:command name="getrawparameters" file="syst-aux.mkiv"> + <cd:command name="getrawparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getraweparameters" file="syst-aux.mkiv"> + <cd:command name="getraweparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getrawgparameters" file="syst-aux.mkiv"> + <cd:command name="getrawgparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="getrawxparameters" file="syst-aux.mkiv"> + <cd:command name="getrawxparameters" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="assignment-userdata-list"/> </cd:arguments> </cd:command> - <cd:command name="unprotected" file="syst-aux.mkiv"> + <cd:command name="unprotected" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="string-content"/> <cd:delimiter name="par"/> </cd:arguments> </cd:command> - <cd:command name="resettimer" file="syst-aux.mkiv"/> + <cd:command name="resettimer" level="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedtime" file="syst-aux.mkiv"/> + <cd:command name="elapsedtime" level="system" file="syst-aux.mkiv"/> - <cd:command name="elapsedseconds" file="syst-aux.mkiv"/> + <cd:command name="elapsedseconds" level="system" file="syst-aux.mkiv"/> - <cd:command name="currentfeaturetest" file="syst-aux.mkiv"/> + <cd:command name="currentfeaturetest" level="system" file="syst-aux.mkiv"/> - <cd:command name="testfeature" file="syst-aux.mkiv"> + <cd:command name="testfeature" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content"/> + <cd:content/> </cd:arguments> </cd:command> @@ -3398,62 +3418,62 @@ </cd:arguments> </cd:command> - <cd:command name="testfeatureonce" file="syst-aux.mkiv"> + <cd:command name="testfeatureonce" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> - <cd:resolve name="argument-content"/> + <cd:content/> </cd:arguments> </cd:command> - <cd:command name="freezedimenmacro" file="syst-aux.mkiv"> + <cd:command name="freezedimenmacro" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="negated" file="syst-aux.mkiv"> + <cd:command name="negated" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="assigndimen" file="syst-aux.mkiv"> + <cd:command name="assigndimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-dimension"/> </cd:arguments> </cd:command> - <cd:command name="appendvalue" file="syst-aux.mkiv"> + <cd:command name="appendvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="appendgvalue" file="syst-aux.mkiv"> + <cd:command name="appendgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="prependvalue" file="syst-aux.mkiv"> + <cd:command name="prependvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="prependgvalue" file="syst-aux.mkiv"> + <cd:command name="prependgvalue" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="processranges" file="syst-aux.mkiv"> + <cd:command name="processranges" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:number"/> @@ -3463,7 +3483,7 @@ </cd:arguments> </cd:command> - <cd:command name="dowithrange" file="syst-aux.mkiv"> + <cd:command name="dowithrange" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> <cd:constant type="cd:number"/> @@ -3473,11 +3493,11 @@ </cd:arguments> </cd:command> - <cd:command name="ignoreimplicitspaces" file="syst-aux.mkiv"/> + <cd:command name="ignoreimplicitspaces" level="system" file="syst-aux.mkiv"/> - <cd:command name="nointerference" type="environment" file="syst-aux.mkiv"/> + <cd:command name="nointerference" type="environment" level="system" file="syst-aux.mkiv"/> - <cd:command name="expandcheckedcsname" file="syst-aux.mkiv"> + <cd:command name="expandcheckedcsname" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-key"/> @@ -3485,43 +3505,43 @@ </cd:arguments> </cd:command> - <cd:command name="docheckedpair" file="syst-aux.mkiv"> + <cd:command name="docheckedpair" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> </cd:arguments> </cd:command> - <cd:command name="constantnumber" file="syst-aux.mkiv"> + <cd:command name="constantnumber" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantnumberargument" file="syst-aux.mkiv"> + <cd:command name="constantnumberargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimen" file="syst-aux.mkiv"> + <cd:command name="constantdimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantdimenargument" file="syst-aux.mkiv"> + <cd:command name="constantdimenargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="constantemptyargument" file="syst-aux.mkiv"> + <cd:command name="constantemptyargument" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> </cd:command> - <cd:command name="getsubstring" file="syst-aux.mkiv"> + <cd:command name="getsubstring" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-number"/> @@ -3529,7 +3549,7 @@ </cd:arguments> </cd:command> - <cd:command name="converteddimen" file="syst-aux.mkiv"> + <cd:command name="converteddimen" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-dimension"/> <cd:keywords delimiters="braces"> @@ -3549,11 +3569,78 @@ </cd:arguments> </cd:command> - <cd:command name="ntimes" file="syst-aux.mkiv"> + <cd:command name="ntimes" level="system" file="syst-aux.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="expdoifelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoif" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifnot" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifcommonelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifelseinset" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="expdoifinsetelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-list"/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + + <cd:command name="luaexpr" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + +</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 02c4bece9..93717af21 100644 --- a/tex/context/interface/mkiv/i-systemlog.xml +++ b/tex/context/interface/mkiv/i-systemlog.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="systemlog" file="core-sys.mkiv"> + <cd:command name="systemlog" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="systemlogfirst" file="core-sys.mkiv"> + <cd:command name="systemlogfirst" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="systemloglast" file="core-sys.mkiv"> + <cd:command name="systemloglast" level="system" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-text"/> diff --git a/tex/context/interface/mkiv/i-table.xml b/tex/context/interface/mkiv/i-table.xml index 950a9ff34..177bc2eef 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" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" category="tables" level="document" 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" file="tabl-tab.mkiv"> + <cd:command name="table" type="environment" variant="name" category="tables" level="document" 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" file="tabl-tab.mkiv"> + <cd:command name="definetabletemplate" category="tables" level="style" 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" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> <cd:arguments> <cd:template/> </cd:arguments> </cd:command> - <cd:command name="tables" type="environment" variant="name" file="tabl-tab.mkiv"> + <cd:command name="tables" type="environment" variant="name" category="tables" level="document" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tablehead" type="environment" file="tabl-tab.mkiv"> + <cd:command name="tablehead" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="tabletail" type="environment" file="tabl-tab.mkiv"> + <cd:command name="tabletail" type="environment" category="tables" level="document" file="tabl-tab.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="setuptables" file="tabl-tab.mkiv"> + <cd:command name="setuptables" category="tables" file="tabl-tab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="text"> diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml index be3a602ac..a8c318150 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" file="tabl-tbl.mkiv"> + <cd:command name="definetabulation" category="tables" level="style" 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" file="tabl-tbl.mkiv"> + <cd:command name="setuptabulation" category="tables" level="style" 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" file="tabl-tbl.mkiv"> + <cd:command name="tabulation" type="environment" generated="yes" variant="example" category="tables" level="document" file="tabl-tbl.mkiv"> <cd:sequence> <cd:variable value="tabulation"/> </cd:sequence> @@ -111,7 +111,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetabulate" file="tabl-tbl.mkiv"> + <cd:command name="definetabulate" category="tables" level="style" 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" file="tabl-tbl.mkiv"> + <cd:command name="setuptabulate" category="tables" level="style" 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" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" category="tables" level="document" 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" file="tabl-tbl.mkiv"> + <cd:command name="tabulate" type="environment" generated="yes" variant="instance" category="tables" level="document" file="tabl-tbl.mkiv"> <cd:sequence> <cd:instance value="tabulate"/> </cd:sequence> @@ -153,25 +153,25 @@ </cd:instances> </cd:command> - <cd:command name="tabulatehead" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="tabulatehead" type="environment" category="tables" level="document" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulatetail" type="environment" file="tabl-tbl.mkiv"> + <cd:command name="tabulatetail" type="environment" category="tables" level="document" file="tabl-tbl.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="tabulaterule" file="tabl-tbl.mkiv"/> + <cd:command name="tabulaterule" category="tables" level="document" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateline" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateline" category="tables" level="document" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautorule" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautorule" category="tables" file="tabl-tbl.mkiv"/> - <cd:command name="tabulateautoline" file="tabl-tbl.mkiv"/> + <cd:command name="tabulateautoline" category="tables" file="tabl-tbl.mkiv"/> <!-- diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index 063a0c436..1c666cf25 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" file="strc-tag.mkiv"> + <cd:command name="setuptagging" level="style" file="strc-tag.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="state"> @@ -18,7 +18,7 @@ </cd:arguments> </cd:command> - <cd:command name="tagged" type="environment" begin="dostart" end="dostop" file="strc-tag.mkiv"> + <cd:command name="tagged" type="environment" begin="dostart" end="dostop" level="system" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -32,7 +32,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseinelement" file="strc-tag.mkiv"> + <cd:command name="doifelseinelement" level="system" 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" file="strc-tag.mkiv"> + <cd:command name="doifinelementelse" level="system" 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" file="strc-tag.mkiv"> + <cd:command name="taggedlabeltexts" level="system" 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" file="strc-tag.mkiv"> + <cd:command name="namedtaggedlabeltexts" level="system" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-textbackground.xml b/tex/context/interface/mkiv/i-textbackground.xml index bc16ffa8d..335fe59fc 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" file="anch-bck.mkiv"> + <cd:command name="definetextbackground" level="style" 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" file="anch-bck.mkiv"> + <cd:command name="setuptextbackground" level="style" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" level="document" file="anch-bck.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> @@ -122,7 +122,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" type="environment" generated="yes" variant="example" file="anch-bck.mkiv"> + <cd:command name="textbackground" type="environment" generated="yes" variant="example" level="document" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -133,7 +133,7 @@ </cd:arguments> </cd:command> - <cd:command name="textbackground" generated="yes" variant="example" file="anch-bck.mkiv"> + <cd:command name="textbackground" generated="yes" variant="example" level="document" file="anch-bck.mkiv"> <cd:sequence> <cd:variable value="textbackground"/> </cd:sequence> @@ -142,6 +142,6 @@ </cd:arguments> </cd:command> - <cd:command name="textbackgroundmanual" type="environment" file="anch-bck.mkiv"/> + <cd:command name="textbackgroundmanual" type="environment" level="system" file="anch-bck.mkiv"/> </cd:interface> diff --git a/tex/context/interface/mkiv/i-textflow.xml b/tex/context/interface/mkiv/i-textflow.xml index edcf03492..8fbc377fd 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" file="page-flw.mkiv"> + <cd:command name="definetextflow" level="style" 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" file="page-flw.mkiv"> + <cd:command name="setuptextflow" level="style" file="page-flw.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="doifelsetextflowcollector" file="page-flw.mkiv"> + <cd:command name="doifelsetextflowcollector" level="system" 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" file="page-flw.mkiv"> + <cd:command name="doiftextflowcollectorelse" level="system" 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" file="page-flw.mkiv"> + <cd:command name="doifelsetextflow" level="system" 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" file="page-flw.mkiv"> + <cd:command name="doiftextflowelse" level="system" file="page-flw.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-textrule.xml b/tex/context/interface/mkiv/i-textrule.xml index a849f44e1..11b4a27c3 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" file="pack-mrl.mkiv"> + <cd:command name="setuptextrules" level="style" 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" file="pack-mrl.mkiv"> + <cd:command name="textrule" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="top"/> @@ -63,7 +63,7 @@ </cd:arguments> </cd:command> - <cd:command name="textrule" type="environment" file="pack-mrl.mkiv"> + <cd:command name="textrule" type="environment" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index 009949d35..b36980fe4 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -96,7 +96,7 @@ --> - <cd:command name="setuplayouttext" file="page-txt.mkvi"> + <cd:command name="setuplayouttext" category="layout" level="style" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -165,7 +165,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptop" file="page-txt.mkvi"> + <cd:command name="setuptop" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupheader" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setuptext" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupfooter" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupbottom" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="doifelselayouttextline" category="layout" level="system" 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" file="page-txt.mkvi"> + <cd:command name="doiflayouttextlineelse" category="layout" level="system" 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" file="page-txt.mkvi"> + <cd:command name="doifelselayoutsomeline" category="layout" level="system" 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" file="page-txt.mkvi"> + <cd:command name="doiflayoutsomelineelse" category="layout" level="system" 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" file="page-txt.mkvi"/> + <cd:command name="noheaderandfooterlines" category="layout" file="page-txt.mkvi"/> - <cd:command name="notopandbottomlines" file="page-txt.mkvi"/> + <cd:command name="notopandbottomlines" category="layout" file="page-txt.mkvi"/> - <cd:command name="setuptoptexts" file="page-txt.mkvi"> + <cd:command name="setuptoptexts" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupheadertexts" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setuptexttexts" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupfootertexts" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="setupbottomtexts" category="layout" level="style" 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" file="page-txt.mkvi"> + <cd:command name="settextcontent" category="layout" level="style" file="page-txt.mkvi"> <cd:arguments> <cd:keywords> <cd:constant type="top"/> @@ -360,7 +360,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetext" file="page-txt.mkvi"> + <cd:command name="definetext" category="layout" level="style" file="page-txt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:keywords> diff --git a/tex/context/interface/mkiv/i-thinrule.xml b/tex/context/interface/mkiv/i-thinrule.xml index b74286e5e..758b6fea2 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" file="pack-mrl.mkiv"> + <cd:command name="setupthinrules" level="style" 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" file="pack-mrl.mkiv"/> + <cd:command name="thinrule" level="document" file="pack-mrl.mkiv"/> - <cd:command name="hairline" file="pack-mrl.mkiv"/> + <cd:command name="hairline" level="document" file="pack-mrl.mkiv"/> - <cd:command name="thinrules" file="pack-mrl.mkiv"> + <cd:command name="thinrules" level="document" file="pack-mrl.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setupthinrules"/> diff --git a/tex/context/interface/mkiv/i-token.xml b/tex/context/interface/mkiv/i-token.xml index 2cc0f4674..a0b3eb916 100644 --- a/tex/context/interface/mkiv/i-token.xml +++ b/tex/context/interface/mkiv/i-token.xml @@ -4,25 +4,25 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="tokens" type="environment" file="toks-tra.mkiv"> + <cd:command name="tokens" type="environment" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="flushtokens" file="toks-tra.mkiv"> + <cd:command name="flushtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="showtokens" file="toks-tra.mkiv"> + <cd:command name="showtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="testtokens" file="toks-tra.mkiv"> + <cd:command name="testtokens" level="system" file="toks-tra.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-tolerance.xml b/tex/context/interface/mkiv/i-tolerance.xml index b33fef05d..4a369541b 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" file="spac-hor.mkiv"> + <cd:command name="setuptolerance" level="style" file="spac-hor.mkiv"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="horizontal"/> diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml index f46ffb091..8010900e4 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" file="scrn-fld.mkvi"> + <cd:command name="definetooltip" level="style" 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" file="scrn-fld.mkvi"> + <cd:command name="setuptooltip" level="style" file="scrn-fld.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> diff --git a/tex/context/interface/mkiv/i-tracker.xml b/tex/context/interface/mkiv/i-tracker.xml index 4dbc31886..26384f11c 100644 --- a/tex/context/interface/mkiv/i-tracker.xml +++ b/tex/context/interface/mkiv/i-tracker.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="installtextracker" file="trac-ctx.mkiv"> + <cd:command name="installtextracker" level="system" file="trac-ctx.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="installtexdirective" file="trac-ctx.mkiv"> + <cd:command name="installtexdirective" level="system" file="trac-ctx.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> @@ -20,13 +20,13 @@ </cd:arguments> </cd:command> - <cd:command name="enabletrackers" file="trac-deb.mkiv"> + <cd:command name="enabletrackers" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabletrackers" file="trac-deb.mkiv"> + <cd:command name="disabletrackers" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> @@ -36,13 +36,13 @@ <cd:command name="showtrackers" file="trac-deb.mkiv"/> - <cd:command name="enabledirectives" file="trac-deb.mkiv"> + <cd:command name="enabledirectives" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disabledirectives" file="trac-deb.mkiv"> + <cd:command name="disabledirectives" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> @@ -50,13 +50,13 @@ <cd:command name="showdirectives" file="trac-deb.mkiv"/> - <cd:command name="enableexperiments" file="trac-deb.mkiv"> + <cd:command name="enableexperiments" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="disableexperiments" file="trac-deb.mkiv"> + <cd:command name="disableexperiments" level="style" file="trac-deb.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-translate.xml b/tex/context/interface/mkiv/i-translate.xml index ba3510f0b..6a033e0dc 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" file="m-translate.mkiv"> + <cd:command name="translateinput" category="language" level="style" file="m-translate.mkiv"> <cd:arguments> <cd:resolve name="keyword-text"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="resetinputtranslation" file="m-translate.mkiv"/> + <cd:command name="resetinputtranslation" category="language" file="m-translate.mkiv"/> - <cd:command name="enableinputtranslation" file="m-translate.mkiv"/> + <cd:command name="enableinputtranslation" category="language" level="style" file="m-translate.mkiv"/> - <cd:command name="disableinputtranslation" file="m-translate.mkiv"/> + <cd:command name="disableinputtranslation" category="language" level="style" file="m-translate.mkiv"/> - <cd:command name="readtranslatedfile" file="m-translate.mkiv"> + <cd:command name="readtranslatedfile" 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 f4f77c526..b0b052a0f 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" file="lang-lab.mkiv"> + <cd:command name="translate" 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" file="lang-lab.mkiv"> + <cd:command name="assigntranslation" category="language" file="lang-lab.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="cd:language"> diff --git a/tex/context/interface/mkiv/i-twopassdata.xml b/tex/context/interface/mkiv/i-twopassdata.xml index 508294f08..63783d040 100644 --- a/tex/context/interface/mkiv/i-twopassdata.xml +++ b/tex/context/interface/mkiv/i-twopassdata.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="immediatesavetwopassdata" file="core-two.mkiv"> + <cd:command name="immediatesavetwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -12,7 +12,7 @@ </cd:arguments> </cd:command> - <cd:command name="savetwopassdata" file="core-two.mkiv"> + <cd:command name="savetwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -20,7 +20,7 @@ </cd:arguments> </cd:command> - <cd:command name="lazysavetwopassdata" file="core-two.mkiv"> + <cd:command name="lazysavetwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -28,7 +28,7 @@ </cd:arguments> </cd:command> - <cd:command name="savetaggedtwopassdata" file="core-two.mkiv"> + <cd:command name="savetaggedtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -37,7 +37,7 @@ </cd:arguments> </cd:command> - <cd:command name="lazysavetaggedtwopassdata" file="core-two.mkiv"> + <cd:command name="lazysavetaggedtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-number"/> @@ -46,57 +46,57 @@ </cd:arguments> </cd:command> - <cd:command name="definetwopasslist" file="core-two.mkiv"> + <cd:command name="definetwopasslist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdata" file="core-two.mkiv"> + <cd:command name="gettwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="checktwopassdata" file="core-two.mkiv"> + <cd:command name="checktwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="findtwopassdata" file="core-two.mkiv"> + <cd:command name="findtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getfirsttwopassdata" file="core-two.mkiv"> + <cd:command name="getfirsttwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getlasttwopassdata" file="core-two.mkiv"> + <cd:command name="getlasttwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="getnamedtwopassdatalist" file="core-two.mkiv"> + <cd:command name="getnamedtwopassdatalist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:csname/> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="gettwopassdatalist" file="core-two.mkiv"> + <cd:command name="gettwopassdatalist" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="doifelseintwopassdata" file="core-two.mkiv"> + <cd:command name="doifelseintwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifintwopassdataelse" file="core-two.mkiv"> + <cd:command name="doifintwopassdataelse" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> @@ -114,7 +114,7 @@ </cd:arguments> </cd:command> - <cd:command name="getfromtwopassdata" file="core-two.mkiv"> + <cd:command name="getfromtwopassdata" level="system" file="core-two.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml index 3380585dc..031e3c575 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" file="phys-dim.mkiv"> + <cd:command name="digits" level="document" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="digits" variant="string" file="phys-dim.mkiv"> + <cd:command name="digits" variant="string" level="document" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="string-number"/> </cd:arguments> </cd:command> - <cd:command name="defineunit" file="phys-dim.mkiv"> + <cd:command name="defineunit" level="style" 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" file="phys-dim.mkiv"> + <cd:command name="setupunit" level="style" 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" file="phys-dim.mkiv"> + <cd:command name="unit" generated="yes" variant="instance" level="document" file="phys-dim.mkiv"> <cd:sequence> <cd:instance value="unit"/> </cd:sequence> @@ -97,21 +97,21 @@ --> - <cd:command name="installunitsseparator" file="phys-dim.mkiv"> + <cd:command name="installunitsseparator" level="system" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="installunitsspace" file="phys-dim.mkiv"> + <cd:command name="installunitsspace" level="system" file="phys-dim.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-command"/> </cd:arguments> </cd:command> - <cd:command name="registerunit" file="phys-dim.mkiv"> + <cd:command name="registerunit" level="style" file="phys-dim.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="prefix"/> diff --git a/tex/context/interface/mkiv/i-variables.xml b/tex/context/interface/mkiv/i-variables.xml index 63b34329c..388fd3eed 100644 --- a/tex/context/interface/mkiv/i-variables.xml +++ b/tex/context/interface/mkiv/i-variables.xml @@ -135,7 +135,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsevariable" file="core-env.mkiv"> + <cd:command name="doifelsevariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifvariableelse" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifnotvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifelseemptyvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifemptyvariableelse" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifemptyvariable" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifnotemptyvariable" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -203,7 +203,7 @@ </cd:arguments> </cd:command> - <cd:command name="getvariabledefault" file="core-env.mkiv"> + <cd:command name="getvariabledefault" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-key"/> @@ -227,7 +227,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseenv" file="core-env.mkiv"> + <cd:command name="doifelseenv" level="system" 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" file="core-env.mkiv"> + <cd:command name="doifenvelse" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -243,14 +243,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifenv" file="core-env.mkiv"> + <cd:command name="doifenv" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotenv" file="core-env.mkiv"> + <cd:command name="doifnotenv" level="system" file="core-env.mkiv"> <cd:arguments> <cd:resolve name="argument-key"/> <cd:resolve name="argument-true"/> @@ -270,21 +270,21 @@ </cd:arguments> </cd:command> - <cd:command name="setdocumentfilename" file="luat-ini.mkiv"> + <cd:command name="setdocumentfilename" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="setdocumentargument" file="luat-ini.mkiv"> + <cd:command name="setdocumentargument" 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="setdocumentargumentdefault" file="luat-ini.mkiv"> + <cd:command name="setdocumentargumentdefault" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -310,7 +310,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentargument" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentargument" level="system" 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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargumentelse" level="system" 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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentargument" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentargument" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentargument" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifelsedocumentfilename" file="luat-ini.mkiv"> + <cd:command name="doifelsedocumentfilename" level="system" 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" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilenameelse" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> @@ -356,14 +356,14 @@ </cd:arguments> </cd:command> - <cd:command name="doifdocumentfilename" file="luat-ini.mkiv"> + <cd:command name="doifdocumentfilename" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> </cd:arguments> </cd:command> - <cd:command name="doifnotdocumentfilename" file="luat-ini.mkiv"> + <cd:command name="doifnotdocumentfilename" level="system" file="luat-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml index b23f57efe..de3295669 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" file="buff-ver.mkiv"> + <cd:command name="definetype" category="verbatim" level="style" file="buff-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="setuptype" file="buff-ver.mkiv"> + <cd:command name="setuptype" category="verbatim" level="style" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -77,7 +77,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" file="buff-ver.mkiv"> + <cd:command name="type" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -86,7 +86,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" variant="angles" file="buff-ver.mkiv"> + <cd:command name="type" variant="angles" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -95,7 +95,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" file="buff-ver.mkiv"> + <cd:command name="typ" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -104,7 +104,7 @@ </cd:arguments> </cd:command> - <cd:command name="typ" variant="angles" file="buff-ver.mkiv"> + <cd:command name="typ" variant="angles" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> <cd:inherit name="setuptype"/> @@ -113,7 +113,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -125,7 +125,7 @@ </cd:arguments> </cd:command> - <cd:command name="type" generated="yes" variant="example:angles" file="buff-ver.mkiv"> + <cd:command name="type" generated="yes" variant="example:angles" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:sequence> <cd:variable value="type"/> </cd:sequence> @@ -137,7 +137,7 @@ </cd:arguments> </cd:command> - <cd:command name="definetyping" file="buff-ver.mkiv"> + <cd:command name="definetyping" category="verbatim" level="style" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -147,7 +147,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuptyping" file="buff-ver.mkiv"> + <cd:command name="setuptyping" category="verbatim" level="style" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -251,7 +251,7 @@ </cd:arguments> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -265,7 +265,7 @@ </cd:instances> </cd:command> - <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" file="buff-ver.mkiv"> + <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:sequence> <cd:instance value="typing"/> </cd:sequence> @@ -279,55 +279,55 @@ </cd:instances> </cd:command> - <cd:command name="tex" file="buff-ver.mkiv"> + <cd:command name="tex" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="arg" file="buff-ver.mkiv"> + <cd:command name="arg" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="mat" file="buff-ver.mkiv"> + <cd:command name="mat" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="dis" file="buff-ver.mkiv"> + <cd:command name="dis" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="astype" file="buff-ver.mkiv"> + <cd:command name="astype" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="asciistr" file="buff-ver.mkiv"> + <cd:command name="asciistr" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="verbatim" file="buff-ver.mkiv"> + <cd:command name="verbatim" category="verbatim" file="buff-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filename" file="buff-ver.mkiv"> + <cd:command name="filename" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="typefile" file="buff-ver.mkiv"> + <cd:command name="typefile" category="verbatim" level="document" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> @@ -337,7 +337,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelsetypingfile" file="buff-ver.mkiv"> + <cd:command name="doifelsetypingfile" category="verbatim" level="system" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> @@ -345,7 +345,7 @@ </cd:arguments> </cd:command> - <cd:command name="doiftypingfileelse" file="buff-ver.mkiv"> + <cd:command name="doiftypingfileelse" category="verbatim" level="system" file="buff-ver.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-version.xml b/tex/context/interface/mkiv/i-version.xml index 9f7864e8a..ff33ee341 100644 --- a/tex/context/interface/mkiv/i-version.xml +++ b/tex/context/interface/mkiv/i-version.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="setupversion" file="page-inf.mkiv"> + <cd:command name="setupversion" level="style" file="page-inf.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -16,7 +16,7 @@ </cd:arguments> </cd:command> - <cd:command name="version" file="page-inf.mkiv"> + <cd:command name="version" level="style" file="page-inf.mkiv"> <cd:arguments> <cd:keywords> <cd:constant type="concept"/> @@ -41,7 +41,7 @@ </cd:arguments> </cd:command> - <cd:command name="doifelseolderversion" file="file-mod.mkvi"> + <cd:command name="doifelseolderversion" level="system" 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" file="file-mod.mkvi"> + <cd:command name="doifolderversionelse" level="system" 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" file="file-mod.mkvi"> + <cd:command name="doifelseoldercontext" level="system" 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" file="file-mod.mkvi"> + <cd:command name="doifoldercontextelse" level="system" file="file-mod.mkvi"> <cd:arguments> <cd:resolve name="argument-number"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-viewerlayer.xml b/tex/context/interface/mkiv/i-viewerlayer.xml index 8e321971e..4fd25e0ef 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" file="attr-lay.mkiv"> + <cd:command name="defineviewerlayer" level="style" 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" file="attr-lay.mkiv"> + <cd:command name="setupviewerlayer" level="style" file="attr-lay.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="title"> @@ -44,19 +44,19 @@ </cd:arguments> </cd:command> - <cd:command name="viewerlayer" type="environment" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" level="document" 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" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" type="environment" generated="yes" variant="example" level="document" file="attr-lay.mkiv"> <cd:sequence> <cd:variable value="viewerlayer"/> </cd:sequence> </cd:command> - <cd:command name="viewerlayer" file="attr-lay.mkiv"> + <cd:command name="viewerlayer" level="document" file="attr-lay.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml index 64ae3f79d..3e44b2740 100644 --- a/tex/context/interface/mkiv/i-visual.xml +++ b/tex/context/interface/mkiv/i-visual.xml @@ -131,24 +131,24 @@ </cd:arguments> </cd:command> - <cd:command name="coloredhbox" file="m-visual.mkiv"> + <cd:command name="coloredhbox" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvbox" file="m-visual.mkiv"> + <cd:command name="coloredvbox" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredvtop" file="m-visual.mkiv"> + <cd:command name="coloredvtop" level="system" file="m-visual.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="coloredstrut" file="m-visual.mkiv"/> + <cd:command name="coloredstrut" level="system" file="m-visual.mkiv"/> </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-visualizer.xml b/tex/context/interface/mkiv/i-visualizer.xml index 3d30b7f4d..f5ff1f942 100644 --- a/tex/context/interface/mkiv/i-visualizer.xml +++ b/tex/context/interface/mkiv/i-visualizer.xml @@ -4,104 +4,104 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="ruledhbox" file="trac-vis.mkiv"> + <cd:command name="ruledhbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvbox" file="trac-vis.mkiv"> + <cd:command name="ruledvbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvtop" file="trac-vis.mkiv"> + <cd:command name="ruledvtop" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtopv" file="trac-vis.mkiv"> + <cd:command name="ruledtopv" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledhpack" file="trac-vis.mkiv"> + <cd:command name="ruledhpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledvpack" file="trac-vis.mkiv"> + <cd:command name="ruledvpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledtpack" file="trac-vis.mkiv"> + <cd:command name="ruledtpack" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="ruledmbox" file="trac-vis.mkiv"> + <cd:command name="ruledmbox" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxr" file="trac-vis.mkiv"> + <cd:command name="filledhboxr" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxg" file="trac-vis.mkiv"> + <cd:command name="filledhboxg" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxb" file="trac-vis.mkiv"> + <cd:command name="filledhboxb" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxc" file="trac-vis.mkiv"> + <cd:command name="filledhboxc" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxm" file="trac-vis.mkiv"> + <cd:command name="filledhboxm" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxy" file="trac-vis.mkiv"> + <cd:command name="filledhboxy" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="filledhboxk" file="trac-vis.mkiv"> + <cd:command name="filledhboxk" level="system" file="trac-vis.mkiv"> <cd:arguments> <cd:resolve name="string-boxoptions"/> <cd:content/> diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index 4618fc00a..a8777d02a 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -89,7 +89,7 @@ </cd:arguments> </cd:command> - <cd:command name="setupblank" file="spac-ver.mkiv"> + <cd:command name="setupblank" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> @@ -97,7 +97,7 @@ </cd:arguments> </cd:command> - <cd:command name="blank" file="spac-ver.mkiv"> + <cd:command name="blank" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:inherit name="vspacing"/> @@ -105,7 +105,7 @@ </cd:arguments> </cd:command> - <cd:command name="useblankparameter" file="spac-ver.mkiv"> + <cd:command name="useblankparameter" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:csname/> </cd:arguments> @@ -113,9 +113,9 @@ <cd:command name="inhibitblank" file="spac-ver.mkiv"/> - <cd:command name="synchronizeblank" file="spac-ver.mkiv"/> + <cd:command name="synchronizeblank" level="system" file="spac-ver.mkiv"/> - <cd:command name="definevspace" file="spac-ver.mkiv"> + <cd:command name="definevspace" level="style" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:resolve name="keyword-name"/> @@ -123,14 +123,14 @@ </cd:arguments> </cd:command> - <cd:command name="vspace" file="spac-ver.mkiv"> + <cd:command name="vspace" level="document" 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" file="spac-ver.mkiv"> + <cd:command name="godown" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:resolve name="keyword-dimension"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index 06e1997c5..68040a8dd 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" file="spac-ver.mkiv"> + <cd:command name="setupwhitespace" level="style" 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" file="spac-ver.mkiv"/> + <cd:command name="synchronizewhitespace" level="system" file="spac-ver.mkiv"/> - <cd:command name="correctwhitespace" file="spac-ver.mkiv"> + <cd:command name="correctwhitespace" level="system" file="spac-ver.mkiv"> <cd:arguments> <cd:content/> </cd:arguments> </cd:command> - <cd:command name="packed" type="environment" file="spac-ver.mkiv"> + <cd:command name="packed" type="environment" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="blank"/> @@ -41,7 +41,7 @@ <cd:command name="unpacked" type="environment" file="spac-ver.mkiv"/> - <cd:command name="linecorrection" type="environment" file="spac-ver.mkiv"> + <cd:command name="linecorrection" type="environment" level="document" file="spac-ver.mkiv"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="blank"/> diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml index c13196383..d287c0b74 100644 --- a/tex/context/interface/mkiv/i-xml.xml +++ b/tex/context/interface/mkiv/i-xml.xml @@ -2,151 +2,151 @@ <?context-directive job ctxfile x-setups.ctx ?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" file="lxml-ini.mkiv"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> <!-- the definitions themselves --> - <cd:command name="xmlmain"> + <cd:command name="xmlmain" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlflush"> + <cd:command name="xmlflush" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltext"> + <cd:command name="xmltext" 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"> + <cd:command name="xmlpure" 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"> + <cd:command name="xmlflushtext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushpure"> + <cd:command name="xmlflushpure" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnonspace"> + <cd:command name="xmlnonspace" 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"> + <cd:command name="xmlflushspacewise" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlflushlinewise"> + <cd:command name="xmlflushlinewise" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlall"> + <cd:command name="xmlall" 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"/> + <cd:command name="xmllastmatch" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlfirst"> + <cd:command name="xmlfirst" 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"> + <cd:command name="xmllast" 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"> + <cd:command name="xmlcontext" 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"> + <cd:command name="xmlflushcontext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlshow"> + <cd:command name="xmlshow" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinfo"> + <cd:command name="xmlinfo" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlfilter"> + <cd:command name="xmlfilter" 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"> + <cd:command name="xmlstrip" 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"> + <cd:command name="xmlstripped" 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"> + <cd:command name="xmlstripnolines" 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"> + <cd:command name="xmlstrippednolines" 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"> + <cd:command name="xmlposition" 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"> + <cd:command name="xmlelement" 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"> + <cd:command name="xmlpos" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlsnippet"> + <cd:command name="xmlsnippet" 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"> + <cd:command name="xmlconcat" 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"> + <cd:command name="xmlconcatrange" 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"> + <cd:command name="xmlcommand" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -200,44 +200,44 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim"> + <cd:command name="xmlinlineverbatim" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinlineverbatim" type="environment"> + <cd:command name="xmlinlineverbatim" type="environment" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim"> + <cd:command name="xmldisplayverbatim" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldisplayverbatim" type="environment"> + <cd:command name="xmldisplayverbatim" type="environment" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlverbatim"> + <cd:command name="xmlverbatim" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlprettyprint"> + <cd:command name="xmlprettyprint" 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="xmlloadfile"> + <cd:command name="xmlloadfile" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -245,7 +245,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadbuffer"> + <cd:command name="xmlloadbuffer" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -253,7 +253,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddata"> + <cd:command name="xmlloaddata" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -261,7 +261,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloadonly"> + <cd:command name="xmlloadonly" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -269,7 +269,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessfile"> + <cd:command name="xmlprocessfile" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-file"/> @@ -277,7 +277,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessbuffer"> + <cd:command name="xmlprocessbuffer" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-buffer"/> <cd:resolve name="argument-name"/> @@ -285,7 +285,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlprocessdata"> + <cd:command name="xmlprocessdata" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -293,7 +293,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlinclude"> + <cd:command name="xmlinclude" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -301,44 +301,44 @@ </cd:arguments> </cd:command> - <cd:command name="xmlname"> + <cd:command name="xmlname" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlpath"> + <cd:command name="xmlpath" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlnamespace"> + <cd:command name="xmlnamespace" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmltag"> + <cd:command name="xmltag" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlcount"> + <cd:command name="xmlcount" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlatt"> + <cd:command name="xmlatt" 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"> + <cd:command name="xmlattdef" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -346,16 +346,16 @@ </cd:arguments> </cd:command> - <cd:command name="xmlrefatt"> + <cd:command name="xmlrefatt" 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"/> + <cd:command name="xmllastatt" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlattribute"> + <cd:command name="xmlattribute" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -363,7 +363,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlattributedef"> + <cd:command name="xmlattributedef" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -372,14 +372,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchainatt"> + <cd:command name="xmlchainatt" 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"> + <cd:command name="xmlchainattdef" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -387,39 +387,39 @@ </cd:arguments> </cd:command> - <cd:command name="xmldirectives"> + <cd:command name="xmldirectives" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesbefore"> + <cd:command name="xmldirectivesbefore" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmldirectivesafter"> + <cd:command name="xmldirectivesafter" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinstalldirective"> + <cd:command name="xmlinstalldirective" 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"> + <cd:command name="xmlsetup" 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"> + <cd:command name="xmlsetsetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-lpath"/> @@ -427,79 +427,79 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremovesetup"> + <cd:command name="xmlremovesetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlremovedocumentsetup"> + <cd:command name="xmlremovedocumentsetup" 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"> + <cd:command name="xmlflushdocumentsetups" 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"> + <cd:command name="xmlresetsetups" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlresetdocumentsetups"> + <cd:command name="xmlresetdocumentsetups" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlprependsetup"> + <cd:command name="xmlprependsetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlappendsetup"> + <cd:command name="xmlappendsetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-setup"/> </cd:arguments> </cd:command> - <cd:command name="xmlbeforesetup"> + <cd:command name="xmlbeforesetup" 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"> + <cd:command name="xmlaftersetup" 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"> + <cd:command name="xmlprependdocumentsetup" 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"> + <cd:command name="xmlappenddocumentsetup" 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"> + <cd:command name="xmlbeforedocumentsetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -507,7 +507,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlafterdocumentsetup"> + <cd:command name="xmlafterdocumentsetup" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-setup"/> @@ -515,17 +515,16 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisteredsetups"> - </cd:command> + <cd:command name="xmlregisteredsetups" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlregistereddocumentsetups"> + <cd:command name="xmlregistereddocumentsetups" 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"> + <cd:command name="xmlsetfunction" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -535,7 +534,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoif"> + <cd:command name="xmldoif" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -543,7 +542,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnot"> + <cd:command name="xmldoifnot" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -551,7 +550,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelse"> + <cd:command name="xmldoifelse" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -560,7 +559,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoiftext"> + <cd:command name="xmldoiftext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -568,7 +567,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifnottext"> + <cd:command name="xmldoifnottext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -576,7 +575,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsetext"> + <cd:command name="xmldoifelsetext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -585,21 +584,21 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifselfempty"> + <cd:command name="xmldoifselfempty" 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"> + <cd:command name="xmldoifnotselfempty" 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"> + <cd:command name="xmldoifelseselfempty" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-true"/> @@ -607,7 +606,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelseempty"> + <cd:command name="xmldoifelseempty" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -616,7 +615,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command name="xmlregisterns" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:keywords delimiters="braces"> @@ -625,14 +624,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlregisterns"> + <cd:command name="xmlregisterns" 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"> + <cd:command name="xmlremapname" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -641,7 +640,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlremapnamespace"> + <cd:command name="xmlremapnamespace" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-name"/> @@ -649,14 +648,14 @@ </cd:arguments> </cd:command> - <cd:command name="xmlchecknamespace"> + <cd:command name="xmlchecknamespace" 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"> + <cd:command name="xmlmapvalue" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -664,7 +663,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmlvalue"> + <cd:command name="xmlvalue" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -672,7 +671,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldoifelsevalue"> + <cd:command name="xmldoifelsevalue" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-category"/> <cd:resolve name="argument-name"/> @@ -681,20 +680,20 @@ </cd:arguments> </cd:command> - <cd:command name="xmlloaddirectives"> + <cd:command name="xmlloaddirectives" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-file"/> </cd:arguments> </cd:command> - <cd:command name="xmlsave"> + <cd:command name="xmlsave" 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"> + <cd:command name="xmltofile" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -702,7 +701,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobuffer"> + <cd:command name="xmltobuffer" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -710,7 +709,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmltobufferverbose"> + <cd:command name="xmltobufferverbose" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -720,7 +719,7 @@ <!-- - <cd:command name="xmltoparameters"> + <cd:command name="xmltoparameters" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> <cd:resolve name="argument-lpath"/> @@ -730,55 +729,55 @@ --> - <cd:command name="xmladdindex"> + <cd:command name="xmladdindex" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusion"> + <cd:command name="xmlinclusion" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlinclusions"> + <cd:command name="xmlinclusions" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlbadinclusions"> + <cd:command name="xmlbadinclusions" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw"> + <cd:command name="xmlraw" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> </cd:command> - <cd:command name="xmlraw" type="environment"/> + <cd:command name="xmlraw" type="environment" category="xml" file="lxml-ini.mkiv"/> <!-- injectors --> - <cd:command name="xmlresetinjectors"/> + <cd:command name="xmlresetinjectors" category="xml" file="lxml-ini.mkiv"/> - <cd:command name="xmlsetinjectors"> + <cd:command name="xmlsetinjectors" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> </cd:command> - <cd:command name="xmlinjector"> + <cd:command name="xmlinjector" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> </cd:arguments> </cd:command> - <cd:command name="xmlapplyselectors"> + <cd:command name="xmlapplyselectors" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> @@ -786,14 +785,14 @@ <!-- entities --> - <cd:command name="xmlsetentity"> + <cd:command name="xmlsetentity" 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"> + <cd:command name="xmltexentity" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-text"/> @@ -802,7 +801,7 @@ <!-- general setup --> - <cd:command name="setupxml"> + <cd:command name="setupxml" category="xml" level="style" file="lxml-ini.mkiv"> <cd:arguments> <cd:assignments list="yes"> <cd:parameter name="default"> @@ -818,7 +817,7 @@ </cd:arguments> </cd:command> - <cd:command name="xmldefaulttotext"> + <cd:command name="xmldefaulttotext" category="xml" file="lxml-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-node"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index 7500ff47f..4db0882f1 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" file="tabl-xtb.mkvi"> + <cd:command name="definextable" category="tables" level="style" 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" file="tabl-xtb.mkvi"> + <cd:command name="setupxtable" category="tables" level="style" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="embeddedxtable" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" 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" file="tabl-xtb.mkvi"> + <cd:command name="embeddedxtable" type="environment" variant="name" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtable" type="environment" generated="yes" variant="example" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:sequence> <cd:variable value="xtable"/> </cd:sequence> @@ -121,13 +121,13 @@ </cd:arguments> </cd:command> - <cd:command name="processxtablebuffer" file="tabl-xtb.mkvi"> + <cd:command name="processxtablebuffer" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xrow" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xrow" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xcell" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtablehead" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablefoot" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtablefoot" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablenext" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtablenext" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xtablebody" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xtablebody" type="environment" variant="name" category="tables" level="document" file="tabl-xtb.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> </cd:command> - <cd:command name="xgroup" type="environment" file="tabl-xtb.mkvi"> + <cd:command name="xgroup" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xrowgroup" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"> + <cd:command name="xcellgroup" type="environment" category="tables" level="document" 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" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablerow" category="tables" file="tabl-xtb.mkvi"/> - <cd:command name="currentxtablecolumn" file="tabl-xtb.mkvi"/> + <cd:command name="currentxtablecolumn" category="tables" file="tabl-xtb.mkvi"/> </cd:interface> diff --git a/tex/context/modules/common/s-abr-01.tex b/tex/context/modules/common/s-abr-01.tex index fd6c66419..d71df6c0a 100644 --- a/tex/context/modules/common/s-abr-01.tex +++ b/tex/context/modules/common/s-abr-01.tex @@ -43,13 +43,13 @@ \logo [AMSLATEX] {\AmSLaTeX} \logo [AMSTEX] {\AmSTeX} \logo [ANSI] {ansi} -\logo [ARABTEX] {Arab\TeX} +\logo [ARABTEX] {Arab\TeXsuffix} \logo [ASCII] {ascii} -\logo [ASCIITEX] {ascii\TeX} +\logo [ASCIITEX] {ascii\TeXsuffix} \logo [ASCIIMATH] {AsciiMath} -\logo [BACHOTEX] {Bacho\TeX} -\logo [BIBTEX] {bib\TeX} -\logo [MLBIBTEX] {MLbib\TeX} +\logo [BACHOTEX] {Bacho\TeXsuffix} +\logo [BIBTEX] {bib\TeXsuffix} +\logo [MLBIBTEX] {MLbib\TeXsuffix} \logo [BLUESKY] {BlueSky} \logo [BMP] {bmp} \logo [BSD] {bsd} @@ -76,7 +76,7 @@ \logo [CSTUG] {cstug} \logo [DANTE] {Dante} \logo [DISTILLER] {distiller} -\logo [DRATEX] {Dra\TeX} +\logo [DRATEX] {Dra\TeXsuffix} \logo [DSC] {dsc} \logo [DTD] {dtd} \logo [DTK] {dtk} @@ -94,15 +94,15 @@ \logo [EC] {ec} \logo [EIFFEL] {Eiffel} \logo [EMACS] {emacs} -\logo [EMTEX] {em\TeX} +\logo [EMTEX] {em\TeXsuffix} \logo [ENCODING] {enc} -\logo [ENCTEX] {enc\TeX} +\logo [ENCTEX] {enc\TeXsuffix} \logo [EPUB] {ePub} \logo [EPS] {eps} \logo [ETEX] {\eTeX} -\logo [EUROBACHOTEX] {EuroBacho\TeX} +\logo [EUROBACHOTEX] {EuroBacho\TeXsuffix} \logo [EUROMATH] {EuroMath} -\logo [EUROTEX] {Euro\TeX} +\logo [EUROTEX] {Euro\TeXsuffix} \logo [EXAMPLE] {eXaMpLe} \logo [EXAMPLED] {exampled} \logo [EXAMPLEQ] {exampleq} @@ -115,7 +115,7 @@ \logo [FDF] {fdf} \logo [FONTFORGE] {FontForge} \logo [FOXET] {foXet} -\logo [FPTEX] {fp\TeX} +\logo [FPTEX] {fp\TeXsuffix} \logo [FREEBSD] {FreeBSD} \logo [FTP] {ftp} \logo [GHOSTSCRIPT] {Ghost\-script} @@ -126,7 +126,7 @@ \logo [GS] {Ghost\-Script} \logo [GUST] {Gust} \logo [GCC] {gcc} -\logo [GWTEX] {gw\TeX} +\logo [GWTEX] {gw\TeXsuffix} \logo [HSB] {hsb} % ? \logo [HSV] {hsv} \logo [HTML] {html} @@ -134,8 +134,8 @@ \logo [HZ] {hz} \logo [IBM] {ibm} \logo [IMAGEMAGICK] {ImageMagick} -\logo [INITEX] {ini\TeX} -\logo [INRSTEX] {inrs\TeX} +\logo [INITEX] {ini\TeXsuffix} +\logo [INRSTEX] {inrs\TeXsuffix} \logo [IO] {io} \logo [IRCNET] {IRCnet} \logo [ISO] {iso} @@ -160,22 +160,22 @@ \logo [LPEG] {lpeg} \logo [LUA] {Lua} \logo [LUAJIT] {LuaJIT} -\logo [LUAJITTEX] {Luajit\TeX} -\logo [LUATEX] {Lua\TeX} +\logo [LUAJITTEX] {Luajit\TeXsuffix} +\logo [LUATEX] {Lua\TeXsuffix} \logo [LUATOOLS] {luatools} \logo [LMX] {lmx} \logo [MACOSX] {MacOSX} -\logo [MACROTEX] {Macro\TeX} +\logo [MACROTEX] {Macro\TeXsuffix} \logo [MAKEMPY] {MakeMPY} \logo [MAPPING] {map} \logo [MAPS] {Maps} \logo [MATHML] {MathML} \logo [METAFONT] {\MetaFont} \logo [METAPOST] {\MetaPost} -\logo [METATEX] {Meta\TeX} -\logo [MIKTEX] {Mik\TeX} +\logo [METATEX] {Meta\TeXsuffix} +\logo [MIKTEX] {Mik\TeXsuffix} \logo [MINGW] {MingW} -\logo [MLTEX] {ml\TeX} +\logo [MLTEX] {ml\TeXsuffix} \logo [METATYPE] {MetaType1} \logo [MODULA] {Modula} \logo [MOV] {mov} @@ -197,17 +197,17 @@ \logo [OPENMATH] {OpenMath} \logo [OPENTYPE] {OpenType} \logo [OPI] {opi} -\logo [OTEX] {Oriental \TeX} +\logo [OTEX] {Oriental \TeXsuffix} \logo [OTF] {otf} \logo [OTP] {otp} \logo [OVF] {ovf} \logo [PASCAL] {Pascal} -\logo [PCTEX] {pc\TeX} +\logo [PCTEX] {pc\TeXsuffix} \logo [PFA] {pfa} \logo [PFB] {pfb} \logo [PDF] {pdf} -\logo [PDFETEX] {pdfe\TeX} -\logo [PDFTEX] {pdf\TeX} +\logo [PDFETEX] {pdfe\TeXsuffix} +\logo [PDFTEX] {pdf\TeXsuffix} \logo [PDFTOOLS] {pdftools} \logo [PDFTOPS] {pdftops} \logo [PERL] {Perl} @@ -246,30 +246,30 @@ \logo [SWIGLIB] {SwigLib} \logo [TABLE] {\TaBlE} \logo [TCPIP] {tcp/ip} -\logo [TDS] {tds} % no sc te -\logo [TEI] {tei} % no sc te -\logo [TETEX] {te\TeX} % no sc te +\logo [TDS] {tds} % no sc te +\logo [TEI] {tei} % no sc te +\logo [TETEX] {te\TeXsuffix} % no sc te \logo [TEX] {\TeX} -\logo [TEXADRES] {\TeX adress} -\logo [TEXBASE] {\TeX base} -\logo [TEXEDIT] {\TeX edit} -\logo [TEXEXEC] {\TeX exec} -\logo [TEXFONT] {\TeX font} -\logo [TEXFORM] {\TeX form} -\logo [TEXLIVE] {\TeX Live} -\logo [TEXLUA] {\TeX Lua} +\logo [TEXADRES] {\TeXprefix adress} +\logo [TEXBASE] {\TeXprefix base} +\logo [TEXEDIT] {\TeXprefix edit} +\logo [TEXEXEC] {\TeXprefix exec} +\logo [TEXFONT] {\TeXprefix font} +\logo [TEXFORM] {\TeXprefix form} +\logo [TEXLIVE] {\TeXprefix Live} +\logo [TEXLUA] {\TeXprefix Lua} \logo [TEXMF] {texmf} \logo [TEXMFSTART] {texmfstart} \logo [TEXNL] {tex-nl} -\logo [TEXSHOW] {\TeX show} -\logo [TEXSPELL] {\TeX spell} +\logo [TEXSHOW] {\TeXprefix show} +\logo [TEXSPELL] {\TeXprefix spell} \logo [TEXGYRE] {\TeX\ Gyre} \logo [TEXSYNC] {texsync} \logo [TEXTMATE] {TextMate} -\logo [TEXTOOLS] {\TeX tools} -\logo [TEXUTIL] {\TeX util} -\logo [TEXWORK] {\TeX work} -\logo [TEXWORKS] {\TeX works} +\logo [TEXTOOLS] {\TeXprefix tools} +\logo [TEXUTIL] {\TeXprefix util} +\logo [TEXWORK] {\TeXprefix work} +\logo [TEXWORKS] {\TeXprefix works} \logo [TEXXET] {\TeX\XeT} \def\XeT{XeT} \logo [TFM] {tfm} \logo [TIF] {tif} @@ -315,7 +315,7 @@ \logo [XML] {xml} \logo [XPATH] {xpath} \logo [XMLTOOLS] {xmltools} -\logo [XPDFETEX] {xpdfe\TeX} +\logo [XPDFETEX] {xpdfe\TeXsuffix} \logo [XSL] {xsl} \logo [XSLFO] {xsl-fo} \logo [XSLT] {xslt} diff --git a/tex/context/modules/mkiv/s-fonts-variable.lua b/tex/context/modules/mkiv/s-fonts-variable.lua index 2b2aa1dfc..43f5f0d3d 100644 --- a/tex/context/modules/mkiv/s-fonts-variable.lua +++ b/tex/context/modules/mkiv/s-fonts-variable.lua @@ -18,6 +18,9 @@ local context = context local NC, NR, HL, ML = context.NC, context.NR, context.HL, context.ML local bold, monobold, mono, formattedmono = context.bold, context.monobold, context.mono, context.formatted.mono +local show_glyphs = false trackers.register("modules.fonts.variables.glyphs", function(v) show_glyphs = v end) +local show_kerns = false trackers.register("modules.fonts.variables.kerns", function(v) show_kerns = v end) + function moduledata.fonts.variable.showvariations(specification) specification = interfaces.checkedspecification(specification) @@ -237,11 +240,21 @@ end context.startsubject { title = instance } context.start() context.definedfont { "name:" .. instance .. "*default" } + context.start() + if show_glyphs then + context.showglyphs() + end + if show_kerns then + context.showfontkerns() + end if sample and sample ~= "" then context(sample) else context.input("zapf.tex") end + context.stop() + context.blank { "big,samepage"} + context.showfontspacing() context.par() context.stop() context.stopsubject() diff --git a/tex/context/modules/mkiv/s-fonts-variable.mkiv b/tex/context/modules/mkiv/s-fonts-variable.mkiv index 6b84c2ebb..69f4a7843 100644 --- a/tex/context/modules/mkiv/s-fonts-variable.mkiv +++ b/tex/context/modules/mkiv/s-fonts-variable.mkiv @@ -26,6 +26,18 @@ \installmodulecommandluasingle \showfontvariations {moduledata.fonts.variable.showvariations} +\unexpanded\def\showfontspacing + {\begingroup + \scratchskip \interwordspace plus \interwordstretch minus \interwordshrink + \normalexpanded{\hpack\bgroup + \tttf + sp: \the\scratchskip \hskip\emwidth + es: \the\extraspace\hskip\emwidth + ex: \the\exheight \hskip\emwidth + em: \the\emwidth \hskip\emwidth + \egroup}% + \endgroup} + \stopmodule \continueifinputfile{s-fonts-variable.mkiv} @@ -34,6 +46,9 @@ \setuphead[section][before={\testpage[5]\blank[2*big]}] +% \enabletrackers[modules.fonts.variables.glyphs] +% \enabletrackers[modules.fonts.variables.kerns] + \starttext \startbuffer[zycon] @@ -57,8 +72,9 @@ \char983040\relax\par \stopbuffer -% \showfontkerns -% \showglyphs +% \showfontvariations +% [font=file:VotoSerifGX.ttf, +% max=6] \showfontvariations [font=file:adobevfprototype.otf] diff --git a/tex/context/sample/common/samples.tex b/tex/context/sample/common/samples.tex index 8d1477e1c..72bec863c 100644 --- a/tex/context/sample/common/samples.tex +++ b/tex/context/sample/common/samples.tex @@ -48,8 +48,11 @@ used in testing bibliographic references and citations. \NC waltham.tex \NC David Waltham \NC Lucky Planet, why earth is exceptional and what that means for life in the universe, Icon Books Ltd, London, 2014, p. 168 \NC \NR -\NC sapolsky.tex \NC Robert M. Sapolsky \NC Why Zebras Don't Have Ulsters, means for life in the universe, +\NC sapolsky.tex \NC Robert M. Sapolsky \NC Why Zebras Don't Have Ulsters, St Martin's Press, 2004 \NC \NR +\NC mcnish.tex \NC Hollie McNish \NC Poetry versus Orchestra, Hollie McNish and Metropole + Orkest, conducted by Jules Buckley, + MO Black, fall 2016. \NC \NR \stoptabulate % Tufte: This quote will always produce hyphenated text, apart from the content, diff --git a/tex/generic/context/luatex/luatex-basics-chr.lua b/tex/generic/context/luatex/luatex-basics-chr.lua index 4329256f2..75dffd192 100644 --- a/tex/generic/context/luatex/luatex-basics-chr.lua +++ b/tex/generic/context/luatex/luatex-basics-chr.lua @@ -9,6 +9,174 @@ characters.blockrange = { } -- classifiers needed for analysis characters.classifiers={ + [768]=5, + [769]=5, + [770]=5, + [771]=5, + [772]=5, + [773]=5, + [774]=5, + [775]=5, + [776]=5, + [777]=5, + [778]=5, + [779]=5, + [780]=5, + [781]=5, + [782]=5, + [783]=5, + [784]=5, + [785]=5, + [786]=5, + [787]=5, + [788]=5, + [789]=5, + [790]=5, + [791]=5, + [792]=5, + [793]=5, + [794]=5, + [795]=5, + [796]=5, + [797]=5, + [798]=5, + [799]=5, + [800]=5, + [801]=5, + [802]=5, + [803]=5, + [804]=5, + [805]=5, + [806]=5, + [807]=5, + [808]=5, + [809]=5, + [810]=5, + [811]=5, + [812]=5, + [813]=5, + [814]=5, + [815]=5, + [816]=5, + [817]=5, + [818]=5, + [819]=5, + [820]=5, + [821]=5, + [822]=5, + [823]=5, + [824]=5, + [825]=5, + [826]=5, + [827]=5, + [828]=5, + [829]=5, + [830]=5, + [831]=5, + [832]=5, + [833]=5, + [834]=5, + [835]=5, + [836]=5, + [837]=5, + [838]=5, + [839]=5, + [840]=5, + [841]=5, + [842]=5, + [843]=5, + [844]=5, + [845]=5, + [846]=5, + [847]=5, + [848]=5, + [849]=5, + [850]=5, + [851]=5, + [852]=5, + [853]=5, + [854]=5, + [855]=5, + [856]=5, + [857]=5, + [858]=5, + [859]=5, + [860]=5, + [861]=5, + [862]=5, + [863]=5, + [864]=5, + [865]=5, + [866]=5, + [867]=5, + [868]=5, + [869]=5, + [870]=5, + [871]=5, + [872]=5, + [873]=5, + [874]=5, + [875]=5, + [876]=5, + [877]=5, + [878]=5, + [879]=5, + [1155]=5, + [1156]=5, + [1157]=5, + [1158]=5, + [1159]=5, + [1425]=5, + [1426]=5, + [1427]=5, + [1428]=5, + [1429]=5, + [1430]=5, + [1431]=5, + [1432]=5, + [1433]=5, + [1434]=5, + [1435]=5, + [1436]=5, + [1437]=5, + [1438]=5, + [1439]=5, + [1440]=5, + [1441]=5, + [1442]=5, + [1443]=5, + [1444]=5, + [1445]=5, + [1446]=5, + [1447]=5, + [1448]=5, + [1449]=5, + [1450]=5, + [1451]=5, + [1452]=5, + [1453]=5, + [1454]=5, + [1455]=5, + [1456]=5, + [1457]=5, + [1458]=5, + [1459]=5, + [1460]=5, + [1461]=5, + [1462]=5, + [1463]=5, + [1464]=5, + [1465]=5, + [1466]=5, + [1467]=5, + [1468]=5, + [1469]=5, + [1471]=5, + [1473]=5, + [1474]=5, + [1476]=5, + [1477]=5, + [1479]=5, [1536]=4, [1537]=4, [1538]=4, @@ -389,6 +557,17 @@ characters.classifiers={ [1917]=2, [1918]=2, [1919]=2, + [1958]=5, + [1959]=5, + [1960]=5, + [1961]=5, + [1962]=5, + [1963]=5, + [1964]=5, + [1965]=5, + [1966]=5, + [1967]=5, + [1968]=5, [1984]=6, [1985]=6, [1986]=6, @@ -448,6 +627,27 @@ characters.classifiers={ [2040]=6, [2041]=6, [2042]=2, + [2070]=5, + [2071]=5, + [2072]=5, + [2073]=5, + [2075]=5, + [2076]=5, + [2077]=5, + [2078]=5, + [2079]=5, + [2080]=5, + [2081]=5, + [2082]=5, + [2083]=5, + [2085]=5, + [2086]=5, + [2087]=5, + [2089]=5, + [2090]=5, + [2091]=5, + [2092]=5, + [2093]=5, [2112]=3, [2113]=2, [2114]=2, @@ -473,6 +673,9 @@ characters.classifiers={ [2134]=4, [2135]=4, [2136]=4, + [2137]=5, + [2138]=5, + [2139]=5, [2208]=2, [2209]=2, [2210]=2, @@ -494,9 +697,339 @@ characters.classifiers={ [2226]=3, [2227]=2, [2228]=2, + [2230]=2, + [2231]=2, + [2232]=2, + [2233]=3, + [2234]=2, + [2235]=2, + [2236]=2, + [2237]=2, + [2260]=5, + [2261]=5, + [2262]=5, + [2263]=5, + [2264]=5, + [2265]=5, + [2266]=5, + [2267]=5, + [2268]=5, + [2269]=5, + [2270]=5, + [2271]=5, + [2272]=5, + [2273]=5, + [2274]=4, + [2275]=5, + [2276]=5, + [2277]=5, + [2278]=5, + [2279]=5, + [2280]=5, + [2281]=5, + [2282]=5, + [2283]=5, + [2284]=5, + [2285]=5, + [2286]=5, + [2287]=5, + [2288]=5, + [2289]=5, + [2290]=5, + [2291]=5, + [2292]=5, + [2293]=5, + [2294]=5, + [2295]=5, + [2296]=5, + [2297]=5, + [2298]=5, + [2299]=5, + [2300]=5, + [2301]=5, + [2302]=5, + [2303]=5, + [2304]=5, + [2305]=5, + [2306]=5, + [2362]=5, + [2364]=5, + [2369]=5, + [2370]=5, + [2371]=5, + [2372]=5, + [2373]=5, + [2374]=5, + [2375]=5, + [2376]=5, + [2381]=5, + [2385]=5, + [2386]=5, + [2387]=5, + [2388]=5, + [2389]=5, + [2390]=5, + [2391]=5, + [2402]=5, + [2403]=5, + [2433]=5, + [2492]=5, + [2497]=5, + [2498]=5, + [2499]=5, + [2500]=5, + [2509]=5, + [2530]=5, + [2531]=5, + [2561]=5, + [2562]=5, + [2620]=5, + [2625]=5, + [2626]=5, + [2631]=5, + [2632]=5, + [2635]=5, + [2636]=5, + [2637]=5, + [2641]=5, + [2672]=5, + [2673]=5, + [2677]=5, + [2689]=5, + [2690]=5, + [2748]=5, + [2753]=5, + [2754]=5, + [2755]=5, + [2756]=5, + [2757]=5, + [2759]=5, + [2760]=5, + [2765]=5, + [2786]=5, + [2787]=5, + [2817]=5, + [2876]=5, + [2879]=5, + [2881]=5, + [2882]=5, + [2883]=5, + [2884]=5, + [2893]=5, + [2902]=5, + [2914]=5, + [2915]=5, + [2946]=5, + [3008]=5, + [3021]=5, + [3072]=5, + [3134]=5, + [3135]=5, + [3136]=5, + [3142]=5, + [3143]=5, + [3144]=5, + [3146]=5, + [3147]=5, + [3148]=5, + [3149]=5, + [3157]=5, + [3158]=5, + [3170]=5, + [3171]=5, + [3201]=5, + [3260]=5, + [3263]=5, + [3270]=5, + [3276]=5, + [3277]=5, + [3298]=5, + [3299]=5, + [3329]=5, + [3393]=5, + [3394]=5, + [3395]=5, + [3396]=5, + [3405]=5, + [3426]=5, + [3427]=5, + [3530]=5, + [3538]=5, + [3539]=5, + [3540]=5, + [3542]=5, + [3633]=5, + [3636]=5, + [3637]=5, + [3638]=5, + [3639]=5, + [3640]=5, + [3641]=5, + [3642]=5, + [3655]=5, + [3656]=5, + [3657]=5, + [3658]=5, + [3659]=5, + [3660]=5, + [3661]=5, + [3662]=5, + [3761]=5, + [3764]=5, + [3765]=5, + [3766]=5, + [3767]=5, + [3768]=5, + [3769]=5, + [3771]=5, + [3772]=5, + [3784]=5, + [3785]=5, + [3786]=5, + [3787]=5, + [3788]=5, + [3789]=5, + [3864]=5, + [3865]=5, + [3893]=5, + [3895]=5, + [3897]=5, + [3953]=5, + [3954]=5, + [3955]=5, + [3956]=5, + [3957]=5, + [3958]=5, + [3959]=5, + [3960]=5, + [3961]=5, + [3962]=5, + [3963]=5, + [3964]=5, + [3965]=5, + [3966]=5, + [3968]=5, + [3969]=5, + [3970]=5, + [3971]=5, + [3972]=5, + [3974]=5, + [3975]=5, + [3981]=5, + [3982]=5, + [3983]=5, + [3984]=5, + [3985]=5, + [3986]=5, + [3987]=5, + [3988]=5, + [3989]=5, + [3990]=5, + [3991]=5, + [3993]=5, + [3994]=5, + [3995]=5, + [3996]=5, + [3997]=5, + [3998]=5, + [3999]=5, + [4000]=5, + [4001]=5, + [4002]=5, + [4003]=5, + [4004]=5, + [4005]=5, + [4006]=5, + [4007]=5, + [4008]=5, + [4009]=5, + [4010]=5, + [4011]=5, + [4012]=5, + [4013]=5, + [4014]=5, + [4015]=5, + [4016]=5, + [4017]=5, + [4018]=5, + [4019]=5, + [4020]=5, + [4021]=5, + [4022]=5, + [4023]=5, + [4024]=5, + [4025]=5, + [4026]=5, + [4027]=5, + [4028]=5, + [4038]=5, + [4141]=5, + [4142]=5, + [4143]=5, + [4144]=5, + [4146]=5, + [4147]=5, + [4148]=5, + [4149]=5, + [4150]=5, + [4151]=5, + [4153]=5, + [4154]=5, + [4157]=5, + [4158]=5, + [4184]=5, + [4185]=5, + [4190]=5, + [4191]=5, + [4192]=5, + [4209]=5, + [4210]=5, + [4211]=5, + [4212]=5, + [4226]=5, + [4229]=5, + [4230]=5, + [4237]=5, + [4253]=5, + [4957]=5, + [4958]=5, + [4959]=5, + [5906]=5, + [5907]=5, + [5908]=5, + [5938]=5, + [5939]=5, + [5940]=5, + [5970]=5, + [5971]=5, + [6002]=5, + [6003]=5, + [6071]=5, + [6072]=5, + [6073]=5, + [6074]=5, + [6075]=5, + [6076]=5, + [6077]=5, + [6086]=5, + [6089]=5, + [6090]=5, + [6091]=5, + [6092]=5, + [6093]=5, + [6094]=5, + [6095]=5, + [6096]=5, + [6097]=5, + [6098]=5, + [6099]=5, + [6109]=5, [6150]=4, [6151]=2, [6154]=2, + [6155]=5, + [6156]=5, + [6157]=5, [6158]=4, [6176]=2, [6177]=2, @@ -591,8 +1124,6 @@ characters.classifiers={ [6274]=4, [6275]=4, [6276]=4, - [6277]=4, - [6278]=4, [6279]=2, [6280]=2, [6281]=2, @@ -627,13 +1158,291 @@ characters.classifiers={ [6310]=2, [6311]=2, [6312]=2, + [6313]=5, [6314]=2, + [6432]=5, + [6433]=5, + [6434]=5, + [6439]=5, + [6440]=5, + [6450]=5, + [6457]=5, + [6458]=5, + [6459]=5, + [6679]=5, + [6680]=5, + [6742]=5, + [6744]=5, + [6745]=5, + [6746]=5, + [6747]=5, + [6748]=5, + [6749]=5, + [6750]=5, + [6752]=5, + [6754]=5, + [6757]=5, + [6758]=5, + [6759]=5, + [6760]=5, + [6761]=5, + [6762]=5, + [6763]=5, + [6764]=5, + [6771]=5, + [6772]=5, + [6773]=5, + [6774]=5, + [6775]=5, + [6776]=5, + [6777]=5, + [6778]=5, + [6779]=5, + [6780]=5, + [6783]=5, + [6832]=5, + [6833]=5, + [6834]=5, + [6835]=5, + [6836]=5, + [6837]=5, + [6838]=5, + [6839]=5, + [6840]=5, + [6841]=5, + [6842]=5, + [6843]=5, + [6844]=5, + [6845]=5, + [6912]=5, + [6913]=5, + [6914]=5, + [6915]=5, + [6964]=5, + [6966]=5, + [6967]=5, + [6968]=5, + [6969]=5, + [6970]=5, + [6972]=5, + [6978]=5, + [7019]=5, + [7020]=5, + [7021]=5, + [7022]=5, + [7023]=5, + [7024]=5, + [7025]=5, + [7026]=5, + [7027]=5, + [7040]=5, + [7041]=5, + [7074]=5, + [7075]=5, + [7076]=5, + [7077]=5, + [7080]=5, + [7081]=5, + [7083]=5, + [7142]=5, + [7144]=5, + [7145]=5, + [7149]=5, + [7151]=5, + [7152]=5, + [7153]=5, + [7212]=5, + [7213]=5, + [7214]=5, + [7215]=5, + [7216]=5, + [7217]=5, + [7218]=5, + [7219]=5, + [7222]=5, + [7223]=5, + [7376]=5, + [7377]=5, + [7378]=5, + [7380]=5, + [7381]=5, + [7382]=5, + [7383]=5, + [7384]=5, + [7385]=5, + [7386]=5, + [7387]=5, + [7388]=5, + [7389]=5, + [7390]=5, + [7391]=5, + [7392]=5, + [7394]=5, + [7395]=5, + [7396]=5, + [7397]=5, + [7398]=5, + [7399]=5, + [7400]=5, + [7405]=5, + [7412]=5, + [7416]=5, + [7417]=5, + [7616]=5, + [7617]=5, + [7618]=5, + [7619]=5, + [7620]=5, + [7621]=5, + [7622]=5, + [7623]=5, + [7624]=5, + [7625]=5, + [7626]=5, + [7627]=5, + [7628]=5, + [7629]=5, + [7630]=5, + [7631]=5, + [7632]=5, + [7633]=5, + [7634]=5, + [7635]=5, + [7636]=5, + [7637]=5, + [7638]=5, + [7639]=5, + [7640]=5, + [7641]=5, + [7642]=5, + [7643]=5, + [7644]=5, + [7645]=5, + [7646]=5, + [7647]=5, + [7648]=5, + [7649]=5, + [7650]=5, + [7651]=5, + [7652]=5, + [7653]=5, + [7654]=5, + [7655]=5, + [7656]=5, + [7657]=5, + [7658]=5, + [7659]=5, + [7660]=5, + [7661]=5, + [7662]=5, + [7663]=5, + [7664]=5, + [7665]=5, + [7666]=5, + [7667]=5, + [7668]=5, + [7669]=5, + [7675]=5, + [7676]=5, + [7677]=5, + [7678]=5, + [7679]=5, [8204]=4, [8205]=2, + [8239]=4, [8294]=4, [8295]=4, [8296]=4, [8297]=4, + [8400]=5, + [8401]=5, + [8402]=5, + [8403]=5, + [8404]=5, + [8405]=5, + [8406]=5, + [8407]=5, + [8408]=5, + [8409]=5, + [8410]=5, + [8411]=5, + [8412]=5, + [8417]=5, + [8421]=5, + [8422]=5, + [8423]=5, + [8424]=5, + [8425]=5, + [8426]=5, + [8427]=5, + [8428]=5, + [8429]=5, + [8430]=5, + [8431]=5, + [8432]=5, + [11503]=5, + [11504]=5, + [11505]=5, + [11647]=5, + [11744]=5, + [11745]=5, + [11746]=5, + [11747]=5, + [11748]=5, + [11749]=5, + [11750]=5, + [11751]=5, + [11752]=5, + [11753]=5, + [11754]=5, + [11755]=5, + [11756]=5, + [11757]=5, + [11758]=5, + [11759]=5, + [11760]=5, + [11761]=5, + [11762]=5, + [11763]=5, + [11764]=5, + [11765]=5, + [11766]=5, + [11767]=5, + [11768]=5, + [11769]=5, + [11770]=5, + [11771]=5, + [11772]=5, + [11773]=5, + [11774]=5, + [11775]=5, + [12330]=5, + [12331]=5, + [12332]=5, + [12333]=5, + [12334]=5, + [12335]=5, + [12441]=5, + [12442]=5, + [42607]=5, + [42612]=5, + [42613]=5, + [42614]=5, + [42615]=5, + [42616]=5, + [42617]=5, + [42618]=5, + [42619]=5, + [42620]=5, + [42621]=5, + [42654]=5, + [42655]=5, + [42736]=5, + [42737]=5, + [43014]=5, + [43019]=5, + [43045]=5, + [43046]=5, [43072]=2, [43073]=2, [43074]=2, @@ -686,6 +1495,120 @@ characters.classifiers={ [43121]=2, [43122]=1, [43123]=4, + [43204]=5, + [43205]=5, + [43232]=5, + [43233]=5, + [43234]=5, + [43235]=5, + [43236]=5, + [43237]=5, + [43238]=5, + [43239]=5, + [43240]=5, + [43241]=5, + [43242]=5, + [43243]=5, + [43244]=5, + [43245]=5, + [43246]=5, + [43247]=5, + [43248]=5, + [43249]=5, + [43302]=5, + [43303]=5, + [43304]=5, + [43305]=5, + [43306]=5, + [43307]=5, + [43308]=5, + [43309]=5, + [43335]=5, + [43336]=5, + [43337]=5, + [43338]=5, + [43339]=5, + [43340]=5, + [43341]=5, + [43342]=5, + [43343]=5, + [43344]=5, + [43345]=5, + [43392]=5, + [43393]=5, + [43394]=5, + [43443]=5, + [43446]=5, + [43447]=5, + [43448]=5, + [43449]=5, + [43452]=5, + [43493]=5, + [43561]=5, + [43562]=5, + [43563]=5, + [43564]=5, + [43565]=5, + [43566]=5, + [43569]=5, + [43570]=5, + [43573]=5, + [43574]=5, + [43587]=5, + [43596]=5, + [43644]=5, + [43696]=5, + [43698]=5, + [43699]=5, + [43700]=5, + [43703]=5, + [43704]=5, + [43710]=5, + [43711]=5, + [43713]=5, + [43756]=5, + [43757]=5, + [43766]=5, + [44005]=5, + [44008]=5, + [44013]=5, + [64286]=5, + [65056]=5, + [65057]=5, + [65058]=5, + [65059]=5, + [65060]=5, + [65061]=5, + [65062]=5, + [65063]=5, + [65064]=5, + [65065]=5, + [65066]=5, + [65067]=5, + [65068]=5, + [65069]=5, + [65070]=5, + [65071]=5, + [66045]=5, + [66272]=5, + [66422]=5, + [66423]=5, + [66424]=5, + [66425]=5, + [66426]=5, + [68097]=5, + [68098]=5, + [68099]=5, + [68101]=5, + [68102]=5, + [68108]=5, + [68109]=5, + [68110]=5, + [68111]=5, + [68152]=5, + [68153]=5, + [68154]=5, + [68159]=5, [68288]=2, [68289]=2, [68290]=2, @@ -723,6 +1646,8 @@ characters.classifiers={ [68322]=4, [68323]=4, [68324]=3, + [68325]=5, + [68326]=5, [68331]=2, [68332]=2, [68333]=2, @@ -753,6 +1678,497 @@ characters.classifiers={ [68525]=2, [68526]=2, [68527]=4, + [69633]=5, + [69688]=5, + [69689]=5, + [69690]=5, + [69691]=5, + [69692]=5, + [69693]=5, + [69694]=5, + [69695]=5, + [69696]=5, + [69697]=5, + [69698]=5, + [69699]=5, + [69700]=5, + [69701]=5, + [69702]=5, + [69759]=5, + [69760]=5, + [69761]=5, + [69811]=5, + [69812]=5, + [69813]=5, + [69814]=5, + [69817]=5, + [69818]=5, + [69888]=5, + [69889]=5, + [69890]=5, + [69927]=5, + [69928]=5, + [69929]=5, + [69930]=5, + [69931]=5, + [69933]=5, + [69934]=5, + [69935]=5, + [69936]=5, + [69937]=5, + [69938]=5, + [69939]=5, + [69940]=5, + [70003]=5, + [70016]=5, + [70017]=5, + [70070]=5, + [70071]=5, + [70072]=5, + [70073]=5, + [70074]=5, + [70075]=5, + [70076]=5, + [70077]=5, + [70078]=5, + [70090]=5, + [70091]=5, + [70092]=5, + [70191]=5, + [70192]=5, + [70193]=5, + [70196]=5, + [70198]=5, + [70199]=5, + [70206]=5, + [70367]=5, + [70371]=5, + [70372]=5, + [70373]=5, + [70374]=5, + [70375]=5, + [70376]=5, + [70377]=5, + [70378]=5, + [70400]=5, + [70401]=5, + [70460]=5, + [70464]=5, + [70502]=5, + [70503]=5, + [70504]=5, + [70505]=5, + [70506]=5, + [70507]=5, + [70508]=5, + [70512]=5, + [70513]=5, + [70514]=5, + [70515]=5, + [70516]=5, + [70712]=5, + [70713]=5, + [70714]=5, + [70715]=5, + [70716]=5, + [70717]=5, + [70718]=5, + [70719]=5, + [70722]=5, + [70723]=5, + [70724]=5, + [70726]=5, + [70835]=5, + [70836]=5, + [70837]=5, + [70838]=5, + [70839]=5, + [70840]=5, + [70842]=5, + [70847]=5, + [70848]=5, + [70850]=5, + [70851]=5, + [71090]=5, + [71091]=5, + [71092]=5, + [71093]=5, + [71100]=5, + [71101]=5, + [71103]=5, + [71104]=5, + [71132]=5, + [71133]=5, + [71219]=5, + [71220]=5, + [71221]=5, + [71222]=5, + [71223]=5, + [71224]=5, + [71225]=5, + [71226]=5, + [71229]=5, + [71231]=5, + [71232]=5, + [71339]=5, + [71341]=5, + [71344]=5, + [71345]=5, + [71346]=5, + [71347]=5, + [71348]=5, + [71349]=5, + [71351]=5, + [71453]=5, + [71454]=5, + [71455]=5, + [71458]=5, + [71459]=5, + [71460]=5, + [71461]=5, + [71463]=5, + [71464]=5, + [71465]=5, + [71466]=5, + [71467]=5, + [72752]=5, + [72753]=5, + [72754]=5, + [72755]=5, + [72756]=5, + [72757]=5, + [72758]=5, + [72760]=5, + [72761]=5, + [72762]=5, + [72763]=5, + [72764]=5, + [72765]=5, + [72767]=5, + [72850]=5, + [72851]=5, + [72852]=5, + [72853]=5, + [72854]=5, + [72855]=5, + [72856]=5, + [72857]=5, + [72858]=5, + [72859]=5, + [72860]=5, + [72861]=5, + [72862]=5, + [72863]=5, + [72864]=5, + [72865]=5, + [72866]=5, + [72867]=5, + [72868]=5, + [72869]=5, + [72870]=5, + [72871]=5, + [72874]=5, + [72875]=5, + [72876]=5, + [72877]=5, + [72878]=5, + [72879]=5, + [72880]=5, + [72882]=5, + [72883]=5, + [72885]=5, + [72886]=5, + [92912]=5, + [92913]=5, + [92914]=5, + [92915]=5, + [92916]=5, + [92976]=5, + [92977]=5, + [92978]=5, + [92979]=5, + [92980]=5, + [92981]=5, + [92982]=5, + [94095]=5, + [94096]=5, + [94097]=5, + [94098]=5, + [113821]=5, + [113822]=5, + [119143]=5, + [119144]=5, + [119145]=5, + [119163]=5, + [119164]=5, + [119165]=5, + [119166]=5, + [119167]=5, + [119168]=5, + [119169]=5, + [119170]=5, + [119173]=5, + [119174]=5, + [119175]=5, + [119176]=5, + [119177]=5, + [119178]=5, + [119179]=5, + [119210]=5, + [119211]=5, + [119212]=5, + [119213]=5, + [119362]=5, + [119363]=5, + [119364]=5, + [121344]=5, + [121345]=5, + [121346]=5, + [121347]=5, + [121348]=5, + [121349]=5, + [121350]=5, + [121351]=5, + [121352]=5, + [121353]=5, + [121354]=5, + [121355]=5, + [121356]=5, + [121357]=5, + [121358]=5, + [121359]=5, + [121360]=5, + [121361]=5, + [121362]=5, + [121363]=5, + [121364]=5, + [121365]=5, + [121366]=5, + [121367]=5, + [121368]=5, + [121369]=5, + [121370]=5, + [121371]=5, + [121372]=5, + [121373]=5, + [121374]=5, + [121375]=5, + [121376]=5, + [121377]=5, + [121378]=5, + [121379]=5, + [121380]=5, + [121381]=5, + [121382]=5, + [121383]=5, + [121384]=5, + [121385]=5, + [121386]=5, + [121387]=5, + [121388]=5, + [121389]=5, + [121390]=5, + [121391]=5, + [121392]=5, + [121393]=5, + [121394]=5, + [121395]=5, + [121396]=5, + [121397]=5, + [121398]=5, + [121403]=5, + [121404]=5, + [121405]=5, + [121406]=5, + [121407]=5, + [121408]=5, + [121409]=5, + [121410]=5, + [121411]=5, + [121412]=5, + [121413]=5, + [121414]=5, + [121415]=5, + [121416]=5, + [121417]=5, + [121418]=5, + [121419]=5, + [121420]=5, + [121421]=5, + [121422]=5, + [121423]=5, + [121424]=5, + [121425]=5, + [121426]=5, + [121427]=5, + [121428]=5, + [121429]=5, + [121430]=5, + [121431]=5, + [121432]=5, + [121433]=5, + [121434]=5, + [121435]=5, + [121436]=5, + [121437]=5, + [121438]=5, + [121439]=5, + [121440]=5, + [121441]=5, + [121442]=5, + [121443]=5, + [121444]=5, + [121445]=5, + [121446]=5, + [121447]=5, + [121448]=5, + [121449]=5, + [121450]=5, + [121451]=5, + [121452]=5, + [121461]=5, + [121476]=5, + [121499]=5, + [121500]=5, + [121501]=5, + [121502]=5, + [121503]=5, + [121505]=5, + [121506]=5, + [121507]=5, + [121508]=5, + [121509]=5, + [121510]=5, + [121511]=5, + [121512]=5, + [121513]=5, + [121514]=5, + [121515]=5, + [121516]=5, + [121517]=5, + [121518]=5, + [121519]=5, + [122880]=5, + [122881]=5, + [122882]=5, + [122883]=5, + [122884]=5, + [122885]=5, + [122886]=5, + [122888]=5, + [122889]=5, + [122890]=5, + [122891]=5, + [122892]=5, + [122893]=5, + [122894]=5, + [122895]=5, + [122896]=5, + [122897]=5, + [122898]=5, + [122899]=5, + [122900]=5, + [122901]=5, + [122902]=5, + [122903]=5, + [122904]=5, + [122907]=5, + [122908]=5, + [122909]=5, + [122910]=5, + [122911]=5, + [122912]=5, + [122913]=5, + [122915]=5, + [122916]=5, + [122918]=5, + [122919]=5, + [122920]=5, + [122921]=5, + [122922]=5, + [125136]=5, + [125137]=5, + [125138]=5, + [125139]=5, + [125140]=5, + [125141]=5, + [125142]=5, + [125184]=2, + [125185]=2, + [125186]=2, + [125187]=2, + [125188]=2, + [125189]=2, + [125190]=2, + [125191]=2, + [125192]=2, + [125193]=2, + [125194]=2, + [125195]=2, + [125196]=2, + [125197]=2, + [125198]=2, + [125199]=2, + [125200]=2, + [125201]=2, + [125202]=2, + [125203]=2, + [125204]=2, + [125205]=2, + [125206]=2, + [125207]=2, + [125208]=2, + [125209]=2, + [125210]=2, + [125211]=2, + [125212]=2, + [125213]=2, + [125214]=2, + [125215]=2, + [125216]=2, + [125217]=2, + [125218]=2, + [125219]=2, + [125220]=2, + [125221]=2, + [125222]=2, + [125223]=2, + [125224]=2, + [125225]=2, + [125226]=2, + [125227]=2, + [125228]=2, + [125229]=2, + [125230]=2, + [125231]=2, + [125232]=2, + [125233]=2, + [125234]=2, + [125235]=2, + [125236]=2, + [125237]=2, + [125238]=2, + [125239]=2, + [125240]=2, + [125241]=2, + [125242]=2, + [125243]=2, + [125244]=2, + [125245]=2, + [125246]=2, + [125247]=2, + [125248]=2, + [125249]=2, + [125250]=2, + [125251]=2, + [125252]=5, + [125253]=5, + [125254]=5, + [125255]=5, + [125256]=5, + [125257]=5, + [125258]=5, + [1042752]=5, } -- done diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua index 5571a82ba..c51473a4b 100644 --- a/tex/generic/context/luatex/luatex-basics-nod.lua +++ b/tex/generic/context/luatex/luatex-basics-nod.lua @@ -228,8 +228,8 @@ nuts.getcomponents = direct.getcomponents or function(n) return getfield(n,"co nuts.setcomponents = direct.setcomponents or function(n,c) setfield(n,"components",c) end nuts.getkern = direct.getkern or function(n) return getfield(n,"kern") end nuts.setkern = direct.setkern or function(n,k) setfield(n,"kern",k) end -nuts.getdir = direct.getkern or function(n) return getfield(n,"dir") end -nuts.setdir = direct.setkern or function(n,d) setfield(n,"dir",d) end +nuts.getdir = direct.getdir or function(n) return getfield(n,"dir") end +nuts.setdir = direct.setdir or function(n,d) setfield(n,"dir",d) end nuts.getwidth = direct.getwidth or function(n) return getfield(n,"width") end nuts.setwidth = direct.setwidth or function(n,w) return setfield(n,"width",w) end nuts.getheight = direct.getheight or function(n) return getfield(n,"height") end @@ -462,3 +462,37 @@ function nuts.copy_only_glyphs(current) end return head end + +nuts.uses_font = direct.uses_font + +if not nuts.uses_font then + local getdisc = nuts.getdisc + local getfont = nuts.getfont + function nuts.uses_font(n,font) + local pre, post, replace = getdisc(n) + if pre then + -- traverse_char + for n in traverse_id(glyph_code,pre) do + if getfont(n) == font then + return true + end + end + end + if post then + for n in traverse_id(glyph_code,post) do + if getfont(n) == font then + return true + end + end + end + if replace then + for n in traverse_id(glyph_code,replace) do + if getfont(n) == font then + return true + end + end + end + return false + end +end + diff --git a/tex/generic/context/luatex/luatex-basics-prepare.tex b/tex/generic/context/luatex/luatex-basics-prepare.tex index 105226440..76a35cc94 100644 --- a/tex/generic/context/luatex/luatex-basics-prepare.tex +++ b/tex/generic/context/luatex/luatex-basics-prepare.tex @@ -58,6 +58,8 @@ for k, c in next, chardata do else classifiers[k] = s_rest end + elseif c.category == "mn" then + classifiers[k] = s_mark end end end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index cc8c27bcf..a94ba85af 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 : 05/12/17 22:40:43 +-- merge date : 05/25/17 12:50:49 do -- begin closure to overcome local limits and interference @@ -5105,8 +5105,8 @@ nuts.getcomponents=direct.getcomponents or function(n) return getfield(n,"compo nuts.setcomponents=direct.setcomponents or function(n,c) setfield(n,"components",c) end nuts.getkern=direct.getkern or function(n) return getfield(n,"kern") end nuts.setkern=direct.setkern or function(n,k) setfield(n,"kern",k) end -nuts.getdir=direct.getkern or function(n) return getfield(n,"dir") end -nuts.setdir=direct.setkern or function(n,d) setfield(n,"dir",d) end +nuts.getdir=direct.getdir or function(n) return getfield(n,"dir") end +nuts.setdir=direct.setdir or function(n,d) setfield(n,"dir",d) end nuts.getwidth=direct.getwidth or function(n) return getfield(n,"width") end nuts.setwidth=direct.setwidth or function(n,w) return setfield(n,"width",w) end nuts.getheight=direct.getheight or function(n) return getfield(n,"height") end @@ -5310,6 +5310,36 @@ function nuts.copy_only_glyphs(current) end return head end +nuts.uses_font=direct.uses_font +if not nuts.uses_font then + local getdisc=nuts.getdisc + local getfont=nuts.getfont + function nuts.uses_font(n,font) + local pre,post,replace=getdisc(n) + if pre then + for n in traverse_id(glyph_code,pre) do + if getfont(n)==font then + return true + end + end + end + if post then + for n in traverse_id(glyph_code,post) do + if getfont(n)==font then + return true + end + end + end + if replace then + for n in traverse_id(glyph_code,replace) do + if getfont(n)==font then + return true + end + end + end + return false + end +end end -- closure @@ -5319,6 +5349,174 @@ do -- begin closure to overcome local limits and interference characters=characters or {} characters.blockrange={} characters.classifiers={ + [768]=5, + [769]=5, + [770]=5, + [771]=5, + [772]=5, + [773]=5, + [774]=5, + [775]=5, + [776]=5, + [777]=5, + [778]=5, + [779]=5, + [780]=5, + [781]=5, + [782]=5, + [783]=5, + [784]=5, + [785]=5, + [786]=5, + [787]=5, + [788]=5, + [789]=5, + [790]=5, + [791]=5, + [792]=5, + [793]=5, + [794]=5, + [795]=5, + [796]=5, + [797]=5, + [798]=5, + [799]=5, + [800]=5, + [801]=5, + [802]=5, + [803]=5, + [804]=5, + [805]=5, + [806]=5, + [807]=5, + [808]=5, + [809]=5, + [810]=5, + [811]=5, + [812]=5, + [813]=5, + [814]=5, + [815]=5, + [816]=5, + [817]=5, + [818]=5, + [819]=5, + [820]=5, + [821]=5, + [822]=5, + [823]=5, + [824]=5, + [825]=5, + [826]=5, + [827]=5, + [828]=5, + [829]=5, + [830]=5, + [831]=5, + [832]=5, + [833]=5, + [834]=5, + [835]=5, + [836]=5, + [837]=5, + [838]=5, + [839]=5, + [840]=5, + [841]=5, + [842]=5, + [843]=5, + [844]=5, + [845]=5, + [846]=5, + [847]=5, + [848]=5, + [849]=5, + [850]=5, + [851]=5, + [852]=5, + [853]=5, + [854]=5, + [855]=5, + [856]=5, + [857]=5, + [858]=5, + [859]=5, + [860]=5, + [861]=5, + [862]=5, + [863]=5, + [864]=5, + [865]=5, + [866]=5, + [867]=5, + [868]=5, + [869]=5, + [870]=5, + [871]=5, + [872]=5, + [873]=5, + [874]=5, + [875]=5, + [876]=5, + [877]=5, + [878]=5, + [879]=5, + [1155]=5, + [1156]=5, + [1157]=5, + [1158]=5, + [1159]=5, + [1425]=5, + [1426]=5, + [1427]=5, + [1428]=5, + [1429]=5, + [1430]=5, + [1431]=5, + [1432]=5, + [1433]=5, + [1434]=5, + [1435]=5, + [1436]=5, + [1437]=5, + [1438]=5, + [1439]=5, + [1440]=5, + [1441]=5, + [1442]=5, + [1443]=5, + [1444]=5, + [1445]=5, + [1446]=5, + [1447]=5, + [1448]=5, + [1449]=5, + [1450]=5, + [1451]=5, + [1452]=5, + [1453]=5, + [1454]=5, + [1455]=5, + [1456]=5, + [1457]=5, + [1458]=5, + [1459]=5, + [1460]=5, + [1461]=5, + [1462]=5, + [1463]=5, + [1464]=5, + [1465]=5, + [1466]=5, + [1467]=5, + [1468]=5, + [1469]=5, + [1471]=5, + [1473]=5, + [1474]=5, + [1476]=5, + [1477]=5, + [1479]=5, [1536]=4, [1537]=4, [1538]=4, @@ -5699,6 +5897,17 @@ characters.classifiers={ [1917]=2, [1918]=2, [1919]=2, + [1958]=5, + [1959]=5, + [1960]=5, + [1961]=5, + [1962]=5, + [1963]=5, + [1964]=5, + [1965]=5, + [1966]=5, + [1967]=5, + [1968]=5, [1984]=6, [1985]=6, [1986]=6, @@ -5758,6 +5967,27 @@ characters.classifiers={ [2040]=6, [2041]=6, [2042]=2, + [2070]=5, + [2071]=5, + [2072]=5, + [2073]=5, + [2075]=5, + [2076]=5, + [2077]=5, + [2078]=5, + [2079]=5, + [2080]=5, + [2081]=5, + [2082]=5, + [2083]=5, + [2085]=5, + [2086]=5, + [2087]=5, + [2089]=5, + [2090]=5, + [2091]=5, + [2092]=5, + [2093]=5, [2112]=3, [2113]=2, [2114]=2, @@ -5783,6 +6013,9 @@ characters.classifiers={ [2134]=4, [2135]=4, [2136]=4, + [2137]=5, + [2138]=5, + [2139]=5, [2208]=2, [2209]=2, [2210]=2, @@ -5804,9 +6037,339 @@ characters.classifiers={ [2226]=3, [2227]=2, [2228]=2, + [2230]=2, + [2231]=2, + [2232]=2, + [2233]=3, + [2234]=2, + [2235]=2, + [2236]=2, + [2237]=2, + [2260]=5, + [2261]=5, + [2262]=5, + [2263]=5, + [2264]=5, + [2265]=5, + [2266]=5, + [2267]=5, + [2268]=5, + [2269]=5, + [2270]=5, + [2271]=5, + [2272]=5, + [2273]=5, + [2274]=4, + [2275]=5, + [2276]=5, + [2277]=5, + [2278]=5, + [2279]=5, + [2280]=5, + [2281]=5, + [2282]=5, + [2283]=5, + [2284]=5, + [2285]=5, + [2286]=5, + [2287]=5, + [2288]=5, + [2289]=5, + [2290]=5, + [2291]=5, + [2292]=5, + [2293]=5, + [2294]=5, + [2295]=5, + [2296]=5, + [2297]=5, + [2298]=5, + [2299]=5, + [2300]=5, + [2301]=5, + [2302]=5, + [2303]=5, + [2304]=5, + [2305]=5, + [2306]=5, + [2362]=5, + [2364]=5, + [2369]=5, + [2370]=5, + [2371]=5, + [2372]=5, + [2373]=5, + [2374]=5, + [2375]=5, + [2376]=5, + [2381]=5, + [2385]=5, + [2386]=5, + [2387]=5, + [2388]=5, + [2389]=5, + [2390]=5, + [2391]=5, + [2402]=5, + [2403]=5, + [2433]=5, + [2492]=5, + [2497]=5, + [2498]=5, + [2499]=5, + [2500]=5, + [2509]=5, + [2530]=5, + [2531]=5, + [2561]=5, + [2562]=5, + [2620]=5, + [2625]=5, + [2626]=5, + [2631]=5, + [2632]=5, + [2635]=5, + [2636]=5, + [2637]=5, + [2641]=5, + [2672]=5, + [2673]=5, + [2677]=5, + [2689]=5, + [2690]=5, + [2748]=5, + [2753]=5, + [2754]=5, + [2755]=5, + [2756]=5, + [2757]=5, + [2759]=5, + [2760]=5, + [2765]=5, + [2786]=5, + [2787]=5, + [2817]=5, + [2876]=5, + [2879]=5, + [2881]=5, + [2882]=5, + [2883]=5, + [2884]=5, + [2893]=5, + [2902]=5, + [2914]=5, + [2915]=5, + [2946]=5, + [3008]=5, + [3021]=5, + [3072]=5, + [3134]=5, + [3135]=5, + [3136]=5, + [3142]=5, + [3143]=5, + [3144]=5, + [3146]=5, + [3147]=5, + [3148]=5, + [3149]=5, + [3157]=5, + [3158]=5, + [3170]=5, + [3171]=5, + [3201]=5, + [3260]=5, + [3263]=5, + [3270]=5, + [3276]=5, + [3277]=5, + [3298]=5, + [3299]=5, + [3329]=5, + [3393]=5, + [3394]=5, + [3395]=5, + [3396]=5, + [3405]=5, + [3426]=5, + [3427]=5, + [3530]=5, + [3538]=5, + [3539]=5, + [3540]=5, + [3542]=5, + [3633]=5, + [3636]=5, + [3637]=5, + [3638]=5, + [3639]=5, + [3640]=5, + [3641]=5, + [3642]=5, + [3655]=5, + [3656]=5, + [3657]=5, + [3658]=5, + [3659]=5, + [3660]=5, + [3661]=5, + [3662]=5, + [3761]=5, + [3764]=5, + [3765]=5, + [3766]=5, + [3767]=5, + [3768]=5, + [3769]=5, + [3771]=5, + [3772]=5, + [3784]=5, + [3785]=5, + [3786]=5, + [3787]=5, + [3788]=5, + [3789]=5, + [3864]=5, + [3865]=5, + [3893]=5, + [3895]=5, + [3897]=5, + [3953]=5, + [3954]=5, + [3955]=5, + [3956]=5, + [3957]=5, + [3958]=5, + [3959]=5, + [3960]=5, + [3961]=5, + [3962]=5, + [3963]=5, + [3964]=5, + [3965]=5, + [3966]=5, + [3968]=5, + [3969]=5, + [3970]=5, + [3971]=5, + [3972]=5, + [3974]=5, + [3975]=5, + [3981]=5, + [3982]=5, + [3983]=5, + [3984]=5, + [3985]=5, + [3986]=5, + [3987]=5, + [3988]=5, + [3989]=5, + [3990]=5, + [3991]=5, + [3993]=5, + [3994]=5, + [3995]=5, + [3996]=5, + [3997]=5, + [3998]=5, + [3999]=5, + [4000]=5, + [4001]=5, + [4002]=5, + [4003]=5, + [4004]=5, + [4005]=5, + [4006]=5, + [4007]=5, + [4008]=5, + [4009]=5, + [4010]=5, + [4011]=5, + [4012]=5, + [4013]=5, + [4014]=5, + [4015]=5, + [4016]=5, + [4017]=5, + [4018]=5, + [4019]=5, + [4020]=5, + [4021]=5, + [4022]=5, + [4023]=5, + [4024]=5, + [4025]=5, + [4026]=5, + [4027]=5, + [4028]=5, + [4038]=5, + [4141]=5, + [4142]=5, + [4143]=5, + [4144]=5, + [4146]=5, + [4147]=5, + [4148]=5, + [4149]=5, + [4150]=5, + [4151]=5, + [4153]=5, + [4154]=5, + [4157]=5, + [4158]=5, + [4184]=5, + [4185]=5, + [4190]=5, + [4191]=5, + [4192]=5, + [4209]=5, + [4210]=5, + [4211]=5, + [4212]=5, + [4226]=5, + [4229]=5, + [4230]=5, + [4237]=5, + [4253]=5, + [4957]=5, + [4958]=5, + [4959]=5, + [5906]=5, + [5907]=5, + [5908]=5, + [5938]=5, + [5939]=5, + [5940]=5, + [5970]=5, + [5971]=5, + [6002]=5, + [6003]=5, + [6071]=5, + [6072]=5, + [6073]=5, + [6074]=5, + [6075]=5, + [6076]=5, + [6077]=5, + [6086]=5, + [6089]=5, + [6090]=5, + [6091]=5, + [6092]=5, + [6093]=5, + [6094]=5, + [6095]=5, + [6096]=5, + [6097]=5, + [6098]=5, + [6099]=5, + [6109]=5, [6150]=4, [6151]=2, [6154]=2, + [6155]=5, + [6156]=5, + [6157]=5, [6158]=4, [6176]=2, [6177]=2, @@ -5901,8 +6464,6 @@ characters.classifiers={ [6274]=4, [6275]=4, [6276]=4, - [6277]=4, - [6278]=4, [6279]=2, [6280]=2, [6281]=2, @@ -5937,13 +6498,291 @@ characters.classifiers={ [6310]=2, [6311]=2, [6312]=2, + [6313]=5, [6314]=2, + [6432]=5, + [6433]=5, + [6434]=5, + [6439]=5, + [6440]=5, + [6450]=5, + [6457]=5, + [6458]=5, + [6459]=5, + [6679]=5, + [6680]=5, + [6742]=5, + [6744]=5, + [6745]=5, + [6746]=5, + [6747]=5, + [6748]=5, + [6749]=5, + [6750]=5, + [6752]=5, + [6754]=5, + [6757]=5, + [6758]=5, + [6759]=5, + [6760]=5, + [6761]=5, + [6762]=5, + [6763]=5, + [6764]=5, + [6771]=5, + [6772]=5, + [6773]=5, + [6774]=5, + [6775]=5, + [6776]=5, + [6777]=5, + [6778]=5, + [6779]=5, + [6780]=5, + [6783]=5, + [6832]=5, + [6833]=5, + [6834]=5, + [6835]=5, + [6836]=5, + [6837]=5, + [6838]=5, + [6839]=5, + [6840]=5, + [6841]=5, + [6842]=5, + [6843]=5, + [6844]=5, + [6845]=5, + [6912]=5, + [6913]=5, + [6914]=5, + [6915]=5, + [6964]=5, + [6966]=5, + [6967]=5, + [6968]=5, + [6969]=5, + [6970]=5, + [6972]=5, + [6978]=5, + [7019]=5, + [7020]=5, + [7021]=5, + [7022]=5, + [7023]=5, + [7024]=5, + [7025]=5, + [7026]=5, + [7027]=5, + [7040]=5, + [7041]=5, + [7074]=5, + [7075]=5, + [7076]=5, + [7077]=5, + [7080]=5, + [7081]=5, + [7083]=5, + [7142]=5, + [7144]=5, + [7145]=5, + [7149]=5, + [7151]=5, + [7152]=5, + [7153]=5, + [7212]=5, + [7213]=5, + [7214]=5, + [7215]=5, + [7216]=5, + [7217]=5, + [7218]=5, + [7219]=5, + [7222]=5, + [7223]=5, + [7376]=5, + [7377]=5, + [7378]=5, + [7380]=5, + [7381]=5, + [7382]=5, + [7383]=5, + [7384]=5, + [7385]=5, + [7386]=5, + [7387]=5, + [7388]=5, + [7389]=5, + [7390]=5, + [7391]=5, + [7392]=5, + [7394]=5, + [7395]=5, + [7396]=5, + [7397]=5, + [7398]=5, + [7399]=5, + [7400]=5, + [7405]=5, + [7412]=5, + [7416]=5, + [7417]=5, + [7616]=5, + [7617]=5, + [7618]=5, + [7619]=5, + [7620]=5, + [7621]=5, + [7622]=5, + [7623]=5, + [7624]=5, + [7625]=5, + [7626]=5, + [7627]=5, + [7628]=5, + [7629]=5, + [7630]=5, + [7631]=5, + [7632]=5, + [7633]=5, + [7634]=5, + [7635]=5, + [7636]=5, + [7637]=5, + [7638]=5, + [7639]=5, + [7640]=5, + [7641]=5, + [7642]=5, + [7643]=5, + [7644]=5, + [7645]=5, + [7646]=5, + [7647]=5, + [7648]=5, + [7649]=5, + [7650]=5, + [7651]=5, + [7652]=5, + [7653]=5, + [7654]=5, + [7655]=5, + [7656]=5, + [7657]=5, + [7658]=5, + [7659]=5, + [7660]=5, + [7661]=5, + [7662]=5, + [7663]=5, + [7664]=5, + [7665]=5, + [7666]=5, + [7667]=5, + [7668]=5, + [7669]=5, + [7675]=5, + [7676]=5, + [7677]=5, + [7678]=5, + [7679]=5, [8204]=4, [8205]=2, + [8239]=4, [8294]=4, [8295]=4, [8296]=4, [8297]=4, + [8400]=5, + [8401]=5, + [8402]=5, + [8403]=5, + [8404]=5, + [8405]=5, + [8406]=5, + [8407]=5, + [8408]=5, + [8409]=5, + [8410]=5, + [8411]=5, + [8412]=5, + [8417]=5, + [8421]=5, + [8422]=5, + [8423]=5, + [8424]=5, + [8425]=5, + [8426]=5, + [8427]=5, + [8428]=5, + [8429]=5, + [8430]=5, + [8431]=5, + [8432]=5, + [11503]=5, + [11504]=5, + [11505]=5, + [11647]=5, + [11744]=5, + [11745]=5, + [11746]=5, + [11747]=5, + [11748]=5, + [11749]=5, + [11750]=5, + [11751]=5, + [11752]=5, + [11753]=5, + [11754]=5, + [11755]=5, + [11756]=5, + [11757]=5, + [11758]=5, + [11759]=5, + [11760]=5, + [11761]=5, + [11762]=5, + [11763]=5, + [11764]=5, + [11765]=5, + [11766]=5, + [11767]=5, + [11768]=5, + [11769]=5, + [11770]=5, + [11771]=5, + [11772]=5, + [11773]=5, + [11774]=5, + [11775]=5, + [12330]=5, + [12331]=5, + [12332]=5, + [12333]=5, + [12334]=5, + [12335]=5, + [12441]=5, + [12442]=5, + [42607]=5, + [42612]=5, + [42613]=5, + [42614]=5, + [42615]=5, + [42616]=5, + [42617]=5, + [42618]=5, + [42619]=5, + [42620]=5, + [42621]=5, + [42654]=5, + [42655]=5, + [42736]=5, + [42737]=5, + [43014]=5, + [43019]=5, + [43045]=5, + [43046]=5, [43072]=2, [43073]=2, [43074]=2, @@ -5996,6 +6835,120 @@ characters.classifiers={ [43121]=2, [43122]=1, [43123]=4, + [43204]=5, + [43205]=5, + [43232]=5, + [43233]=5, + [43234]=5, + [43235]=5, + [43236]=5, + [43237]=5, + [43238]=5, + [43239]=5, + [43240]=5, + [43241]=5, + [43242]=5, + [43243]=5, + [43244]=5, + [43245]=5, + [43246]=5, + [43247]=5, + [43248]=5, + [43249]=5, + [43302]=5, + [43303]=5, + [43304]=5, + [43305]=5, + [43306]=5, + [43307]=5, + [43308]=5, + [43309]=5, + [43335]=5, + [43336]=5, + [43337]=5, + [43338]=5, + [43339]=5, + [43340]=5, + [43341]=5, + [43342]=5, + [43343]=5, + [43344]=5, + [43345]=5, + [43392]=5, + [43393]=5, + [43394]=5, + [43443]=5, + [43446]=5, + [43447]=5, + [43448]=5, + [43449]=5, + [43452]=5, + [43493]=5, + [43561]=5, + [43562]=5, + [43563]=5, + [43564]=5, + [43565]=5, + [43566]=5, + [43569]=5, + [43570]=5, + [43573]=5, + [43574]=5, + [43587]=5, + [43596]=5, + [43644]=5, + [43696]=5, + [43698]=5, + [43699]=5, + [43700]=5, + [43703]=5, + [43704]=5, + [43710]=5, + [43711]=5, + [43713]=5, + [43756]=5, + [43757]=5, + [43766]=5, + [44005]=5, + [44008]=5, + [44013]=5, + [64286]=5, + [65056]=5, + [65057]=5, + [65058]=5, + [65059]=5, + [65060]=5, + [65061]=5, + [65062]=5, + [65063]=5, + [65064]=5, + [65065]=5, + [65066]=5, + [65067]=5, + [65068]=5, + [65069]=5, + [65070]=5, + [65071]=5, + [66045]=5, + [66272]=5, + [66422]=5, + [66423]=5, + [66424]=5, + [66425]=5, + [66426]=5, + [68097]=5, + [68098]=5, + [68099]=5, + [68101]=5, + [68102]=5, + [68108]=5, + [68109]=5, + [68110]=5, + [68111]=5, + [68152]=5, + [68153]=5, + [68154]=5, + [68159]=5, [68288]=2, [68289]=2, [68290]=2, @@ -6033,6 +6986,8 @@ characters.classifiers={ [68322]=4, [68323]=4, [68324]=3, + [68325]=5, + [68326]=5, [68331]=2, [68332]=2, [68333]=2, @@ -6063,6 +7018,497 @@ characters.classifiers={ [68525]=2, [68526]=2, [68527]=4, + [69633]=5, + [69688]=5, + [69689]=5, + [69690]=5, + [69691]=5, + [69692]=5, + [69693]=5, + [69694]=5, + [69695]=5, + [69696]=5, + [69697]=5, + [69698]=5, + [69699]=5, + [69700]=5, + [69701]=5, + [69702]=5, + [69759]=5, + [69760]=5, + [69761]=5, + [69811]=5, + [69812]=5, + [69813]=5, + [69814]=5, + [69817]=5, + [69818]=5, + [69888]=5, + [69889]=5, + [69890]=5, + [69927]=5, + [69928]=5, + [69929]=5, + [69930]=5, + [69931]=5, + [69933]=5, + [69934]=5, + [69935]=5, + [69936]=5, + [69937]=5, + [69938]=5, + [69939]=5, + [69940]=5, + [70003]=5, + [70016]=5, + [70017]=5, + [70070]=5, + [70071]=5, + [70072]=5, + [70073]=5, + [70074]=5, + [70075]=5, + [70076]=5, + [70077]=5, + [70078]=5, + [70090]=5, + [70091]=5, + [70092]=5, + [70191]=5, + [70192]=5, + [70193]=5, + [70196]=5, + [70198]=5, + [70199]=5, + [70206]=5, + [70367]=5, + [70371]=5, + [70372]=5, + [70373]=5, + [70374]=5, + [70375]=5, + [70376]=5, + [70377]=5, + [70378]=5, + [70400]=5, + [70401]=5, + [70460]=5, + [70464]=5, + [70502]=5, + [70503]=5, + [70504]=5, + [70505]=5, + [70506]=5, + [70507]=5, + [70508]=5, + [70512]=5, + [70513]=5, + [70514]=5, + [70515]=5, + [70516]=5, + [70712]=5, + [70713]=5, + [70714]=5, + [70715]=5, + [70716]=5, + [70717]=5, + [70718]=5, + [70719]=5, + [70722]=5, + [70723]=5, + [70724]=5, + [70726]=5, + [70835]=5, + [70836]=5, + [70837]=5, + [70838]=5, + [70839]=5, + [70840]=5, + [70842]=5, + [70847]=5, + [70848]=5, + [70850]=5, + [70851]=5, + [71090]=5, + [71091]=5, + [71092]=5, + [71093]=5, + [71100]=5, + [71101]=5, + [71103]=5, + [71104]=5, + [71132]=5, + [71133]=5, + [71219]=5, + [71220]=5, + [71221]=5, + [71222]=5, + [71223]=5, + [71224]=5, + [71225]=5, + [71226]=5, + [71229]=5, + [71231]=5, + [71232]=5, + [71339]=5, + [71341]=5, + [71344]=5, + [71345]=5, + [71346]=5, + [71347]=5, + [71348]=5, + [71349]=5, + [71351]=5, + [71453]=5, + [71454]=5, + [71455]=5, + [71458]=5, + [71459]=5, + [71460]=5, + [71461]=5, + [71463]=5, + [71464]=5, + [71465]=5, + [71466]=5, + [71467]=5, + [72752]=5, + [72753]=5, + [72754]=5, + [72755]=5, + [72756]=5, + [72757]=5, + [72758]=5, + [72760]=5, + [72761]=5, + [72762]=5, + [72763]=5, + [72764]=5, + [72765]=5, + [72767]=5, + [72850]=5, + [72851]=5, + [72852]=5, + [72853]=5, + [72854]=5, + [72855]=5, + [72856]=5, + [72857]=5, + [72858]=5, + [72859]=5, + [72860]=5, + [72861]=5, + [72862]=5, + [72863]=5, + [72864]=5, + [72865]=5, + [72866]=5, + [72867]=5, + [72868]=5, + [72869]=5, + [72870]=5, + [72871]=5, + [72874]=5, + [72875]=5, + [72876]=5, + [72877]=5, + [72878]=5, + [72879]=5, + [72880]=5, + [72882]=5, + [72883]=5, + [72885]=5, + [72886]=5, + [92912]=5, + [92913]=5, + [92914]=5, + [92915]=5, + [92916]=5, + [92976]=5, + [92977]=5, + [92978]=5, + [92979]=5, + [92980]=5, + [92981]=5, + [92982]=5, + [94095]=5, + [94096]=5, + [94097]=5, + [94098]=5, + [113821]=5, + [113822]=5, + [119143]=5, + [119144]=5, + [119145]=5, + [119163]=5, + [119164]=5, + [119165]=5, + [119166]=5, + [119167]=5, + [119168]=5, + [119169]=5, + [119170]=5, + [119173]=5, + [119174]=5, + [119175]=5, + [119176]=5, + [119177]=5, + [119178]=5, + [119179]=5, + [119210]=5, + [119211]=5, + [119212]=5, + [119213]=5, + [119362]=5, + [119363]=5, + [119364]=5, + [121344]=5, + [121345]=5, + [121346]=5, + [121347]=5, + [121348]=5, + [121349]=5, + [121350]=5, + [121351]=5, + [121352]=5, + [121353]=5, + [121354]=5, + [121355]=5, + [121356]=5, + [121357]=5, + [121358]=5, + [121359]=5, + [121360]=5, + [121361]=5, + [121362]=5, + [121363]=5, + [121364]=5, + [121365]=5, + [121366]=5, + [121367]=5, + [121368]=5, + [121369]=5, + [121370]=5, + [121371]=5, + [121372]=5, + [121373]=5, + [121374]=5, + [121375]=5, + [121376]=5, + [121377]=5, + [121378]=5, + [121379]=5, + [121380]=5, + [121381]=5, + [121382]=5, + [121383]=5, + [121384]=5, + [121385]=5, + [121386]=5, + [121387]=5, + [121388]=5, + [121389]=5, + [121390]=5, + [121391]=5, + [121392]=5, + [121393]=5, + [121394]=5, + [121395]=5, + [121396]=5, + [121397]=5, + [121398]=5, + [121403]=5, + [121404]=5, + [121405]=5, + [121406]=5, + [121407]=5, + [121408]=5, + [121409]=5, + [121410]=5, + [121411]=5, + [121412]=5, + [121413]=5, + [121414]=5, + [121415]=5, + [121416]=5, + [121417]=5, + [121418]=5, + [121419]=5, + [121420]=5, + [121421]=5, + [121422]=5, + [121423]=5, + [121424]=5, + [121425]=5, + [121426]=5, + [121427]=5, + [121428]=5, + [121429]=5, + [121430]=5, + [121431]=5, + [121432]=5, + [121433]=5, + [121434]=5, + [121435]=5, + [121436]=5, + [121437]=5, + [121438]=5, + [121439]=5, + [121440]=5, + [121441]=5, + [121442]=5, + [121443]=5, + [121444]=5, + [121445]=5, + [121446]=5, + [121447]=5, + [121448]=5, + [121449]=5, + [121450]=5, + [121451]=5, + [121452]=5, + [121461]=5, + [121476]=5, + [121499]=5, + [121500]=5, + [121501]=5, + [121502]=5, + [121503]=5, + [121505]=5, + [121506]=5, + [121507]=5, + [121508]=5, + [121509]=5, + [121510]=5, + [121511]=5, + [121512]=5, + [121513]=5, + [121514]=5, + [121515]=5, + [121516]=5, + [121517]=5, + [121518]=5, + [121519]=5, + [122880]=5, + [122881]=5, + [122882]=5, + [122883]=5, + [122884]=5, + [122885]=5, + [122886]=5, + [122888]=5, + [122889]=5, + [122890]=5, + [122891]=5, + [122892]=5, + [122893]=5, + [122894]=5, + [122895]=5, + [122896]=5, + [122897]=5, + [122898]=5, + [122899]=5, + [122900]=5, + [122901]=5, + [122902]=5, + [122903]=5, + [122904]=5, + [122907]=5, + [122908]=5, + [122909]=5, + [122910]=5, + [122911]=5, + [122912]=5, + [122913]=5, + [122915]=5, + [122916]=5, + [122918]=5, + [122919]=5, + [122920]=5, + [122921]=5, + [122922]=5, + [125136]=5, + [125137]=5, + [125138]=5, + [125139]=5, + [125140]=5, + [125141]=5, + [125142]=5, + [125184]=2, + [125185]=2, + [125186]=2, + [125187]=2, + [125188]=2, + [125189]=2, + [125190]=2, + [125191]=2, + [125192]=2, + [125193]=2, + [125194]=2, + [125195]=2, + [125196]=2, + [125197]=2, + [125198]=2, + [125199]=2, + [125200]=2, + [125201]=2, + [125202]=2, + [125203]=2, + [125204]=2, + [125205]=2, + [125206]=2, + [125207]=2, + [125208]=2, + [125209]=2, + [125210]=2, + [125211]=2, + [125212]=2, + [125213]=2, + [125214]=2, + [125215]=2, + [125216]=2, + [125217]=2, + [125218]=2, + [125219]=2, + [125220]=2, + [125221]=2, + [125222]=2, + [125223]=2, + [125224]=2, + [125225]=2, + [125226]=2, + [125227]=2, + [125228]=2, + [125229]=2, + [125230]=2, + [125231]=2, + [125232]=2, + [125233]=2, + [125234]=2, + [125235]=2, + [125236]=2, + [125237]=2, + [125238]=2, + [125239]=2, + [125240]=2, + [125241]=2, + [125242]=2, + [125243]=2, + [125244]=2, + [125245]=2, + [125246]=2, + [125247]=2, + [125248]=2, + [125249]=2, + [125250]=2, + [125251]=2, + [125252]=5, + [125253]=5, + [125254]=5, + [125255]=5, + [125256]=5, + [125257]=5, + [125258]=5, + [1042752]=5, } end -- closure @@ -7548,7 +8994,7 @@ local sortedhash,sortedkeys=table.sortedhash,table.sortedkeys local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end) local trace_mapping=false trackers.register("fonts.mapping",function(v) trace_mapping=v end) local report_fonts=logs.reporter("fonts","loading") -local force_ligatures=true directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end) +local force_ligatures=false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end) local fonts=fonts or {} local mappings=fonts.mappings or {} fonts.mappings=mappings @@ -7662,7 +9108,7 @@ do end mappings.overloads=o end -function mappings.addtounicode(data,filename,checklookups) +function mappings.addtounicode(data,filename,checklookups,forceligatures) local resources=data.resources local unicodes=resources.unicodes if not unicodes then @@ -7851,22 +9297,26 @@ function mappings.addtounicode(data,filename,checklookups) end end if not collected then - elseif force_ligatures then + elseif forceligatures or force_ligatures then for i=1,#dlist do local du=dlist[i] - local u=collected[du] - if u then - resolve(descriptions[du],u) + if du>=private or (du>=0xE000 and du<=0xF8FF) then + local u=collected[du] + if u then + resolve(descriptions[du],u) + end end end else for i=1,#dlist do local du=dlist[i] - local glyph=descriptions[du] - if glyph.class=="ligature" and not glyph.unicode then - local u=collected[du] - if u then - resolve(glyph,u) + if du>=private or (du>=0xE000 and du<=0xF8FF) then + local glyph=descriptions[du] + if glyph.class=="ligature" and not glyph.unicode then + local u=collected[du] + if u then + resolve(glyph,u) + end end end end @@ -11857,8 +13307,10 @@ local function applyaxis(glyph,shape,deltas,dowidth) local points=shape.points if points then local nofpoints=#points - local h=nofpoints+1 - local width=dowidth and glyph.width + local h=nofpoints+2 + local l=nofpoints+1 + local dw=0 + local dl=0 for i=1,#deltas do local deltaset=deltas[i] local xvalues=deltaset.xvalues @@ -11883,10 +13335,17 @@ local function applyaxis(glyph,shape,deltas,dowidth) p[2]=p[2]+factor*y end end - elseif width then - local x=xvalues[d+1] - if x then - width=width+factor*x + elseif dowidth then + if d==h then + local x=xvalues[i] + if x then + dw=dw+factor*x + end + elseif d==l then + local x=xvalues[i] + if x then + dl=dl+factor*x + end end end end @@ -11906,16 +13365,21 @@ local function applyaxis(glyph,shape,deltas,dowidth) end end end - if width then + if dowidth then local x=xvalues[h] if x then - width=width+factor*x + dw=dw+factor*x + end + local x=xvalues[l] + if x then + dl=dl+factor*x end end end end - if width then - glyph.width=width + if dowidth then + local width=glyph.width or 0 + glyph.width=width+dw-dl end else report("no points for glyph %a",glyph.name) @@ -12668,7 +14132,7 @@ function readers.gvar(f,fontdata,specification,glyphdata,shapedata) local data={} local tuples={} local glyphdata=fontdata.glyphs - local dowidth=fontdata.variabledata.hvarwidths + local dowidth=not fontdata.variabledata.hvarwidths if bittest(flags,0x0001) then for i=1,nofglyphs+1 do data[i]=dataoffset+readulong(f) @@ -18568,6 +20032,7 @@ otf.coverup={ multiple=justset, kern=justset, pair=justset, + single=justset, ligature=function(coverage,unicode,ligature) local first=ligature[1] local tree=coverage[first] @@ -20191,6 +21656,10 @@ function injections.isspace(n,threshold,id) end end end +local getspaceboth=getboth +function injections.installgetspaceboth(gb) + getspaceboth=gb or getboth +end local function injectspaces(head) if not triggers then return head,false @@ -20211,9 +21680,9 @@ local function injectspaces(head) factor=getthreshold(font) end for n in traverse_id(glue_code,tonut(head)) do - local prev,next=getboth(n) - local prevchar=ischar(prev) - local nextchar=ischar(next) + local prev,next=getspaceboth(n) + local prevchar=prev and ischar(prev) + local nextchar=next and ischar(next) if nextchar then local font=getfont(next) local trig=triggers[font] @@ -20726,11 +22195,10 @@ local report_chain=logs.reporter("fonts","otf chain") local report_process=logs.reporter("fonts","otf process") local report_warning=logs.reporter("fonts","otf warning") local report_run=logs.reporter("fonts","otf run") -registertracker("otf.replacements","otf.singles,otf.multiples,otf.alternatives,otf.ligatures") -registertracker("otf.positions","otf.marks,otf.kerns,otf.cursive") -registertracker("otf.actions","otf.replacements,otf.positions") -registertracker("otf.injections","nodes.injections") -registertracker("otf.sample","otf.steps,otf.actions,otf.analyzing") +registertracker("otf.substitutions","otf.singles","otf.multiples","otf.alternatives","otf.ligatures") +registertracker("otf.positions","otf.marks","otf.kerns","otf.cursive") +registertracker("otf.actions","otf.substitutions","otf.positions") +registertracker("otf.sample","otf.steps","otf.substitutions","otf.positions","otf.analyzing") local nuts=nodes.nuts local tonode=nuts.tonode local tonut=nuts.tonut @@ -20760,6 +22228,7 @@ local setcomponents=nuts.setcomponents local getdir=nuts.getdir local getwidth=nuts.getwidth local ischar=nuts.is_char +local usesfont=nuts.uses_font local insert_node_after=nuts.insert_after local copy_node=nuts.copy local copy_node_list=nuts.copy_list @@ -21288,7 +22757,7 @@ function handlers.gsub_ligature(head,start,dataset,sequence,ligature) end function handlers.gpos_single(head,start,dataset,sequence,kerns,rlmode,step,i,injection) local startchar=getchar(start) - if step.format=="pair" then + if step.format=="pair" or type(kerns)=="table" then local dx,dy,w,h=setpair(start,factor,rlmode,sequence.flags[4],kerns,injection) if trace_kerns then logprocess("%s: shifting single %s by (%p,%p) and correction (%p,%p)",pref(dataset,sequence),gref(startchar),dx,dy,w,h) @@ -23644,102 +25113,167 @@ end otf.helpers=otf.helpers or {} otf.helpers.txtdirstate=txtdirstate otf.helpers.pardirstate=pardirstate -local function featuresprocessor(head,font,attr,direction) - local sequences=sequencelists[font] - if not sequencelists then - return head,false - end - nesting=nesting+1 - if nesting==1 then - currentfont=font - tfmdata=fontdata[font] - descriptions=tfmdata.descriptions - characters=tfmdata.characters - local resources=tfmdata.resources - marks=resources.marks - classes=resources.classes - threshold, - factor=getthreshold(font) - checkmarks=tfmdata.properties.checkmarks - elseif currentfont~=font then - report_warning("nested call with a different font, level %s, quitting",nesting) - nesting=nesting-1 - return head,false - end - head=tonut(head) - if trace_steps then - checkstep(head) - end - local initialrl=direction=="TRT" and -1 or 0 - local done=false - local datasets=otf.dataset(tfmdata,font,attr) - local dirstack={} - sweephead={} - for s=1,#datasets do - local dataset=datasets[s] - local attribute=dataset[2] - local sequence=dataset[3] - local rlparmode=initialrl - local topstack=0 - local typ=sequence.type - local gpossing=typ=="gpos_single" or typ=="gpos_pair" - local handler=handlers[typ] - local steps=sequence.steps - local nofsteps=sequence.nofsteps - if not steps then - local h,d,ok=handler(head,head,dataset,sequence,nil,nil,nil,0,font,attr) - if ok then - done=true - if h then - head=h - end - end - elseif typ=="gsub_reversecontextchain" then - local start=find_node_tail(head) - local rlmode=0 - while start do - local char=ischar(start,font) - if char then - local a - if attr then - a=getattr(start,0) +do + local fastdisc=false directives.register("otf.fastdisc",function(v) fastdisc=v end) + function otf.featuresprocessor(head,font,attr,direction,n) + local sequences=sequencelists[font] + if not sequencelists then + return head,false + end + nesting=nesting+1 + if nesting==1 then + currentfont=font + tfmdata=fontdata[font] + descriptions=tfmdata.descriptions + characters=tfmdata.characters + local resources=tfmdata.resources + marks=resources.marks + classes=resources.classes + threshold, + factor=getthreshold(font) + checkmarks=tfmdata.properties.checkmarks + elseif currentfont~=font then + report_warning("nested call with a different font, level %s, quitting",nesting) + nesting=nesting-1 + return head,false + end + head=tonut(head) + if trace_steps then + checkstep(head) + end + local initialrl=direction=="TRT" and -1 or 0 + local done=false + local datasets=otf.dataset(tfmdata,font,attr) + local dirstack={} + sweephead={} + local discs=fastdisc and n and n>1 and setmetatableindex(function(t,k) + local v=usesfont(k,font) + t[k]=v + return v + end) + for s=1,#datasets do + local dataset=datasets[s] + local attribute=dataset[2] + local sequence=dataset[3] + local rlparmode=initialrl + local topstack=0 + local typ=sequence.type + local gpossing=typ=="gpos_single" or typ=="gpos_pair" + local handler=handlers[typ] + local steps=sequence.steps + local nofsteps=sequence.nofsteps + if not steps then + local h,d,ok=handler(head,head,dataset,sequence,nil,nil,nil,0,font,attr) + if ok then + done=true + if h then + head=h end - if not a or (a==attr) then - for i=1,nofsteps do - local step=steps[i] - local lookupcache=step.coverage - if lookupcache then - local lookupmatch=lookupcache[char] - if lookupmatch then - local ok - head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) - if ok then - done=true - break + end + elseif typ=="gsub_reversecontextchain" then + local start=find_node_tail(head) + local rlmode=0 + while start do + local char=ischar(start,font) + if char then + local a + if attr then + a=getattr(start,0) + end + if not a or (a==attr) then + for i=1,nofsteps do + local step=steps[i] + local lookupcache=step.coverage + if lookupcache then + local lookupmatch=lookupcache[char] + if lookupmatch then + local ok + head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) + if ok then + done=true + break + end end + else + report_missing_coverage(dataset,sequence) end - else - report_missing_coverage(dataset,sequence) end - end - if start then + if start then + start=getprev(start) + end + else start=getprev(start) end else start=getprev(start) end - else - start=getprev(start) end - end - else - local start=head - local rlmode=initialrl - if nofsteps==1 then - local step=steps[1] - local lookupcache=step.coverage - if not lookupcache then - report_missing_coverage(dataset,sequence) + else + local start=head + local rlmode=initialrl + if nofsteps==1 then + local step=steps[1] + local lookupcache=step.coverage + if not lookupcache then + report_missing_coverage(dataset,sequence) + else + while start do + local char,id=ischar(start,font) + if char then + local a + if attr then + if getattr(start,0)==attr and (not attribute or getprop(start,a_state)==attribute) then + a=true + end + elseif not attribute or getprop(start,a_state)==attribute then + a=true + end + if a then + local lookupmatch=lookupcache[char] + if lookupmatch then + local ok + head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,1) + if ok then + done=true + end + end + if start then + start=getnext(start) + end + else + start=getnext(start) + end + elseif char==false then + start=getnext(start) + elseif id==glue_code then + start=getnext(start) + elseif id==disc_code then + if not discs or discs[start]==true then + local ok + if gpossing then + start,ok=kernrun(start,k_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + elseif typ=="gsub_ligature" then + start,ok=testrun(start,t_run_single,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + else + start,ok=comprun(start,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + end + if ok then + done=true + end + else + start=getnext(start) + end + elseif id==math_code then + start=getnext(end_of_math(start)) + elseif id==dir_code then + start,topstack,rlmode=txtdirstate(start,dirstack,topstack,rlparmode) + elseif id==localpar_code then + start,rlparmode,rlmode=pardirstate(start) + else + start=getnext(start) + end + end + end else while start do local char,id=ischar(start,font) @@ -23753,12 +25287,23 @@ local function featuresprocessor(head,font,attr,direction) a=true end if a then - local lookupmatch=lookupcache[char] - if lookupmatch then - local ok - head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,1) - if ok then - done=true + for i=1,nofsteps do + local step=steps[i] + local lookupcache=step.coverage + if lookupcache then + local lookupmatch=lookupcache[char] + if lookupmatch then + local ok + head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) + if ok then + done=true + break + elseif not start then + break + end + end + else + report_missing_coverage(dataset,sequence) end end if start then @@ -23772,16 +25317,20 @@ local function featuresprocessor(head,font,attr,direction) elseif id==glue_code then start=getnext(start) elseif id==disc_code then - local ok - if gpossing then - start,ok=kernrun(start,k_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) - elseif typ=="gsub_ligature" then - start,ok=testrun(start,t_run_single,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) + if not discs or discs[start]==true then + local ok + if gpossing then + start,ok=kernrun(start,k_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + elseif typ=="gsub_ligature" then + start,ok=testrun(start,t_run_multiple,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + else + start,ok=comprun(start,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) + end + if ok then + done=true + end else - start,ok=comprun(start,c_run_single,font,attr,lookupcache,step,dataset,sequence,rlmode,handler) - end - if ok then - done=true + start=getnext(start) end elseif id==math_code then start=getnext(end_of_math(start)) @@ -23794,79 +25343,15 @@ local function featuresprocessor(head,font,attr,direction) end end end - else - while start do - local char,id=ischar(start,font) - if char then - local a - if attr then - if getattr(start,0)==attr and (not attribute or getprop(start,a_state)==attribute) then - a=true - end - elseif not attribute or getprop(start,a_state)==attribute then - a=true - end - if a then - for i=1,nofsteps do - local step=steps[i] - local lookupcache=step.coverage - if lookupcache then - local lookupmatch=lookupcache[char] - if lookupmatch then - local ok - head,start,ok=handler(head,start,dataset,sequence,lookupmatch,rlmode,step,i) - if ok then - done=true - break - elseif not start then - break - end - end - else - report_missing_coverage(dataset,sequence) - end - end - if start then - start=getnext(start) - end - else - start=getnext(start) - end - elseif char==false then - start=getnext(start) - elseif id==glue_code then - start=getnext(start) - elseif id==disc_code then - local ok - if gpossing then - start,ok=kernrun(start,k_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - elseif typ=="gsub_ligature" then - start,ok=testrun(start,t_run_multiple,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - else - start,ok=comprun(start,c_run_multiple,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler) - end - if ok then - done=true - end - elseif id==math_code then - start=getnext(end_of_math(start)) - elseif id==dir_code then - start,topstack,rlmode=txtdirstate(start,dirstack,topstack,rlparmode) - elseif id==localpar_code then - start,rlparmode,rlmode=pardirstate(start) - else - start=getnext(start) - end - end + end + if trace_steps then + registerstep(head) end end - if trace_steps then - registerstep(head) - end + nesting=nesting-1 + head=tonode(head) + return head,done end - nesting=nesting-1 - head=tonode(head) - return head,done end local plugins={} otf.plugins=plugins @@ -23875,12 +25360,12 @@ function otf.registerplugin(name,f) plugins[name]={ name,f } end end -local function plugininitializer(tfmdata,value) +function otf.plugininitializer(tfmdata,value) if type(value)=="string" then tfmdata.shared.plugin=plugins[value] end end -local function pluginprocessor(head,font) +function otf.pluginprocessor(head,font) local s=fontdata[font].shared local p=s and s.plugin if p then @@ -23892,7 +25377,7 @@ local function pluginprocessor(head,font) return head,false end end -local function featuresinitializer(tfmdata,value) +function otf.featuresinitializer(tfmdata,value) end registerotffeature { name="features", @@ -23900,16 +25385,14 @@ registerotffeature { default=true, initializers={ position=1, - node=featuresinitializer, - plug=plugininitializer, + node=otf.featuresinitializer, + plug=otf.plugininitializer, }, processors={ - node=featuresprocessor, - plug=pluginprocessor, + node=otf.featuresprocessor, + plug=otf.pluginprocessor, } } -otf.nodemodeinitializer=featuresinitializer -otf.featuresprocessor=featuresprocessor otf.handlers=handlers local setspacekerns=nodes.injections.setspacekerns if not setspacekerns then os.exit() end if fontfeatures then @@ -24021,9 +25504,9 @@ local function spaceinitializer(tfmdata,value) if type(kern)~="table" then left[k]=kern elseif single then - left[k]=v[3] + left[k]=kern[3] else - local one=v[1] + local one=kern[1] if one then left[k]=one[3] end @@ -26079,7 +27562,7 @@ else local tounicode=fonts.mappings.tounicode16 function otf.getactualtext(s) return - "/Span << /ActualText <feff"..n.."> >> BDC", + "/Span << /ActualText <feff"..s.."> >> BDC", "EMC" end end @@ -26522,6 +28005,7 @@ local normalized={ multiple="multiple", kern="kern", pair="pair", + single="single", chainsubstitution="chainsubstitution", chainposition="chainposition", } @@ -26532,6 +28016,7 @@ local types={ multiple="gsub_multiple", kern="gpos_pair", pair="gpos_pair", + single="gpos_single", chainsubstitution="gsub_contextchain", chainposition="gpos_contextchain", } @@ -26861,6 +28346,7 @@ local function addfeature(data,feature,specifications) end return coverage end + local prepare_single=prepare_pair local function prepare_chain(list,featuretype,sublookups) local rules=list.rules local coverage={} @@ -27076,6 +28562,9 @@ local function addfeature(data,feature,specifications) elseif featuretype=="pair" then format="pair" coverage=prepare_pair(list,featuretype) + elseif featuretype=="single" then + format="single" + coverage=prepare_single(list,featuretype) end if coverage and next(coverage) then nofsteps=nofsteps+1 @@ -27115,6 +28604,10 @@ local function addfeature(data,feature,specifications) category="gpos" format="pair" coverage=prepare_pair(list,featuretype) + elseif featuretype=="single" then + category="gpos" + format="single" + coverage=prepare_single(list,featuretype) elseif featuretype=="chainsubstitution" then category="gsub" coverage=prepare_chain(list,featuretype,sublookups) @@ -29163,7 +30656,6 @@ local allocate=utilities.storage.allocate local trace_defining=false trackers .register("fonts.defining",function(v) trace_defining=v end) local directive_embedall=false directives.register("fonts.embedall",function(v) directive_embedall=v end) trackers.register("fonts.loading","fonts.defining","otf.loading","afm.loading","tfm.loading") -trackers.register("fonts.all","fonts.*","otf.*","afm.*","tfm.*") local report_defining=logs.reporter("fonts","defining") local fonts=fonts local fontdata=fonts.hashes.identifiers @@ -32026,7 +33518,7 @@ end function nodes.handlers.setbasemodepass(v) basemodepass=v end -function nodes.handlers.nodepass(head) +function nodes.handlers.nodepass(head,groupcode,size,packtype,direction) local fontdata=fonts.hashes.identifiers if fontdata then local nuthead=tonut(head) @@ -32036,6 +33528,7 @@ function nodes.handlers.nodepass(head) local basefont=nil local variants=nil local redundant=nil + local nofused=0 for n in traverse_id(glyph_code,nuthead) do local font=getfont(n) if font~=prevfont then @@ -32052,6 +33545,7 @@ function nodes.handlers.nodepass(head) local processors=shared.processes if processors and #processors>0 then usedfonts[font]=processors + nofused=nofused+1 elseif basemodepass then basefont={ n,nil } basefonts[#basefonts+1]=basefont @@ -32132,6 +33626,7 @@ function nodes.handlers.nodepass(head) local processors=shared.processes if processors and #processors>0 then usedfonts[font]=processors + nofused=nofused+1 end end end @@ -32143,7 +33638,7 @@ function nodes.handlers.nodepass(head) if next(usedfonts) then for font,processors in next,usedfonts do for i=1,#processors do - head=processors[i](head,font,0) or head + head=processors[i](head,font,0,direction,nofused) or head end end end @@ -32192,9 +33687,9 @@ local nodepass=nodes.handlers.nodepass local basepass=nodes.handlers.basepass local injectpass=nodes.injections.handler local protectpass=nodes.handlers.protectglyphs -function nodes.simple_font_handler(head) +function nodes.simple_font_handler(head,groupcode,size,packtype,direction) if head then - head=nodepass(head) + head=nodepass(head,groupcode,size,packtype,direction) head=injectpass(head) if not basemodepass then head=basepass(head) diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex index a66aa7d7d..6edc6f74b 100644 --- a/tex/generic/context/luatex/luatex-math.tex +++ b/tex/generic/context/luatex/luatex-math.tex @@ -13,6 +13,9 @@ %D approach (and thereby far from the \CONTEXT\ way). This file is mainly meant for %D Boguslaw Jackowski. +%D In the perspective of the TUG Lucida Opentype project Bruno Voisin checked the code +%D and definitions below and suggested some improvements. + % we provide a remap feature \ifdefined\directlua @@ -42,6 +45,10 @@ \font\tenbf = file:lmroman10-bold.otf:+liga;+kern;+tlig;+trep at 10pt \font\tenbi = file:lmroman10-bolditalic.otf:+liga;+kern;+tlig;+trep at 10pt % + \font\tenos = file:lmroman10-regular.otf:+onum;+liga;+kern;+tlig;+trep at 10pt + \font\sevenos = file:lmroman7-regular.otf:+onum;+liga;+kern;+tlig;+trep at 7pt + \font\fiveos = file:lmroman5-regular.otf:+onum;+liga;+kern;+tlig;+trep at 5pt + % \font\mathfonttextupright = file:latinmodern-math.otf:script=math;ssty=0;mathsize=yes at 10pt \font\mathfontscriptupright = file:latinmodern-math.otf:script=math;ssty=1;mathsize=yes at 7pt \font\mathfontscriptscriptupright = file:latinmodern-math.otf:script=math;ssty=2;mathsize=yes at 5pt @@ -50,6 +57,10 @@ \scriptfont 0 = \mathfontscriptupright \scriptscriptfont 0 = \mathfontscriptscriptupright % + \textfont 1 = \tenos + \scriptfont 1 = \sevenos + \scriptscriptfont 1 = \fiveos + % \tenrm} \def\lucidabright @@ -57,11 +68,15 @@ \font\sevenrm = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep at 7pt \font\fiverm = file:lucidabrightot.otf:+liga;+kern;+tlig;+trep at 5pt % - \font\tentt = file:lucidasanstypewriterot.otf at 10pt - \font\tensl = file:lucidabrightot.otf:slant=0.2;+liga;+kern;+tlig;+trep at 10pt - \font\tenit = file:lucidabrightot-italic.otf:+liga;+kern;+tlig;+trep at 10pt - \font\tenbf = file:lucidabrightot-demi.otf:+liga;+kern;+tlig;+trep at 10pt - \font\tenbi = file:lucidabrightot-demiitalic.otf:+liga;+kern;+tlig;+trep at 10pt + \font\tentt = file:lucidasanstypewriterot.otf at 10pt + \font\tensl = file:lucidabrightot.otf:slant=0.167;+liga;+kern;+tlig;+trep at 10pt + \font\tenit = file:lucidabrightot-italic.otf:+liga;+kern;+tlig;+trep at 10pt + \font\tenbf = file:lucidabrightot-demi.otf:+liga;+kern;+tlig;+trep at 10pt + \font\tenbi = file:lucidabrightot-demiitalic.otf:+liga;+kern;+tlig;+trep at 10pt + % + \font\tenos = file:lucidabrightot.otf:+onum;+liga;+kern;+tlig;+trep at 10pt + \font\sevenos = file:lucidabrightot.otf:+onum;+liga;+kern;+tlig;+trep at 7pt + \font\fiveos = file:lucidabrightot.otf:+onum;+liga;+kern;+tlig;+trep at 5pt % \font\mathfonttextupright = file:lucidabrightmathot.otf:script=math;ssty=0;mathsize=yes at 10pt \font\mathfontscriptupright = file:lucidabrightmathot.otf:script=math;ssty=1;mathsize=yes at 7pt @@ -71,6 +86,10 @@ \scriptfont 0 = \mathfontscriptupright \scriptscriptfont 0 = \mathfontscriptscriptupright % + \textfont 1 = \tenos + \scriptfont 1 = \sevenos + \scriptscriptfont 1 = \fiveos + % \tenrm} \ifdefined\directlua @@ -84,7 +103,6 @@ \fi \newtoks\everymathrm -\newtoks\everymathmit \newtoks\everymathcal \newtoks\everymathit \newtoks\everymathsl @@ -92,6 +110,8 @@ \newtoks\everymathbi \newtoks\everymathtt +% the following commands switch text as well as math + \def\rm{\fam0\relax\the\everymathrm\relax\tenrm\relax} \def\it{\fam0\relax\the\everymathit\relax\tenit\relax} \def\sl{\fam0\relax\the\everymathsl\relax\tensl\relax} @@ -99,13 +119,10 @@ \def\bi{\fam0\relax\the\everymathbi\relax\tenbi\relax} \def\tt{\fam0\relax\the\everymathtt\relax\tentt\relax} -\let\mit \relax % use names or \Uchar or define a vector -\let\cal \relax % idem, i'm not in the mood for this now -\let\oldstyle\relax % no longer misuse of math mode - % tex is fast enough for this kind of assignments: \everymathrm {% + % codes \Umathcode"0041="0"0"0041% \Umathcode"0042="0"0"0042% \Umathcode"0043="0"0"0043% @@ -216,18 +233,69 @@ \Umathcode"03F5="0"0"03F5% \Umathcode"2202="0"0"2202% \Umathcode"2207="0"0"2207% + % commands + \Umathchardef\Alpha "0"0"000391% + \Umathchardef\Beta "0"0"000392% + \Umathchardef\Gamma "0"0"000393% + \Umathchardef\Delta "0"0"000394% + \Umathchardef\Epsilon "0"0"000395% + \Umathchardef\Zeta "0"0"000396% + \Umathchardef\Eta "0"0"000397% + \Umathchardef\Theta "0"0"000398% + \Umathchardef\Iota "0"0"000399% + \Umathchardef\Kappa "0"0"00039A% + \Umathchardef\Lambda "0"0"00039B% + \Umathchardef\Mu "0"0"00039C% + \Umathchardef\Nu "0"0"00039D% + \Umathchardef\Xi "0"0"00039E% + \Umathchardef\Omicron "0"0"00039F% + \Umathchardef\Pi "0"0"0003A0% + \Umathchardef\Rho "0"0"0003A1% + \Umathchardef\Sigma "0"0"0003A3% + \Umathchardef\Tau "0"0"0003A4% + \Umathchardef\Upsilon "0"0"0003A5% + \Umathchardef\Phi "0"0"0003A6% + \Umathchardef\Chi "0"0"0003A7% + \Umathchardef\Psi "0"0"0003A8% + \Umathchardef\Omega "0"0"0003A9% + \Umathchardef\alpha "0"0"0003B1% + \Umathchardef\beta "0"0"0003B2% + \Umathchardef\gamma "0"0"0003B3% + \Umathchardef\delta "0"0"0003B4% + \Umathchardef\varepsilon"0"0"0003B5% + \Umathchardef\zeta "0"0"0003B6% + \Umathchardef\eta "0"0"0003B7% + \Umathchardef\theta "0"0"0003B8% + \Umathchardef\iota "0"0"0003B9% + \Umathchardef\kappa "0"0"0003BA% + \Umathchardef\lambda "0"0"0003BB% + \Umathchardef\mu "0"0"0003BC% + \Umathchardef\nu "0"0"0003BD% + \Umathchardef\xi "0"0"0003BE% + \Umathchardef\omicron "0"0"0003BF% + \Umathchardef\pi "0"0"0003C0% + \Umathchardef\rho "0"0"0003C1% + \Umathchardef\varsigma "0"0"0003C2% + \Umathchardef\sigma "0"0"0003C3% + \Umathchardef\tau "0"0"0003C4% + \Umathchardef\upsilon "0"0"0003C5% + \Umathchardef\varphi "0"0"0003C6% + \Umathchardef\chi "0"0"0003C7% + \Umathchardef\psi "0"0"0003C8% + \Umathchardef\omega "0"0"0003C9% + \Umathchardef\vartheta "0"0"0003D1% + \Umathchardef\phi "0"0"0003D5% + \Umathchardef\varpi "0"0"0003D6% + \Umathchardef\varkappa "0"0"0003F0% + \Umathchardef\varrho "0"0"0003F1% + \Umathchardef\epsilon "0"0"0003F5% + \Umathchardef\varTheta "0"0"0003F4% + \Umathchardef\digamma "0"0"0003DC% \relax } -\everymathmit {% - % not done -} - -\everymathcal {% - % not done -} - \everymathit {% + % codes \Umathcode"0041="0"0"1D434% \Umathcode"0042="0"0"1D435% \Umathcode"0043="0"0"1D436% @@ -338,6 +406,64 @@ \Umathcode"03F5="0"0"1D716% \Umathcode"2202="0"0"1D715% \Umathcode"2207="0"0"1D6FB% + % commands + \Umathchardef\Alpha "0"0"01D6E2% + \Umathchardef\Beta "0"0"01D6E3% + \Umathchardef\Gamma "0"0"01D6E4% + \Umathchardef\Delta "0"0"01D6E5% + \Umathchardef\Epsilon "0"0"01D6E6% + \Umathchardef\Zeta "0"0"01D6E7% + \Umathchardef\Eta "0"0"01D6E8% + \Umathchardef\Theta "0"0"01D6E9% + \Umathchardef\Iota "0"0"01D6EA% + \Umathchardef\Kappa "0"0"01D6EB% + \Umathchardef\Lambda "0"0"01D6EC% + \Umathchardef\Mu "0"0"01D6ED% + \Umathchardef\Nu "0"0"01D6EE% + \Umathchardef\Xi "0"0"01D6EF% + \Umathchardef\Omicron "0"0"01D6F0% + \Umathchardef\Pi "0"0"01D6F1% + \Umathchardef\Rho "0"0"01D6F2% + \Umathchardef\Sigma "0"0"01D6F4% + \Umathchardef\Tau "0"0"01D6F5% + \Umathchardef\Upsilon "0"0"01D6F6% + \Umathchardef\Phi "0"0"01D6F7% + \Umathchardef\Chi "0"0"01D6F8% + \Umathchardef\Psi "0"0"01D6F9% + \Umathchardef\Omega "0"0"01D6FA% + \Umathchardef\alpha "0"0"01D6FC% + \Umathchardef\beta "0"0"01D6FD% + \Umathchardef\gamma "0"0"01D6FE% + \Umathchardef\delta "0"0"01D6FF% + \Umathchardef\varepsilon"0"0"01D700% + \Umathchardef\zeta "0"0"01D701% + \Umathchardef\eta "0"0"01D702% + \Umathchardef\theta "0"0"01D703% + \Umathchardef\iota "0"0"01D704% + \Umathchardef\kappa "0"0"01D705% + \Umathchardef\lambda "0"0"01D706% + \Umathchardef\mu "0"0"01D707% + \Umathchardef\nu "0"0"01D708% + \Umathchardef\xi "0"0"01D709% + \Umathchardef\omicron "0"0"01D70A% + \Umathchardef\pi "0"0"01D70B% + \Umathchardef\rho "0"0"01D70C% + \Umathchardef\varsigma "0"0"01D70D% + \Umathchardef\sigma "0"0"01D70E% + \Umathchardef\tau "0"0"01D70F% + \Umathchardef\upsilon "0"0"01D710% + \Umathchardef\varphi "0"0"01D711% + \Umathchardef\chi "0"0"01D712% + \Umathchardef\psi "0"0"01D713% + \Umathchardef\omega "0"0"01D714% + \Umathchardef\epsilon "0"0"01D716% + \Umathchardef\vartheta "0"0"01D717% + \Umathchardef\varkappa "0"0"01D718% + \Umathchardef\phi "0"0"01D719% + \Umathchardef\varrho "0"0"01D71A% + \Umathchardef\varpi "0"0"01D71B% + \Umathchardef\varTheta "0"0"01D6F3% + \Umathchardef\digamma "0"0"0003DC% \relax } @@ -346,6 +472,7 @@ } \everymathbf {% + % codes \Umathcode"0030="0"0"1D7CE% \Umathcode"0031="0"0"1D7CF% \Umathcode"0032="0"0"1D7D0% @@ -466,10 +593,69 @@ \Umathcode"03F5="0"0"1D6DC% \Umathcode"2202="0"0"1D6DB% \Umathcode"2207="0"0"1D6C1% + % commands + \Umathchardef\Alpha "0"0"01D6A8% + \Umathchardef\Beta "0"0"01D6A9% + \Umathchardef\Gamma "0"0"01D6AA% + \Umathchardef\Delta "0"0"01D6AB% + \Umathchardef\Epsilon "0"0"01D6AC% + \Umathchardef\Zeta "0"0"01D6AD% + \Umathchardef\Eta "0"0"01D6AE% + \Umathchardef\Theta "0"0"01D6AF% + \Umathchardef\Iota "0"0"01D6B0% + \Umathchardef\Kappa "0"0"01D6B1% + \Umathchardef\Lambda "0"0"01D6B2% + \Umathchardef\Mu "0"0"01D6B3% + \Umathchardef\Nu "0"0"01D6B4% + \Umathchardef\Xi "0"0"01D6B5% + \Umathchardef\Omicron "0"0"01D6B6% + \Umathchardef\Pi "0"0"01D6B7% + \Umathchardef\Rho "0"0"01D6B8% + \Umathchardef\Sigma "0"0"01D6BA% + \Umathchardef\Tau "0"0"01D6BB% + \Umathchardef\Upsilon "0"0"01D6BC% + \Umathchardef\Phi "0"0"01D6BD% + \Umathchardef\Chi "0"0"01D6BE% + \Umathchardef\Psi "0"0"01D6BF% + \Umathchardef\Omega "0"0"01D6C0% + \Umathchardef\alpha "0"0"01D6C2% + \Umathchardef\beta "0"0"01D6C3% + \Umathchardef\gamma "0"0"01D6C4% + \Umathchardef\delta "0"0"01D6C5% + \Umathchardef\varepsilon"0"0"01D6C6% + \Umathchardef\zeta "0"0"01D6C7% + \Umathchardef\eta "0"0"01D6C8% + \Umathchardef\theta "0"0"01D6C9% + \Umathchardef\iota "0"0"01D6CA% + \Umathchardef\kappa "0"0"01D6CB% + \Umathchardef\lambda "0"0"01D6CC% + \Umathchardef\mu "0"0"01D6CD% + \Umathchardef\nu "0"0"01D6CE% + \Umathchardef\xi "0"0"01D6CF% + \Umathchardef\omicron "0"0"01D6D0% + \Umathchardef\pi "0"0"01D6D1% + \Umathchardef\rho "0"0"01D6D2% + \Umathchardef\varsigma "0"0"01D6D3% + \Umathchardef\sigma "0"0"01D6D4% + \Umathchardef\tau "0"0"01D6D5% + \Umathchardef\upsilon "0"0"01D6D6% + \Umathchardef\varphi "0"0"01D6D7% + \Umathchardef\chi "0"0"01D6D8% + \Umathchardef\psi "0"0"01D6D9% + \Umathchardef\omega "0"0"01D6DA% + \Umathchardef\epsilon "0"0"01D6DC% + \Umathchardef\vartheta "0"0"01D6DD% + \Umathchardef\varkappa "0"0"01D6DE% + \Umathchardef\phi "0"0"01D6DF% + \Umathchardef\varrho "0"0"01D6E0% + \Umathchardef\varpi "0"0"01D6E1% + \Umathchardef\varTheta "0"0"01D6B9% + \Umathchardef\digamma "0"0"01D7CA% \relax } \everymathbi {% + % codes \Umathcode"0030="0"0"1D7CE% \Umathcode"0031="0"0"1D7CF% \Umathcode"0032="0"0"1D7D0% @@ -590,6 +776,64 @@ \Umathcode"03F5="0"0"1D750% \Umathcode"2202="0"0"1D74F% \Umathcode"2207="0"0"1D735% + % commands + \Umathchardef\Alpha "0"0"01D71C% + \Umathchardef\Beta "0"0"01D71D% + \Umathchardef\Gamma "0"0"01D71E% + \Umathchardef\Delta "0"0"01D71F% + \Umathchardef\Epsilon "0"0"01D720% + \Umathchardef\Zeta "0"0"01D721% + \Umathchardef\Eta "0"0"01D722% + \Umathchardef\Theta "0"0"01D723% + \Umathchardef\Iota "0"0"01D724% + \Umathchardef\Kappa "0"0"01D725% + \Umathchardef\Lambda "0"0"01D726% + \Umathchardef\Mu "0"0"01D727% + \Umathchardef\Nu "0"0"01D728% + \Umathchardef\Xi "0"0"01D729% + \Umathchardef\Omicron "0"0"01D72A% + \Umathchardef\Pi "0"0"01D72B% + \Umathchardef\Rho "0"0"01D72C% + \Umathchardef\Sigma "0"0"01D72E% + \Umathchardef\Tau "0"0"01D72F% + \Umathchardef\Upsilon "0"0"01D730% + \Umathchardef\Phi "0"0"01D731% + \Umathchardef\Chi "0"0"01D732% + \Umathchardef\Psi "0"0"01D733% + \Umathchardef\Omega "0"0"01D734% + \Umathchardef\alpha "0"0"01D736% + \Umathchardef\beta "0"0"01D737% + \Umathchardef\gamma "0"0"01D738% + \Umathchardef\delta "0"0"01D739% + \Umathchardef\varepsilon"0"0"01D73A% + \Umathchardef\zeta "0"0"01D73B% + \Umathchardef\eta "0"0"01D73C% + \Umathchardef\theta "0"0"01D73D% + \Umathchardef\iota "0"0"01D73E% + \Umathchardef\kappa "0"0"01D73F% + \Umathchardef\lambda "0"0"01D740% + \Umathchardef\mu "0"0"01D741% + \Umathchardef\nu "0"0"01D742% + \Umathchardef\xi "0"0"01D743% + \Umathchardef\omicron "0"0"01D744% + \Umathchardef\pi "0"0"01D745% + \Umathchardef\rho "0"0"01D746% + \Umathchardef\varsigma "0"0"01D747% + \Umathchardef\sigma "0"0"01D748% + \Umathchardef\tau "0"0"01D749% + \Umathchardef\upsilon "0"0"01D74A% + \Umathchardef\varphi "0"0"01D74B% + \Umathchardef\chi "0"0"01D74C% + \Umathchardef\psi "0"0"01D74D% + \Umathchardef\omega "0"0"01D74E% + \Umathchardef\epsilon "0"0"01D750% + \Umathchardef\vartheta "0"0"01D751% + \Umathchardef\varkappa "0"0"01D752% + \Umathchardef\phi "0"0"01D753% + \Umathchardef\varrho "0"0"01D754% + \Umathchardef\varpi "0"0"01D755% + \Umathchardef\varTheta "0"0"01D72D% + \Umathchardef\digamma "0"0"01D7CA% \relax } @@ -597,6 +841,75 @@ % not done } +% Nothing special here: + +\let\mit\it + +% We use a special family for this, not that oldstyle in math makes +% much sense, it's more that in good old tex oldstyle was taken from +% math fonts. So, just something compatible: + +\def\oldstyle{\fam1\relax\tenos\relax} + +% Again a text and math one and it had better be used grouped. + +\def\cal{\fam0\relax\the\everymathcal\relax\tenit\relax} + +\everymathcal {% + \Umathcode"0041="0"0"1D49C% A + \Umathcode"0042="0"0"0212C% B + \Umathcode"0043="0"0"1D49E% C + \Umathcode"0044="0"0"1D49F% D + \Umathcode"0045="0"0"02130% E + \Umathcode"0046="0"0"02131% F + \Umathcode"0047="0"0"1D4A2% G + \Umathcode"0048="0"0"0210B% H + \Umathcode"0049="0"0"02110% I + \Umathcode"004A="0"0"1D4A5% J + \Umathcode"004B="0"0"1D4A6% K + \Umathcode"004C="0"0"02112% L + \Umathcode"004D="0"0"02133% M + \Umathcode"004E="0"0"1D4A9% N + \Umathcode"004F="0"0"1D4AA% O + \Umathcode"0050="0"0"1D4AB% P + \Umathcode"0051="0"0"1D4AC% Q + \Umathcode"0052="0"0"0211B% R + \Umathcode"0053="0"0"1D4AE% S + \Umathcode"0054="0"0"1D4AF% T + \Umathcode"0055="0"0"1D4B0% U + \Umathcode"0056="0"0"1D4B1% V + \Umathcode"0057="0"0"1D4B2% W + \Umathcode"0058="0"0"1D4B3% X + \Umathcode"0059="0"0"1D4B4% Y + \Umathcode"005A="0"0"1D4B5% Z + \Umathcode"0061="0"0"1D4B6% a + \Umathcode"0062="0"0"1D4B7% b + \Umathcode"0063="0"0"1D4B8% c + \Umathcode"0064="0"0"1D4B9% d + \Umathcode"0065="0"0"0212F% e + \Umathcode"0066="0"0"1D4BB% f + \Umathcode"0067="0"0"0210A% g + \Umathcode"0068="0"0"1D4BD% h + \Umathcode"0069="0"0"1D4BE% i + \Umathcode"006A="0"0"1D4BF% j + \Umathcode"006B="0"0"1D4C0% k + \Umathcode"006C="0"0"1D4C1% l + \Umathcode"006D="0"0"1D4C2% m + \Umathcode"006E="0"0"1D4C3% n + \Umathcode"006F="0"0"02134% o + \Umathcode"0070="0"0"1D4C5% p + \Umathcode"0071="0"0"1D4C6% q + \Umathcode"0072="0"0"1D4C7% r + \Umathcode"0073="0"0"1D4C8% s + \Umathcode"0074="0"0"1D4C9% t + \Umathcode"0075="0"0"1D4CA% u + \Umathcode"0076="0"0"1D4CB% v + \Umathcode"0077="0"0"1D4CC% w + \Umathcode"0078="0"0"1D4CD% x + \Umathcode"0079="0"0"1D4CE% y + \Umathcode"007A="0"0"1D4CF% z +} + \Udelcode "00021 = "0 "00021 \Udelcode "00028 = "0 "00028 \Udelcode "00028 = "0 "00028 @@ -1831,6 +2144,44 @@ \def\Zeta {\Umathchar "0"0"000396 } \def\zeta {\Umathchar "0"0"0003B6 } +%D The following are suggested by Bruno. As I don't use plain and as the above are +%D taken from text unicode greek I suppose his list is better: + +\def\alpha {\Umathchar "0"0"01D6FC } +\def\beta {\Umathchar "0"0"01D6FD } +\def\chi {\Umathchar "0"0"01D712 } +\def\delta {\Umathchar "0"0"01D6FF } +\def\digamma {\Umathchar "0"0"0003DC } +\def\epsilon {\Umathchar "0"0"01D716 } +\def\eta {\Umathchar "0"0"01D702 } +\def\gamma {\Umathchar "0"0"01D6FE } +\def\iota {\Umathchar "0"0"01D704 } +\def\kappa {\Umathchar "0"0"01D705 } +\def\lambda {\Umathchar "0"0"01D706 } +\def\mu {\Umathchar "0"0"01D707 } +\def\nu {\Umathchar "0"0"01D708 } +\def\omega {\Umathchar "0"0"01D714 } +\def\omicron {\Umathchar "0"0"01D70A } +\def\phi {\Umathchar "0"0"01D719 } +\def\pi {\Umathchar "0"0"01D70B } +\def\psi {\Umathchar "0"0"01D713 } +\def\rho {\Umathchar "0"0"01D70C } +\def\sigma {\Umathchar "0"0"01D70E } +\def\tau {\Umathchar "0"0"01D70F } +\def\theta {\Umathchar "0"0"01D703 } +\def\upsilon {\Umathchar "0"0"01D710 } +\def\varepsilon {\Umathchar "0"0"01D700 } +\def\varkappa {\Umathchar "0"0"01D718 } +\def\varphi {\Umathchar "0"0"01D711 } +\def\varpi {\Umathchar "0"0"01D71B } +\def\varrho {\Umathchar "0"0"01D71A } +\def\varsigma {\Umathchar "0"0"01D70D } +\def\vartheta {\Umathchar "0"0"01D717 } +\def\xi {\Umathchar "0"0"01D709 } +\def\zeta {\Umathchar "0"0"01D701 } + +\def\varTheta {\Umathchar "0"0"0003F4 } + % a few definitions: \def\sqrt {\Uroot "0 "221A{}} @@ -1883,4 +2234,22 @@ \def\k#1{#1^^^^0328} % not in plain \def\b#1{#1^^^^0331} +% for Bruno, when he tests this file with xetex: + +\ifdefined\directlua \else + + \catcode`@=11 + + \def\sqrt{\Uradical "0 "221A } + + \def\root#1\of + {\setbox\rootbox\hbox\bgroup + $\m@th\scriptscriptstyle{#1}$% + \egroup + \mathpalette\r@@t} + + \catcode`@=12 + +\fi + \endinput |