summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/mkii/cont-new.mkii2
-rw-r--r--tex/context/base/mkii/context.mkii2
-rw-r--r--tex/context/base/mkiv/back-exp.lua2
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/font-oup.lua35
-rw-r--r--tex/context/base/mkiv/font-syn.lua12
-rw-r--r--tex/context/base/mkiv/page-mix.lua13
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin25651 -> 25633 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin368477 -> 368494 bytes
-rw-r--r--tex/context/base/mkiv/strc-not.lua23
-rw-r--r--tex/context/base/mkiv/strc-not.mkvi59
-rw-r--r--tex/context/base/mkiv/strc-tag.mkiv17
-rw-r--r--tex/context/interface/mkiv/i-context.pdfbin835956 -> 803706 bytes
-rw-r--r--tex/context/interface/mkiv/i-ipsum.xml81
-rw-r--r--tex/context/interface/mkiv/i-itemgroup.xml64
-rw-r--r--tex/context/interface/mkiv/i-label.xml3
-rw-r--r--tex/context/interface/mkiv/i-labeltext.xml876
-rw-r--r--tex/context/interface/mkiv/i-linenumber.xml16
-rw-r--r--tex/context/interface/mkiv/i-lines.xml24
-rw-r--r--tex/context/interface/mkiv/i-list.xml64
-rw-r--r--tex/context/interface/mkiv/i-lohi.xml20
-rw-r--r--tex/context/interface/mkiv/i-makeup.xml69
-rw-r--r--tex/context/interface/mkiv/i-margindata.xml496
-rw-r--r--tex/context/interface/mkiv/i-mathalignment.xml39
-rw-r--r--tex/context/interface/mkiv/i-mathcases.xml39
-rw-r--r--tex/context/interface/mkiv/i-mathmatrix.xml39
-rw-r--r--tex/context/interface/mkiv/i-mixedcolumns.xml25
-rw-r--r--tex/context/interface/mkiv/i-note.xml217
-rw-r--r--tex/context/interface/mkiv/i-pairedbox.xml68
-rw-r--r--tex/context/interface/mkiv/i-readme.pdfbin60766 -> 60766 bytes
-rw-r--r--tex/context/interface/mkiv/i-register.xml192
-rw-r--r--tex/context/interface/mkiv/i-ruby.xml76
-rw-r--r--tex/context/interface/mkiv/i-scite.xml26
-rw-r--r--tex/context/interface/mkiv/i-script.xml46
-rw-r--r--tex/context/interface/mkiv/i-section.xml409
-rw-r--r--tex/context/interface/mkiv/i-sectionblock.xml93
-rw-r--r--tex/context/interface/mkiv/i-setup.xml145
-rw-r--r--tex/context/interface/mkiv/i-shift.xml31
-rw-r--r--tex/context/interface/mkiv/i-sort.xml66
-rw-r--r--tex/context/interface/mkiv/i-spreadsheet.xml140
-rw-r--r--tex/context/interface/mkiv/i-steps.xml412
-rw-r--r--tex/context/interface/mkiv/i-synonym.xml66
-rw-r--r--tex/context/interface/mkiv/i-tabulation.xml41
-rw-r--r--tex/context/interface/mkiv/i-tagging.xml7
-rw-r--r--tex/context/interface/mkiv/i-tooltip.xml56
-rw-r--r--tex/context/interface/mkiv/i-translate.xml26
-rw-r--r--tex/context/interface/mkiv/i-unit.xml20
-rw-r--r--tex/context/interface/mkiv/i-verbatim.xml222
-rw-r--r--tex/context/interface/mkiv/i-visual.xml154
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua33
51 files changed, 2825 insertions, 1745 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 0d8872594..a2d4494c2 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{2016.11.18 22:20}
+\newcontextversion{2016.11.22 20:03}
%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 ac560b607..76bba0781 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{2016.11.18 22:20}
+\edef\contextversion{2016.11.22 20:03}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index 82142910b..bd87075d0 100644
--- a/tex/context/base/mkiv/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
@@ -122,7 +122,7 @@ local getlist = nuts.getlist
local getid = nuts.getid
local getfield = nuts.getfield
local getattr = nuts.getattr
-local setattr = nuts.setattr
+local setattr = nuts.setattr -- maybe use properties
local isglyph = nuts.isglyph
local traverse_id = nuts.traverse_id
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 7a5ca1f7b..e4c556665 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{2016.11.18 22:20}
+\newcontextversion{2016.11.22 20:03}
%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/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 57f84ee79..734fe35a2 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{2016.11.18 22:20}
+\edef\contextversion{2016.11.22 20:03}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-oup.lua b/tex/context/base/mkiv/font-oup.lua
index c4945734f..cfa90c794 100644
--- a/tex/context/base/mkiv/font-oup.lua
+++ b/tex/context/base/mkiv/font-oup.lua
@@ -29,7 +29,12 @@ local f_index = formatters["I%05X"]
local f_character_y = formatters["%C"]
local f_character_n = formatters["[ %C ]"]
-local doduplicates = true -- can become an option (pseudo feature)
+local check_duplicates = true -- can become an option (pseudo feature) / aways needed anyway
+local check_soft_hyphen = false -- can become an option (pseudo feature) / needed for tagging
+
+directives.register("otf.checksofthyphen",function(v)
+ check_soft_hyphen = v
+end)
local function replaced(list,index,replacement)
if type(list) == "number" then
@@ -106,7 +111,7 @@ local function unifyresources(fontdata,indices)
--
local done = { } -- we need to deal with shared !
--
- local duplicates = doduplicates and resources.duplicates
+ local duplicates = check_duplicates and resources.duplicates
if duplicates and not next(duplicates) then
duplicates = false
end
@@ -359,12 +364,34 @@ local function unifyresources(fontdata,indices)
end
local function copyduplicates(fontdata)
- if doduplicates then
+ if check_duplicates then
local descriptions = fontdata.descriptions
local resources = fontdata.resources
local duplicates = resources.duplicates
+ if check_soft_hyphen then
+ -- ebgaramond has a zero width empty soft hyphen
+ local ds = descriptions[0xAD]
+ if not ds or ds.width == 0 then
+ if ds then
+ descriptions[0xAD] = nil
+ report("patching soft hyphen")
+ else
+ report("adding soft hyphen")
+ end
+ if not duplicates then
+ duplicates = { }
+ resources.duplicates = duplicates
+ end
+ local dh = duplicates[0x2D]
+ if dh then
+ dh[#dh+1] = { [0xAD] = true }
+ else
+ duplicates[0x2D] = { [0xAD] = true }
+ end
+ end
+ end
if duplicates then
- for u, d in next, duplicates do
+ for u, d in next, duplicates do
local du = descriptions[u]
if du then
local t = { f_character_y(u), "@", f_index(du.index), "->" }
diff --git a/tex/context/base/mkiv/font-syn.lua b/tex/context/base/mkiv/font-syn.lua
index 372a16ca1..dce668842 100644
--- a/tex/context/base/mkiv/font-syn.lua
+++ b/tex/context/base/mkiv/font-syn.lua
@@ -620,7 +620,7 @@ local function check_name(data,result,filename,modification,suffix,subfont)
local pfmwidth = result.pfmwidth or 0
local pfmweight = result.pfmweight or 0
--
- specifications[#specifications + 1] = {
+ specifications[#specifications+1] = {
filename = filename, -- unresolved
cleanfilename = cleanfilename,
-- subfontindex = subfont,
@@ -1078,16 +1078,10 @@ local function analyzefiles(olddata)
if result then
if #result > 0 then
for r=1,#result do
- local ok = check_name(data,result[r],storedname,modification,suffix,r) -- subfonts start at zero
- -- if not ok then
- -- nofskipped = nofskipped + 1
- -- end
+ check_name(data,result[r],storedname,modification,suffix,r) -- subfonts start at zero
end
else
- local ok = check_name(data,result,storedname,modification,suffix)
- -- if not ok then
- -- nofskipped = nofskipped + 1
- -- end
+ check_name(data,result,storedname,modification,suffix)
end
if trace_warnings and message and message ~= "" then
report_names("warning when identifying %s font %a, %s",suffix,completename,message)
diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua
index 725073f55..b5e97da4d 100644
--- a/tex/context/base/mkiv/page-mix.lua
+++ b/tex/context/base/mkiv/page-mix.lua
@@ -15,6 +15,8 @@ if not modules then modules = { } end modules ["page-mix"] = {
-- local trackers, logs, storage = trackers, logs, storage
-- local number, table = number, table
+-- todo: explore vsplit (for inserts)
+
local next, type = next, type
local concat = table.concat
local ceil, floor = math.ceil, math.floor
@@ -106,8 +108,15 @@ local forcedbreak = -123
local function collectinserts(result,nxt,nxtid)
local inserts, currentskips, nextskips, inserttotal = { }, 0, 0, 0
+local i = result.i
+if not i then
+ i = 0
+ result.i = i
+end
while nxt do
if nxtid == insert_code then
+ i = i + 1
+result.i = i
inserttotal = inserttotal + getfield(nxt,"height") -- height includes depth
local s = getsubtype(nxt)
local c = inserts[s]
@@ -115,9 +124,11 @@ local function collectinserts(result,nxt,nxtid)
report_state("insert of class %s found",s)
end
if not c then
+local skip = structures.notes.check_spacing(s,i) -- before
+local width = getfield(getskip(skip),"width")
c = { }
inserts[s] = c
- local width = getfield(getskip(s),"width")
+-- local width = getfield(getskip(s),"width")
if not result.inserts[s] then
currentskips = currentskips + width
end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index c5314a03a..fe68167ac 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index e97bc9c18..f50a9aa88 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/strc-not.lua b/tex/context/base/mkiv/strc-not.lua
index ddbd2ae06..523b9dc92 100644
--- a/tex/context/base/mkiv/strc-not.lua
+++ b/tex/context/base/mkiv/strc-not.lua
@@ -448,3 +448,26 @@ function notes.internalid(tag,n)
return r.internal
end
end
+
+-- for the moment here but better in some builder modules
+
+local report_insert = logs.reporter("pagebuilder","insert")
+local trace_insert = false trackers.register("pagebuilder.insert",function(v) trace_insert = v end)
+
+local texgetglue = tex.getglue
+local texsetglue = tex.setglue
+
+function notes.check_spacing(n,i)
+ local gn, pn, mn = texgetglue(n)
+ local gi, pi, mi = texgetglue(i > 1 and "s_strc_notes_inbetween" or "s_strc_notes_before")
+ local gt, pt, mt = gn+gi, pn+pi, mn+mi
+ if trace_insert then
+ report_insert("%s %i: %p plus %p minus %p","always ",n,gn,pn,mn)
+ report_insert("%s %i: %p plus %p minus %p",i > 1 and "inbetween" or "before ",n,gi,pi,mi)
+ report_insert("%s %i: %p plus %p minus %p","effective",n,gt,pt,mt)
+ end
+ texsetglue(0,gt,pt,mt) -- for the moment we use skip register 0
+ return 0
+end
+
+callback.register("build_page_insert", notes.check_spacing)
diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index e1c445ab6..d2626d2ab 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -1053,17 +1053,55 @@
\newskip \s_strc_notes_distance % we need to implement stretch
\newcount\c_strc_notes_columns
+% \def\strc_notes_set_distance
+% {\begingroup
+% \setbox\scratchbox\vbox % no reuse as it can mirror
+% {\forgetall
+% \restoreglobalbodyfont % really needed
+% \dontcomplain
+% \noteparameter\c!before
+% \placenoterule
+% \noteparameter\c!after}%
+% \expandafter\endgroup\expandafter
+% \s_strc_notes_distance\the\htdp\scratchbox\relax} % also dp now
+
+\newskip \s_strc_notes_before
+\newskip \s_strc_notes_inbetween
+\newconditional\c_strc_notes_first_flushed
+
+\appendtoks
+ \edef\p_spacebefore{\rootnoteparameter\c!spacebefore}%
+ \ifx\p_spacebefore\empty
+ \global\s_strc_notes_before\zeropoint
+ \else
+ \setbox\scratchbox\vbox{\blank[\p_spacebefore]\global\s_strc_notes_before\lastskip}%
+ \fi
+ \edef\p_spaceinbetween{\rootnoteparameter\c!spaceinbetween}%
+ \ifx\p_spaceinbetween\empty
+ \global\s_strc_notes_inbetween\zeropoint
+ \else
+ \setbox\scratchbox\vbox{\blank[\p_spaceinbetween]\global\s_strc_notes_inbetween\lastskip}%
+ \fi
+\to \everysynchronizenote
+
\def\strc_notes_set_distance
{\begingroup
+ \restoreglobalbodyfont
\setbox\scratchbox\vbox % no reuse as it can mirror
{\forgetall
- % \strc_notes_set_bodyfont
\dontcomplain
\noteparameter\c!before
\placenoterule
+ \strut
\noteparameter\c!after}%
+ % also dp now
+ \scratchdimen\dimexpr\htdp\scratchbox-\lineheight\relax
+ \ifgridsnapping
+ \getnoflines\scratchdimen
+ \scratchdimen\noflines\lineheight
+ \fi
\expandafter\endgroup\expandafter
- \s_strc_notes_distance\the\htdp\scratchbox\relax} % also dp now
+ \s_strc_notes_distance\the\scratchdimen\relax}
\def\strc_notes_set_columns
{\c_strc_notes_columns\noteparameter\c!n\relax
@@ -1356,14 +1394,18 @@
%
% \dorecurse{6}{\input tufte\footnote{\input ward \input tufte \relax}}
+\newconditional\c_strc_notes_first_placed
+
\unexpanded\def\placenoteinserts
- {\strc_notes_process\strc_notes_place_inserts}
+ {\setfalse\c_strc_notes_first_placed
+ \strc_notes_process\strc_notes_place_inserts}
\def\strc_notes_place_inserts
{\strc_notes_set_delayed % \strc_notes_synchronize % we need to know if it's delayed
\ifconditional\c_strc_notes_delayed \else
\ifdim\ht\currentnoteinsertionnumber>\zeropoint % or a faster delayed test
\strc_notes_place_inserts_indeed
+ \settrue\c_strc_notes_first_placed
\fi
\fi}
@@ -1373,6 +1415,17 @@
\endgraf
\ifvmode
\whitespace
+ \ifconditional\c_strc_notes_first_placed
+ \edef\p_spaceinbetween{\noteparameter\c!spaceinbetween}%
+ \ifx\p_spaceinbetween\empty\else
+ \blank[\p_spaceinbetween]%
+ \fi
+ \else
+ \edef\p_spacebefore{\noteparameter\c!spacebefore}%
+ \ifx\p_spacebefore\empty\else
+ \blank[\p_spacebefore]%
+ \fi
+ \fi
\noteparameter\c!before
\fi
\placenoterule
diff --git a/tex/context/base/mkiv/strc-tag.mkiv b/tex/context/base/mkiv/strc-tag.mkiv
index c9132bf04..7fdfd7afa 100644
--- a/tex/context/base/mkiv/strc-tag.mkiv
+++ b/tex/context/base/mkiv/strc-tag.mkiv
@@ -215,8 +215,23 @@
\unexpanded\def\strc_tags_element_stop_nop
{}
+\def\strc_tags_report_hyphen#1%
+ {\writestatus\m!languages{setting #1 to U+00AD}}
+
+\unexpanded\def\strc_tags_patch_hyphen
+ {% for the moment here
+ \ifnum\languageparameter\s!lefthyphenchar>\zerocount
+ \setuplanguage[\s!default][\s!lefthyphenchar="AD]%
+ \strc_tags_report_hyphen\s!lefthyphenchar
+ \fi
+ \ifnum\languageparameter\s!righthyphenchar>\zerocount
+ \setuplanguage[\s!default][\s!righthyphenchar="AD]%
+ \strc_tags_report_hyphen\s!righthyphenchar
+ \fi
+ \let\strc_tags_report_hyphen\gobbleoneargument}
+
\unexpanded\def\strc_tags_enable_elements
- {\setuplanguage[\s!default][\s!righthyphenchar="AD]% for the moment here
+ {\strc_tags_patch_hyphen
\let\startelement\strc_tags_element_start_yes
\let\stopelement \strc_tags_element_stop_yes
\let\dosettagproperty\strc_tags_set_aspect_yes}
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index ba645e318..161c42371 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-ipsum.xml b/tex/context/interface/mkiv/i-ipsum.xml
new file mode 100644
index 000000000..f96fc5229
--- /dev/null
+++ b/tex/context/interface/mkiv/i-ipsum.xml
@@ -0,0 +1,81 @@
+<?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="defineipsum" file="m-ipsum.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupipsum"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupipsum" file="m-ipsum.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="alternative">
+ <cd:constant type="paragraph" default="yes"/>
+ <cd:constant type="line"/>
+ <cd:constant type="lines"/>
+ <cd:constant type="word"/>
+ <cd:constant type="words"/>
+ </cd:parameter>
+ <cd:parameter name="file">
+ <cd:constant type="cd:file"/>
+ </cd:parameter>
+ <cd:parameter name="n">
+ <cd:constant type="random"/>
+ <cd:constant type="cd:number"/>
+ </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="before">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="after">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="inbetween">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ <cd:parameter name="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="language">
+ <cd:constant type="cd:language"/>
+ </cd:parameter>
+ <cd:parameter name="separator">
+ <cd:constant type="cd:command"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="ipsum" file="m-ipsum.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupipsum"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="directipsum" file="m-ipsum.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-name"/>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml
index eb3412c3d..6fb28b635 100644
--- a/tex/context/interface/mkiv/i-itemgroup.xml
+++ b/tex/context/interface/mkiv/i-itemgroup.xml
@@ -393,10 +393,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="setupitemgroup" generated="yes" variant="example" file="strc-itm.mkvi">
+ <cd:command name="setupitemgroup" generated="yes" variant="instance" file="strc-itm.mkvi">
<cd:sequence>
<cd:string value="setup"/>
- <cd:variable value="itemgroup"/>
+ <cd:instance value="itemgroup"/>
</cd:sequence>
<cd:arguments>
<cd:keywords list="yes" optional="yes">
@@ -411,13 +411,13 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="itemize"/>
+ <cd:resolve name="instance-itemgroup"/>
</cd:instances>
</cd:command>
- <cd:command name="itemgroup" type="environment" generated="yes" variant="example" file="strc-itm.mkvi">
+ <cd:command name="itemgroup" type="environment" generated="yes" variant="instance" file="strc-itm.mkvi">
<cd:sequence>
- <cd:variable value="itemgroup"/>
+ <cd:instance value="itemgroup"/>
</cd:sequence>
<cd:arguments>
<cd:keywords list="yes" optional="yes">
@@ -428,7 +428,7 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="itemize"/>
+ <cd:resolve name="instance-itemgroup"/>
</cd:instances>
</cd:command>
@@ -563,30 +563,34 @@
</cd:arguments>
</cd:command>
- <cd:command name="itemize" type="environment" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:keywords>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="setupitemize" file="strc-itm.mkvi">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="each"/>
- <cd:constant type="cd:number"/>
- </cd:keywords>
- <cd:keywords list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:keywords>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupitemgroup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="itemize" type="environment" file="strc-itm.mkvi">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:inherit name="setupitemgroup"/>
+ </cd:keywords>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupitemgroup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupitemize" file="strc-itm.mkvi">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="each"/>
+ <cd:constant type="cd:number"/>
+ </cd:keywords>
+ <cd:keywords list="yes" optional="yes">
+ <cd:inherit name="setupitemgroup"/>
+ </cd:keywords>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupitemgroup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml
index 592193c35..fe7851d9d 100644
--- a/tex/context/interface/mkiv/i-label.xml
+++ b/tex/context/interface/mkiv/i-label.xml
@@ -149,6 +149,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>
diff --git a/tex/context/interface/mkiv/i-labeltext.xml b/tex/context/interface/mkiv/i-labeltext.xml
index a5a0a5706..34c70231f 100644
--- a/tex/context/interface/mkiv/i-labeltext.xml
+++ b/tex/context/interface/mkiv/i-labeltext.xml
@@ -11,10 +11,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="setuplabeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="setuplabeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
<cd:string value="setup"/>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
@@ -22,22 +22,14 @@
<cd:resolve name="assignment-userdata-list"/>
</cd:arguments>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="presetlabeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="presetlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
<cd:string value="preset"/>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
@@ -45,22 +37,14 @@
<cd:resolve name="assignment-userdata-list"/>
</cd:arguments>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="copylabeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="copylabeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
<cd:string value="copy"/>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
@@ -68,21 +52,13 @@
<cd:resolve name="assignment-labeldata-list"/>
</cd:arguments>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="labeltext" type="environment" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="labeltext" type="environment" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
@@ -90,60 +66,36 @@
<cd:resolve name="keyword-key"/>
</cd:arguments>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="labellanguage" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="labellanguage" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="language"/>
</cd:sequence>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="labeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="labeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="argument-key"/>
</cd:arguments>
<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:resolve name="instance-labelclass"/>
</cd:instances>
</cd:command>
- <cd:command name="labeltexts" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="labeltexts" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="texts"/>
</cd:sequence>
<cd:arguments>
@@ -151,427 +103,421 @@
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="head"/>
- <cd:constant value="label"/>
- <cd:constant value="mathlabel"/>
+ <cd:resolve name="instance-labeltext"/>
</cd:instances>
</cd:command>
- <cd:command name="leftlabeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="leftlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
<cd:string value="left"/>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="argument-key"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="head"/>
- <cd:constant value="label"/>
- <cd:constant value="mathlabel"/>
+ <cd:resolve name="instance-labeltext"/>
</cd:instances>
</cd:command>
- <cd:command name="rightlabeltext" generated="yes" variant="example" file="lang-lab.mkiv">
+ <cd:command name="rightlabeltext" generated="yes" variant="instance" file="lang-lab.mkiv">
<cd:sequence>
<cd:string value="right"/>
- <cd:variable value="label"/>
+ <cd:instance value="label"/>
<cd:string value="text"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="argument-key"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="head"/>
- <cd:constant value="label"/>
- <cd:constant value="mathlabel"/>
+ <cd:resolve name="instance-labeltext"/>
</cd:instances>
</cd:command>
- <cd:command name="setuplabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copylabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="labeltext" type="environment" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="labellanguage" file="lang-lab.mkiv"/>
-
- <cd:command name="labeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="labeltexts" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="leftlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="rightlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupheadtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetheadtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copyheadtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="headtext" type="environment" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="headlanguage" file="lang-lab.mkiv"/>
-
- <cd:command name="headtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="headtexts" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="leftheadtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="rightheadtext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupmathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetmathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copymathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="mathlabeltext" type="environment" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="mathlabellanguage" file="lang-lab.mkiv"/>
-
- <cd:command name="mathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="mathlabeltexts" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="leftmathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="rightmathlabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setuptaglabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presettaglabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copytaglabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="taglabeltext" type="environment" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="taglabellanguage" file="lang-lab.mkiv"/>
-
- <cd:command name="taglabeltext" file="lang-lab.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupunittext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetunittext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copyunittext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="unittext" type="environment" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="unitlanguage" file="phys-dim.mkiv"/>
-
- <cd:command name="unittext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupoperatortext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetoperatortext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copyoperatortext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="operatortext" type="environment" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="operatorlanguage" file="phys-dim.mkiv"/>
-
- <cd:command name="operatortext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupprefixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetprefixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copyprefixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="prefixtext" type="environment" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="prefixlanguage" file="phys-dim.mkiv"/>
-
- <cd:command name="prefixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
-<!--
-
- <cd:command name="setupsuffixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetsuffixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copysuffixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="suffixtext" type="environment" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="suffixlanguage" file="phys-dim.mkiv"/>
-
- <cd:command name="suffixtext" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
-
--->
-
- <cd:command name="setupbtxlabeltext" file="publ-ini.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="presetbtxlabeltext" file="publ-ini.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-userdata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="copybtxlabeltext" file="publ-ini.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="assignment-labeldata-list"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="btxlabeltext" type="environment" file="publ-ini.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-language-optional"/>
- <cd:resolve name="keyword-key"/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="btxlabellanguage" file="publ-ini.mkiv"/>
-
- <cd:command name="btxlabeltext" file="publ-ini.mkiv">
- <cd:arguments>
- <cd:resolve name="argument-key"/>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="setuplabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copylabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="labeltext" type="environment" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="labellanguage" file="lang-lab.mkiv"/>
+
+ <cd:command name="labeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="labeltexts" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="leftlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="rightlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupheadtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetheadtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copyheadtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="headtext" type="environment" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="headlanguage" file="lang-lab.mkiv"/>
+
+ <cd:command name="headtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="headtexts" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="leftheadtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="rightheadtext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupmathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetmathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copymathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="mathlabeltext" type="environment" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="mathlabellanguage" file="lang-lab.mkiv"/>
+
+ <cd:command name="mathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="mathlabeltexts" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="leftmathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="rightmathlabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setuptaglabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presettaglabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copytaglabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="taglabeltext" type="environment" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="taglabellanguage" file="lang-lab.mkiv"/>
+
+ <cd:command name="taglabeltext" file="lang-lab.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupunittext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetunittext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copyunittext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="unittext" type="environment" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="unitlanguage" file="phys-dim.mkiv"/>
+
+ <cd:command name="unittext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupoperatortext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetoperatortext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copyoperatortext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="operatortext" type="environment" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="operatorlanguage" file="phys-dim.mkiv"/>
+
+ <cd:command name="operatortext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupprefixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetprefixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copyprefixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="prefixtext" type="environment" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="prefixlanguage" file="phys-dim.mkiv"/>
+
+ <cd:command name="prefixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupsuffixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetsuffixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copysuffixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="suffixtext" type="environment" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="suffixlanguage" file="phys-dim.mkiv"/>
+
+ <cd:command name="suffixtext" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupbtxlabeltext" file="publ-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="presetbtxlabeltext" file="publ-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-userdata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="copybtxlabeltext" file="publ-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="assignment-labeldata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="btxlabeltext" type="environment" file="publ-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-language-optional"/>
+ <cd:resolve name="keyword-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="btxlabellanguage" file="publ-ini.mkiv"/>
+
+ <cd:command name="btxlabeltext" file="publ-ini.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-key"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-linenumber.xml b/tex/context/interface/mkiv/i-linenumber.xml
index 12d069535..1c7ca2f75 100644
--- a/tex/context/interface/mkiv/i-linenumber.xml
+++ b/tex/context/interface/mkiv/i-linenumber.xml
@@ -93,7 +93,21 @@
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuplinenumbering"/>
+ <cd:parameter name="continue">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="start">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="step">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ <cd:parameter name="method">
+ <cd:constant type="page"/>
+ <cd:constant type="first" default="yes"/>
+ <cd:constant type="next"/>
+ </cd:parameter>
</cd:assignments>
</cd:arguments>
</cd:command>
diff --git a/tex/context/interface/mkiv/i-lines.xml b/tex/context/interface/mkiv/i-lines.xml
index 2d6f56eaf..32c3c6b70 100644
--- a/tex/context/interface/mkiv/i-lines.xml
+++ b/tex/context/interface/mkiv/i-lines.xml
@@ -88,9 +88,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="lines" type="environment" generated="yes" variant="example" file="spac-lin.mkiv">
+ <cd:command name="lines" type="environment" generated="yes" variant="instance" file="spac-lin.mkiv">
<cd:sequence>
- <cd:variable value="lines"/>
+ <cd:instance value="lines"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -98,17 +98,21 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="lines"/>
+ <cd:resolve name="instance-lines"/>
</cd:instances>
</cd:command>
- <cd:command name="lines" type="environment" file="spac-lin.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuplines"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="lines" type="environment" file="spac-lin.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuplines"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="emptylines" file="spac-lin.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml
index da0a4438a..7e0def052 100644
--- a/tex/context/interface/mkiv/i-list.xml
+++ b/tex/context/interface/mkiv/i-list.xml
@@ -409,10 +409,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="setupcombinedlist" generated="yes" variant="example" file="strc-lst.mkvi">
+ <cd:command name="setupcombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi">
<cd:sequence>
<cd:string value="setup"/>
- <cd:variable value="combinedlist"/>
+ <cd:instance value="combinedlist"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes">
@@ -420,14 +420,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="content"/>
+ <cd:resolve name="instance-combinedlist"/>
</cd:instances>
</cd:command>
- <cd:command name="placecombinedlist" generated="yes" variant="example" file="strc-lst.mkvi">
+ <cd:command name="placecombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi">
<cd:sequence>
<cd:string value="place"/>
- <cd:variable value="combinedlist"/>
+ <cd:instance value="combinedlist"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -435,14 +435,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="content"/>
+ <cd:resolve name="instance-combinedlist"/>
</cd:instances>
</cd:command>
- <cd:command name="completecombinedlist" generated="yes" variant="example" file="strc-lst.mkvi">
+ <cd:command name="completecombinedlist" generated="yes" variant="instance" file="strc-lst.mkvi">
<cd:sequence>
<cd:string value="complete"/>
- <cd:variable value="combinedlist"/>
+ <cd:instance value="combinedlist"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -450,33 +450,37 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="content"/>
+ <cd:resolve name="instance-combinedlist"/>
</cd:instances>
</cd:command>
- <cd:command name="setupcontent" file="strc-lst.mkvi">
- <cd:arguments>
- <cd:assignments list="yes">
- <cd:inherit name="setuplist"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="placecontent" file="strc-lst.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuplist"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="setupcontent" file="strc-lst.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setuplist"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="completecontent" file="strc-lst.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuplist"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="placecontent" file="strc-lst.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuplist"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="completecontent" file="strc-lst.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuplist"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="structurelistuservariable" file="strc-lst.mkvi">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-lohi.xml b/tex/context/interface/mkiv/i-lohi.xml
index 878f1deff..1fe891b2c 100644
--- a/tex/context/interface/mkiv/i-lohi.xml
+++ b/tex/context/interface/mkiv/i-lohi.xml
@@ -34,15 +34,15 @@
</cd:arguments>
</cd:command>
- <cd:command name="low" generated="yes" variant="example" file="typo-scr.mkiv">
+ <cd:command name="low" generated="yes" variant="instance" file="typo-scr.mkiv">
<cd:sequence>
- <cd:variable value="low"/>
+ <cd:instance value="low"/>
</cd:sequence>
<cd:arguments>
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="unitslow"/>
+ <cd:resolve name="instance-low"/>
</cd:instances>
</cd:command>
@@ -82,15 +82,15 @@
</cd:arguments>
</cd:command>
- <cd:command name="high" generated="yes" variant="example" file="typo-scr.mkiv">
+ <cd:command name="high" generated="yes" variant="instance" file="typo-scr.mkiv">
<cd:sequence>
- <cd:variable value="high"/>
+ <cd:instance value="high"/>
</cd:sequence>
<cd:arguments>
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="unitshigh"/>
+ <cd:resolve name="instance-high"/>
</cd:instances>
</cd:command>
@@ -133,9 +133,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="lowhigh" generated="yes" variant="example" file="typo-scr.mkiv">
+ <cd:command name="lowhigh" generated="yes" variant="instance" file="typo-scr.mkiv">
<cd:sequence>
- <cd:variable value="lowhigh"/>
+ <cd:instance value="lowhigh"/>
</cd:sequence>
<cd:arguments>
<cd:keywords optional="yes">
@@ -199,9 +199,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="lowmidhigh" generated="yes" variant="example" file="typo-scr.mkiv">
+ <cd:command name="lowmidhigh" generated="yes" variant="instance" file="typo-scr.mkiv">
<cd:sequence>
- <cd:variable value="lowmidhigh"/>
+ <cd:instance value="lowmidhigh"/>
</cd:sequence>
<cd:arguments>
<cd:content/>
diff --git a/tex/context/interface/mkiv/i-makeup.xml b/tex/context/interface/mkiv/i-makeup.xml
index 4424f9fde..8831a8b0b 100644
--- a/tex/context/interface/mkiv/i-makeup.xml
+++ b/tex/context/interface/mkiv/i-makeup.xml
@@ -122,9 +122,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="makeup" type="environment" generated="yes" variant="example" file="page-mak.mkvi">
+ <cd:command name="makeup" type="environment" generated="yes" variant="instance" file="page-mak.mkvi">
<cd:sequence>
- <cd:variable value="makeup"/>
+ <cd:instance value="makeup"/>
<cd:string value="makeup"/>
</cd:sequence>
<cd:arguments>
@@ -133,43 +133,44 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="standard"/>
- <cd:constant value="page"/>
- <cd:constant value="text"/>
- <cd:constant value="middle"/>
+ <cd:resolve name="instance-makeup"/>
</cd:instances>
</cd:command>
- <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmakeup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="textmakeup" type="environment" file="page-mak.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmakeup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="standardmakeup" type="environment" file="page-mak.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmakeup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmakeup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="textmakeup" type="environment" file="page-mak.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmakeup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmakeup"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="pagemakeup" type="environment" file="page-mak.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmakeup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="middlemakeup" type="environment" file="page-mak.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmakeup"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-margindata.xml b/tex/context/interface/mkiv/i-margindata.xml
index 1085daa1e..a54362fec 100644
--- a/tex/context/interface/mkiv/i-margindata.xml
+++ b/tex/context/interface/mkiv/i-margindata.xml
@@ -128,9 +128,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="margindata" generated="yes" variant="example" file="typo-mar.mkiv">
+ <cd:command name="margindata" generated="yes" variant="instance" file="typo-mar.mkiv">
<cd:sequence>
- <cd:variable value="margindata"/>
+ <cd:instance value="margindata"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -145,28 +145,7 @@
<cd:content/>
</cd:arguments>
<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:constant value="marginword"/>
- <cd:constant value="margintitle"/>
- <cd:constant value="inothermargin"/>
- -->
+ <cd:resolve name="instance-margindata"/>
</cd:instances>
</cd:command>
@@ -186,318 +165,253 @@
</cd:arguments>
</cd:command>
- <cd:command name="inleftmargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <!--
+
+ <cd:command name="inleftmargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inrightmargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inrightmargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inoutermargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inoutermargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="ininnermargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="ininnermargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inleftedge" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inleftedge" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inrightedge" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inrightedge" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="ininneredge" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="ininneredge" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inouteredge" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inouteredge" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="atleftmargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="atleftmargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="atrightmargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="atrightmargin" file="typo-mar.mkiv">
+ <cd:arguments>
<cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="inleft" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="inright" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="ininner" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inouter" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="inleft" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmarginframed"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inmargin" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="inright" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmarginframed"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="inother" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmarginframed"/>
- </cd:assignments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="ininner" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmarginframed"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="margintext" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inouter" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
<cd:assignments list="yes" optional="yes">
<cd:inherit name="setupmarginframed"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="marginword" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inmargin" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
<cd:assignments list="yes" optional="yes">
<cd:inherit name="setupmarginframed"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="margintitle" file="typo-mar.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="reference">
- <cd:constant type="cd:reference"/>
- </cd:parameter>
- <cd:inherit name="setupmargindata"/>
- </cd:assignments>
- <!--
+ <cd:command name="inother" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
<cd:assignments list="yes" optional="yes">
<cd:inherit name="setupmarginframed"/>
</cd:assignments>
- -->
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
- <!--
+ <cd:command name="margintext" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="marginword" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="margintitle" file="typo-mar.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="reference">
+ <cd:constant type="cd:reference"/>
+ </cd:parameter>
+ <cd:inherit name="setupmargindata"/>
+ </cd:assignments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
<cd:command name="inothermargin" file="typo-mar.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-mathalignment.xml b/tex/context/interface/mkiv/i-mathalignment.xml
index 55e68ba7f..5caa1348c 100644
--- a/tex/context/interface/mkiv/i-mathalignment.xml
+++ b/tex/context/interface/mkiv/i-mathalignment.xml
@@ -37,9 +37,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="mathalignment" type="environment" generated="yes" variant="example" file="math-ali.mkiv">
+ <cd:command name="mathalignment" type="environment" generated="yes" variant="instance" file="math-ali.mkiv">
<cd:sequence>
- <cd:variable value="mathalignment"/>
+ <cd:instance value="mathalignment"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -47,25 +47,28 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="align"/>
- <cd:constant value="mathalignment"/>
+ <cd:resolve name="instance-mathalignment"/>
</cd:instances>
</cd:command>
- <cd:command name="mathalignment" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathalignment"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="align" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathalignment"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="mathalignment" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathalignment"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="align" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathalignment"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-mathcases.xml b/tex/context/interface/mkiv/i-mathcases.xml
index 945565651..8a27c4413 100644
--- a/tex/context/interface/mkiv/i-mathcases.xml
+++ b/tex/context/interface/mkiv/i-mathcases.xml
@@ -41,9 +41,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="mathcases" type="environment" generated="yes" variant="example" file="math-ali.mkiv">
+ <cd:command name="mathcases" type="environment" generated="yes" variant="instance" file="math-ali.mkiv">
<cd:sequence>
- <cd:variable value="mathcases"/>
+ <cd:instance value="mathcases"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -51,25 +51,28 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="cases"/>
- <cd:constant value="mathcases"/>
+ <cd:resolve name="instance-mathcases"/>
</cd:instances>
</cd:command>
- <cd:command name="mathcases" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathcases"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="cases" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathcases"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="mathcases" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathcases"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cases" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathcases"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml
index 3007cf555..50f99205a 100644
--- a/tex/context/interface/mkiv/i-mathmatrix.xml
+++ b/tex/context/interface/mkiv/i-mathmatrix.xml
@@ -53,9 +53,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="mathmatrix" type="environment" generated="yes" variant="example" file="math-ali.mkiv">
+ <cd:command name="mathmatrix" type="environment" generated="yes" variant="instance" file="math-ali.mkiv">
<cd:sequence>
- <cd:variable value="mathmatrix"/>
+ <cd:instance value="mathmatrix"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -63,26 +63,29 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="matrix"/>
- <cd:constant value="mathmatrix"/>
+ <cd:resolve name="instance-mathmatrix"/>
</cd:instances>
</cd:command>
- <cd:command name="mathmatrix" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathmatrix"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="matrix" type="environment" file="math-ali.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmathmatrix"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="mathmatrix" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathmatrix"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="matrix" type="environment" file="math-ali.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmathmatrix"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="matrices" type="environment" file="math-ali.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-mixedcolumns.xml b/tex/context/interface/mkiv/i-mixedcolumns.xml
index 031347401..6d0142536 100644
--- a/tex/context/interface/mkiv/i-mixedcolumns.xml
+++ b/tex/context/interface/mkiv/i-mixedcolumns.xml
@@ -105,9 +105,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="mixedcolumns" type="environment" generated="yes" variant="example" file="page-mix.mkiv">
+ <cd:command name="mixedcolumns" type="environment" generated="yes" variant="instance" file="page-mix.mkiv">
<cd:sequence>
- <cd:variable value="mixedcolumns"/>
+ <cd:instance value="mixedcolumns"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -115,17 +115,20 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="itemgroupcolumns"/>
- <cd:constant value="boxedcolumns"/>
+ <cd:resolve name="instance-mixedcolumns"/>
</cd:instances>
</cd:command>
- <cd:command name="boxedcolumns" type="environment" file="page-mix.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupmixedcolumns"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="boxedcolumns" type="environment" file="page-mix.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupmixedcolumns"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml
index bcb9f7507..a7ecb5401 100644
--- a/tex/context/interface/mkiv/i-note.xml
+++ b/tex/context/interface/mkiv/i-note.xml
@@ -156,6 +156,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>
@@ -180,69 +183,61 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setupnotations" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupnotation"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
+ <cd:command name="setupnotations" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupnotation"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="note" type="environment" generated="yes" variant="example:assignment" file="strc-not.mkvi">
+ <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" file="strc-not.mkvi">
<cd:sequence>
- <cd:variable value="note"/>
+ <cd:instance value="note"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="assignment-constructiondata-list-optional"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="footnote"/>
- <cd:constant value="endnote"/>
+ <cd:resolve name="instance-note"/>
</cd:instances>
</cd:command>
- <cd:command name="note" type="environment" generated="yes" variant="example" file="strc-not.mkvi">
+ <cd:command name="note" type="environment" generated="yes" variant="instance" file="strc-not.mkvi">
<cd:sequence>
- <cd:variable value="note"/>
+ <cd:instance value="note"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference-list-optional"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="footnote"/>
- <cd:constant value="endnote"/>
+ <cd:resolve name="instance-note"/>
</cd:instances>
</cd:command>
- <cd:command name="note" generated="yes" variant="example" file="strc-not.mkvi">
+ <cd:command name="note" generated="yes" variant="instance" file="strc-not.mkvi">
<cd:sequence>
- <cd:variable value="note"/>
+ <cd:instance value="note"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference-list-optional"/>
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="footnote"/>
- <cd:constant value="endnote"/>
+ <cd:resolve name="instance-note"/>
</cd:instances>
</cd:command>
- <cd:command name="note" generated="yes" variant="example:assignment" file="strc-not.mkvi">
+ <cd:command name="note" generated="yes" variant="instance:assignment" file="strc-not.mkvi">
<cd:sequence>
- <cd:variable value="note"/>
+ <cd:instance value="note"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="assignment-constructiondata-list"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="footnote"/>
- <cd:constant value="endnote"/>
+ <cd:resolve name="instance-note"/>
</cd:instances>
</cd:command>
@@ -391,18 +386,14 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setupnotes" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupnote"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
+ <cd:command name="setupnotes" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupnote"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
<cd:command name="setnote" file="strc-not.mkvi">
<cd:arguments>
@@ -499,30 +490,34 @@
</cd:arguments>
</cd:command>
- <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="assignment-constructiondata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="footnote" type="environment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="assignment-constructiondata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="footnote" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="footnote" type="environment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="footnote" variant="assignment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="assignment-constructiondata-list"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="footnote" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="footnote" variant="assignment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="assignment-constructiondata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="footnotetext" file="strc-not.mkvi">
<cd:arguments>
@@ -555,30 +550,34 @@
</cd:arguments>
</cd:command>
- <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="assignment-constructiondata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="endnote" type="environment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="assignment-constructiondata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="endnote" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="endnote" type="environment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="endnote" variant="assignment" file="strc-not.mkvi">
- <cd:arguments>
- <cd:resolve name="assignment-constructiondata-list"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="endnote" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="endnote" variant="assignment" file="strc-not.mkvi">
+ <cd:arguments>
+ <cd:resolve name="assignment-constructiondata-list"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="definelinenote" file="strc-lnt.mkvi">
<cd:arguments>
@@ -614,42 +613,42 @@
</cd:arguments>
</cd:command>
- <cd:command name="linenote" generated="yes" variant="example" file="strc-lnt.mkvi">
+ <cd:command name="linenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
<cd:sequence>
- <cd:variable value="linenote"/>
+ <cd:instance value="linenote"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="linenote"/>
+ <cd:resolve name="instance-linenote"/>
</cd:instances>
</cd:command>
- <cd:command name="startlinenote" generated="yes" variant="example" file="strc-lnt.mkvi">
+ <cd:command name="startlinenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
<cd:sequence>
<cd:string value="start"/>
- <cd:variable value="linenote"/>
+ <cd:instance value="linenote"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference"/>
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="linenote"/>
+ <cd:resolve name="instance-linenote"/>
</cd:instances>
</cd:command>
- <cd:command name="stoplinenote" generated="yes" variant="example" file="strc-lnt.mkvi">
+ <cd:command name="stoplinenote" generated="yes" variant="instance" file="strc-lnt.mkvi">
<cd:sequence>
<cd:string value="stop"/>
- <cd:variable value="linenote"/>
+ <cd:instance value="linenote"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="linenote"/>
+ <cd:resolve name="instance-linenote"/>
</cd:instances>
</cd:command>
@@ -666,23 +665,27 @@
</cd:arguments>
</cd:command>
- <cd:command name="linenote" file="strc-lnt.mkvi">
- <cd:arguments>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="startlinenote" file="strc-lnt.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="linenote" file="strc-lnt.mkvi">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="stoplinenote" file="strc-lnt.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-reference"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="startlinenote" file="strc-lnt.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="stoplinenote" file="strc-lnt.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-pairedbox.xml b/tex/context/interface/mkiv/i-pairedbox.xml
index aa492b2a5..bbab966ba 100644
--- a/tex/context/interface/mkiv/i-pairedbox.xml
+++ b/tex/context/interface/mkiv/i-pairedbox.xml
@@ -90,10 +90,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="setuppairedbox" generated="yes" variant="example" file="pack-com.mkiv">
+ <cd:command name="setuppairedbox" generated="yes" variant="instance" file="pack-com.mkiv">
<cd:sequence>
<cd:string value="setup"/>
- <cd:variable value="pairedbox"/>
+ <cd:instance value="pairedbox"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes">
@@ -101,14 +101,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="legend"/>
+ <cd:resolve name="instance-pairedbox"/>
</cd:instances>
</cd:command>
- <cd:command name="placepairedbox" generated="yes" variant="example" file="pack-com.mkiv">
+ <cd:command name="placepairedbox" generated="yes" variant="instance" file="pack-com.mkiv">
<cd:sequence>
<cd:string value="place"/>
- <cd:variable value="pairedbox"/>
+ <cd:instance value="pairedbox"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -118,14 +118,14 @@
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="legend"/>
+ <cd:resolve name="instance-pairedbox"/>
</cd:instances>
</cd:command>
- <cd:command name="placepairedbox" type="environment" generated="yes" variant="example" file="pack-com.mkiv">
+ <cd:command name="placepairedbox" type="environment" generated="yes" variant="instance" file="pack-com.mkiv">
<cd:sequence>
<cd:string value="place"/>
- <cd:variable value="pairedbox"/>
+ <cd:instance value="pairedbox"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -133,35 +133,39 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="legend"/>
+ <cd:resolve name="instance-pairedbox"/>
</cd:instances>
</cd:command>
- <cd:command name="setuplegend" file="pack-com.mkiv">
- <cd:arguments>
- <cd:assignments list="yes">
- <cd:inherit name="setuppairedbox"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="placelegend" file="pack-com.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuppairedbox"/>
- </cd:assignments>
- <cd:content/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="setuplegend" file="pack-com.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:inherit name="setuppairedbox"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="placelegend" type="environment" file="pack-com.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuppairedbox"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="placelegend" file="pack-com.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuppairedbox"/>
+ </cd:assignments>
+ <cd:content/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="placelegend" type="environment" file="pack-com.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuppairedbox"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="placeontopofeachother" file="pack-com.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index cc1285fb9..c42739e8c 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
Binary files differ
diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml
index 564fb1340..e13b009ea 100644
--- a/tex/context/interface/mkiv/i-register.xml
+++ b/tex/context/interface/mkiv/i-register.xml
@@ -344,35 +344,31 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-name-list-optional"/>
- <cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="setupregisters" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="cd:name"/>
- <cd:constant type="cd:number" prefix="cd:name" method="range"/>
- </cd:keywords>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="setupregisters" variant="argument" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-number-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupregister"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- -->
+ <cd:command name="setupregisters" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:keywords optional="yes">
+ <cd:constant type="cd:name"/>
+ <cd:constant type="cd:number" prefix="cd:name" method="range"/>
+ </cd:keywords>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupregister"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="register" generated="yes" variant="example" file="strc-reg.mkiv">
+ <cd:command name="register" generated="yes" variant="instance" file="strc-reg.mkiv">
<cd:sequence>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:keywords optional="yes">
@@ -382,13 +378,13 @@
<cd:index list="yes"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="register" generated="yes" variant="example:ownnumber" file="strc-reg.mkiv">
+ <cd:command name="register" generated="yes" variant="instance:ownnumber" file="strc-reg.mkiv">
<cd:sequence>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:keywords optional="yes">
@@ -399,14 +395,14 @@
<cd:index list="yes"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="seeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+ <cd:command name="seeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
<cd:sequence>
<cd:string value="see"/>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:keywords optional="yes">
@@ -420,14 +416,14 @@
</cd:keywords>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="placeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+ <cd:command name="placeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
<cd:sequence>
<cd:string value="place"/>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -435,14 +431,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="completeregister" generated="yes" variant="example" file="strc-reg.mkiv">
+ <cd:command name="completeregister" generated="yes" variant="instance" file="strc-reg.mkiv">
<cd:sequence>
<cd:string value="complete"/>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -450,14 +446,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="setupregister" generated="yes" variant="example" file="strc-reg.mkiv">
+ <cd:command name="setupregister" generated="yes" variant="instance" file="strc-reg.mkiv">
<cd:sequence>
<cd:string value="setup"/>
- <cd:variable value="register"/>
+ <cd:instance value="register"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-number-list-optional"/>
@@ -466,69 +462,73 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="index"/>
+ <cd:resolve name="instance-register"/>
</cd:instances>
</cd:command>
- <cd:command name="index" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- <cd:index list="yes"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- <cd:resolve name="argument-text"/>
- <cd:index list="yes"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="index" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:keywords optional="yes">
+ <cd:constant type="cd:text"/>
+ <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+ </cd:keywords>
+ <cd:index list="yes"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="seeindex" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- <cd:index list="yes"/>
- <cd:keywords delimiters="braces">
- <cd:constant type="cd:text"/>
- <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
+ <cd:command name="index" variant="ownnumber" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:keywords optional="yes">
+ <cd:constant type="cd:text"/>
+ <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+ </cd:keywords>
+ <cd:resolve name="argument-text"/>
+ <cd:index list="yes"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="placeindex" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="seeindex" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:keywords optional="yes">
+ <cd:constant type="cd:text"/>
+ <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+ </cd:keywords>
+ <cd:index list="yes"/>
+ <cd:keywords delimiters="braces">
+ <cd:constant type="cd:text"/>
+ <cd:constant type="cd:text" prefix="cd:processor" method="apply"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="completeindex" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="placeindex" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupregister"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="setupindex" file="strc-reg.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-number-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupregister"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="completeindex" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupregister"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupindex" file="strc-reg.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-number-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupregister"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="startregister" file="strc-reg.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-ruby.xml b/tex/context/interface/mkiv/i-ruby.xml
new file mode 100644
index 000000000..698e4f24f
--- /dev/null
+++ b/tex/context/interface/mkiv/i-ruby.xml
@@ -0,0 +1,76 @@
+<?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="defineruby" file="typo-rub.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupruby"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupruby" file="typo-rub.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="location">
+ <cd:constant type="top" default="yes"/>
+ <cd:constant type="left"/>
+ <cd:constant type="right"/>
+ </cd:parameter>
+ <cd:parameter name="align">
+ <cd:constant type="auto"/>
+ <cd:constant type="flushleft"/>
+ <cd:constant type="middle" default="yes"/>
+ <cd:constant type="flushright"/>
+ </cd:parameter>
+ <cd:parameter name="stretch">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ <cd:parameter name="hoffset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="voffset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="none"/>
+ <cd:constant type="cd:dimension"/>
+ </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="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="ruby" file="typo-rub.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="ruby" type="environment" file="typo-rub.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-scite.xml b/tex/context/interface/mkiv/i-scite.xml
new file mode 100644
index 000000000..e62bc9067
--- /dev/null
+++ b/tex/context/interface/mkiv/i-scite.xml
@@ -0,0 +1,26 @@
+<?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="scite" type="environment" file="m-scite.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-scite-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="scitefile" file="m-scite.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-file"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="scitebuffer" file="m-scite.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-scite-optional"/>
+ <cd:resolve name="keyword-buffer"/>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml
index e4c100538..10ae6a79e 100644
--- a/tex/context/interface/mkiv/i-script.xml
+++ b/tex/context/interface/mkiv/i-script.xml
@@ -36,18 +36,14 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setupscripts" file="scrp-ini.mkvi">
- <cd:arguments>
- <cd:resolve name="keyword-name-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setupscript"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
+ <cd:command name="setupscripts" file="scrp-ini.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupscript"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
<cd:command name="setscript" file="scrp-ini.mkvi">
<cd:arguments>
@@ -79,34 +75,28 @@
</cd:arguments>
</cd:command>
- <cd:command name="script" generated="yes" varianet="generated" file="scrp-ini.mkvi">
+ <cd:command name="script" generated="yes" varianet="instance" file="scrp-ini.mkvi">
<cd:sequence>
- <cd:variable value="script"/>
+ <cd:instance value="script"/>
</cd:sequence>
<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:resolve name="instance-script"/>
</cd:instances>
</cd:command>
- <cd:command name="hangul" file="scrp-ini.mkvi"/>
+ <!--
- <cd:command name="hanzi" file="scrp-ini.mkvi"/>
+ <cd:command name="hangul" file="scrp-ini.mkvi"/>
- <cd:command name="nihongo" file="scrp-ini.mkvi"/>
+ <cd:command name="hanzi" file="scrp-ini.mkvi"/>
- <cd:command name="ethiopic" file="scrp-ini.mkvi"/>
+ <cd:command name="nihongo" file="scrp-ini.mkvi"/>
- <cd:command name="thai" file="scrp-ini.mkvi"/>
+ <cd:command name="ethiopic" file="scrp-ini.mkvi"/>
- <cd:command name="latin" file="scrp-ini.mkvi"/>
+ <cd:command name="thai" file="scrp-ini.mkvi"/>
- <!--
+ <cd:command name="latin" file="scrp-ini.mkvi"/>
<cd:command name="test" file="scrp-ini.mkvi"/>
diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml
index 535888871..2bf8f838d 100644
--- a/tex/context/interface/mkiv/i-section.xml
+++ b/tex/context/interface/mkiv/i-section.xml
@@ -197,6 +197,7 @@
<cd:constant type="middle"/>
<cd:constant type="bottom"/>
<cd:constant type="reverse"/>
+ <cd:constant type="margintext"/>
<cd:constant type="cd:name"/>
</cd:parameter>
<cd:parameter name="width">
@@ -239,47 +240,31 @@
</cd:arguments>
</cd:command>
- <!--
-
- <cd:command name="setupheads" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-section-list-optional"/>
- <cd:assignments list="yes">
- <cd:inherit name="setuphead"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- -->
+ <cd:command name="setupheads" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-section-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setuphead"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="section" generated="yes" variant="example" file="strc-sec.mkiv">
+ <cd:command name="section" generated="yes" variant="instance" file="strc-sec.mkiv">
<cd:sequence>
- <cd:variable value="section"/>
+ <cd:instance value="section"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference-list-optional"/>
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="part"/>
- <cd:constant value="chapter"/>
- <cd:constant value="section"/>
- <cd:constant value="subsection"/>
- <cd:constant value="subsubsection"/>
- <cd:constant value="subsubsubsection"/>
- <cd:constant value="subsubsubsubsection"/>
- <cd:constant value="title"/>
- <cd:constant value="subject"/>
- <cd:constant value="subsubject"/>
- <cd:constant value="subsubsubject"/>
- <cd:constant value="subsubsubsubject"/>
- <cd:constant value="subsubsubsubsubject"/>
+ <cd:resolve name="instance-section"/>
</cd:instances>
</cd:command>
- <cd:command name="section" generated="yes" variant="example:ownnumber" file="strc-sec.mkiv">
+ <cd:command name="section" generated="yes" variant="instance:ownnumber" file="strc-sec.mkiv">
<cd:sequence>
- <cd:variable value="section"/>
+ <cd:instance value="section"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-reference-list-optional"/>
@@ -287,252 +272,220 @@
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="part"/>
- <cd:constant value="chapter"/>
- <cd:constant value="section"/>
- <cd:constant value="subsection"/>
- <cd:constant value="subsubsection"/>
- <cd:constant value="subsubsubsection"/>
- <cd:constant value="subsubsubsubsection"/>
- <cd:constant value="title"/>
- <cd:constant value="subject"/>
- <cd:constant value="subsubject"/>
- <cd:constant value="subsubsubject"/>
- <cd:constant value="subsubsubsubject"/>
- <cd:constant value="subsubsubsubsubject"/>
+ <cd:resolve name="instance-section"/>
</cd:instances>
</cd:command>
- <cd:command name="section" generated="yes" variant="example:assignment" file="strc-sec.mkiv">
+ <cd:command name="section" generated="yes" variant="instance:assignment" file="strc-sec.mkiv">
<cd:sequence>
- <cd:variable value="section"/>
+ <cd:instance value="section"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="assignment-sectiondata-list"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="part"/>
- <cd:constant value="chapter"/>
- <cd:constant value="section"/>
- <cd:constant value="subsection"/>
- <cd:constant value="subsubsection"/>
- <cd:constant value="subsubsubsection"/>
- <cd:constant value="subsubsubsubsection"/>
- <cd:constant value="title"/>
- <cd:constant value="subject"/>
- <cd:constant value="subsubject"/>
- <cd:constant value="subsubsubject"/>
- <cd:constant value="subsubsubsubject"/>
- <cd:constant value="subsubsubsubsubject"/>
+ <cd:resolve name="instance-section"/>
</cd:instances>
</cd:command>
- <cd:command name="section" type="environment" generated="yes" variant="example" file="strc-sec.mkiv">
+ <cd:command name="section" type="environment" generated="yes" variant="instance" file="strc-sec.mkiv">
<cd:sequence>
- <cd:variable value="section"/>
+ <cd:instance value="section"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="assignment-sectiondata-list-optional"/>
<cd:resolve name="assignment-userdata-list-optional"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="part"/>
- <cd:constant value="chapter"/>
- <cd:constant value="section"/>
- <cd:constant value="subsection"/>
- <cd:constant value="subsubsection"/>
- <cd:constant value="subsubsubsection"/>
- <cd:constant value="subsubsubsubsection"/>
- <cd:constant value="title"/>
- <cd:constant value="subject"/>
- <cd:constant value="subsubject"/>
- <cd:constant value="subsubsubject"/>
- <cd:constant value="subsubsubsubject"/>
- <cd:constant value="subsubsubsubsubject"/>
+ <cd:resolve name="instance-section"/>
</cd:instances>
</cd:command>
- <cd:command name="part" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="chapter" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="part" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="section" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="chapter" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsection" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="section" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsection" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsection" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsection" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsection" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubsection" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsection" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="title" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsubsection" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subject" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="title" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubject" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subject" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubject" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubject" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubject" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubject" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubsubject" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-reference-list-optional"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsubject" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="part" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsubsubject" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="chapter" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="part" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="section" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="chapter" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsection" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="section" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsection" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsection" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsection" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsection" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubsection" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsection" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="title" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsubsection" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subject" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="title" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubject" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subject" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubject" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubject" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubject" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubject" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="subsubsubsubsubject" type="environment" file="strc-sec.mkiv">
- <cd:arguments>
- <cd:resolve name="assignment-sectiondata-list-optional"/>
- <cd:resolve name="assignment-userdata-list-optional"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="subsubsubsubject" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="subsubsubsubsubject" type="environment" file="strc-sec.mkiv">
+ <cd:arguments>
+ <cd:resolve name="assignment-sectiondata-list-optional"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="namedsection" type="environment" file="strc-sec.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-sectionblock.xml b/tex/context/interface/mkiv/i-sectionblock.xml
index 594fecd15..d6fc97ee0 100644
--- a/tex/context/interface/mkiv/i-sectionblock.xml
+++ b/tex/context/interface/mkiv/i-sectionblock.xml
@@ -58,9 +58,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="sectionblock" type="environment" generated="yes" variant="example" file="strc-sbe.mkiv">
+ <cd:command name="sectionblock" type="environment" generated="yes" variant="instance" file="strc-sbe.mkiv">
<cd:sequence>
- <cd:variable value="sectionblock"/>
+ <cd:instance value="sectionblock"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -71,10 +71,7 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="frontmatter"/>
- <cd:constant value="bodymatter"/>
- <cd:constant value="appendices"/>
- <cd:constant value="backmatter"/>
+ <cd:resolve name="instance-sectionblock"/>
</cd:instances>
</cd:command>
@@ -84,48 +81,52 @@
</cd:arguments>
</cd:command>
- <cd:command name="frontmatter" type="environment" file="strc-sbe.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="bookmark">
- <cd:constant type="cd:text"/>
- </cd:parameter>
- <cd:inherit name="setupsectionblock"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="bodymatter" type="environment" file="strc-sbe.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="bookmark">
- <cd:constant type="cd:text"/>
- </cd:parameter>
- <cd:inherit name="setupsectionblock"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="frontmatter" type="environment" file="strc-sbe.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="bookmark">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:inherit name="setupsectionblock"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="appendices" type="environment" file="strc-sbe.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="bookmark">
- <cd:constant type="cd:text"/>
- </cd:parameter>
- <cd:inherit name="setupsectionblock"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="bodymatter" type="environment" file="strc-sbe.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="bookmark">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:inherit name="setupsectionblock"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <cd:command name="backmatter" type="environment" file="strc-sbe.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:parameter name="bookmark">
- <cd:constant type="cd:text"/>
- </cd:parameter>
- <cd:inherit name="setupsectionblock"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="appendices" type="environment" file="strc-sbe.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="bookmark">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:inherit name="setupsectionblock"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="backmatter" type="environment" file="strc-sbe.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:parameter name="bookmark">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:inherit name="setupsectionblock"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml
new file mode 100644
index 000000000..4771230eb
--- /dev/null
+++ b/tex/context/interface/mkiv/i-setup.xml
@@ -0,0 +1,145 @@
+<?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="setupsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes">
+ <cd:parameter name="criterium">
+ <cd:constant type="current"/>
+ <cd:constant type="previous"/>
+ <cd:constant type="local"/>
+ <cd:constant type="text"/>
+ <cd:constant type="all" default="yes"/>
+ <cd:constant type="cd:section"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="basicsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="basicsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="shortsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="shortsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="showsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="showsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdinternal" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdbasicsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdbasicsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdshortsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdshortsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdfullsetup" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdfullsetup" variant="argument" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdbasicsetupinstance" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdshortsetupinstance" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="cmdfullsetupinstance" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="showdefinition" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="definition" file="x-setups-basics.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-text-list"/>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/context/interface/mkiv/i-shift.xml b/tex/context/interface/mkiv/i-shift.xml
index cd3c6650e..792a8d84f 100644
--- a/tex/context/interface/mkiv/i-shift.xml
+++ b/tex/context/interface/mkiv/i-shift.xml
@@ -55,16 +55,15 @@
</cd:arguments>
</cd:command>
- <cd:command name="shift" generated="yes" variant="example" file="node-rul.mkiv">
+ <cd:command name="shift" generated="yes" variant="instance" file="node-rul.mkiv">
<cd:sequence>
- <cd:variable value="shift"/>
+ <cd:instance value="shift"/>
</cd:sequence>
<cd:arguments>
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="shiftup"/>
- <cd:constant value="shiftdown"/>
+ <cd:resolve name="instance-shift"/>
</cd:instances>
</cd:command>
@@ -74,16 +73,20 @@
</cd:arguments>
</cd:command>
- <cd:command name="shiftup" file="node-rul.mkiv">
- <cd:arguments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="shiftdown" file="node-rul.mkiv">
- <cd:arguments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="shiftup" file="node-rul.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="shiftdown" file="node-rul.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-sort.xml b/tex/context/interface/mkiv/i-sort.xml
index 817dd9c97..a72df624b 100644
--- a/tex/context/interface/mkiv/i-sort.xml
+++ b/tex/context/interface/mkiv/i-sort.xml
@@ -78,16 +78,16 @@
</cd:arguments>
</cd:command>
- <cd:command name="sorting" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="sorting" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
- <cd:variable value="sorting"/>
+ <cd:instance value="sorting"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="logo"/>
+ <cd:resolve name="instance-sort"/>
</cd:instances>
</cd:command>
@@ -103,10 +103,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="placelistofsorts" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="placelistofsorts" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
<cd:string value="placelistof"/>
- <cd:variable value="sorts"/>
+ <cd:instance value="sorts"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -114,14 +114,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="logos"/>
+ <cd:resolve name="instance-sortlist"/>
</cd:instances>
</cd:command>
- <cd:command name="completelistofsorts" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="completelistofsorts" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
<cd:string value="completelistof"/>
- <cd:variable value="sorts"/>
+ <cd:instance value="sorts"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -129,7 +129,7 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="logos"/>
+ <cd:resolve name="instance-sortlist"/>
</cd:instances>
</cd:command>
@@ -171,27 +171,31 @@
</cd:arguments>
</cd:command>
- <cd:command name="logo" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-name-optional"/>
- <cd:content/>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="placelistoflogos" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupsorting"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="completelistoflogos" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupsorting"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="logo" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="placelistoflogos" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupsorting"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="completelistoflogos" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupsorting"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-spreadsheet.xml b/tex/context/interface/mkiv/i-spreadsheet.xml
new file mode 100644
index 000000000..9f6273891
--- /dev/null
+++ b/tex/context/interface/mkiv/i-spreadsheet.xml
@@ -0,0 +1,140 @@
+<?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="definespreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupspreadsheet"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="period">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="comma">
+ <cd:constant type="cd:text"/>
+ </cd:parameter>
+ <cd:parameter name="split">
+ <cd:constant type="yes"/>
+ <cd:constant type="no" default="yes"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="resetspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="spreadsheet" type="environment" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="showspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="inspectspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-number"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="getspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-number"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="doifelsespreadsheetcell" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-true"/>
+ <cd:resolve name="argument-false"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="doifspreadsheetcellelse" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-number"/>
+ <cd:resolve name="argument-true"/>
+ <cd:resolve name="argument-false"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="TABLEsetspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="TABLEgetspreadsheet" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setspr" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="getspr" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="spreadsheettable" type="environment" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupTABLE"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="row" type="environment" file="m-spreadsheet.mkiv"/>
+
+ <cd:command name="cell" type="environment" file="m-spreadsheet.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="bTD"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/context/interface/mkiv/i-steps.xml b/tex/context/interface/mkiv/i-steps.xml
new file mode 100644
index 000000000..47a3b45ca
--- /dev/null
+++ b/tex/context/interface/mkiv/i-steps.xml
@@ -0,0 +1,412 @@
+<?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="setupSTEPchart" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="category">
+ <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="alternative">
+ <cd:constant type="horizontal" default="yes"/>
+ <cd:constant type="vertical"/>
+ <cd:constant type="three"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupSTEPcharts" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupSTEPchart"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
+ <cd:command name="setupSTEPcharts" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="category">
+ <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="alternative">
+ <cd:constant type="horizontal" default="yes"/>
+ <cd:constant type="vertical"/>
+ <cd:constant type="three"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <!--
+
+ <cd:command name="setupSTEPcell" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </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="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </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="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupSTEPcells" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupSTEPcell"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
+ <cd:command name="setupSTEPcells" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </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="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </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="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <!--
+
+ <cd:command name="setupSTEPtext" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </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="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupSTEPtexts" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupSTEPtexts"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
+ <cd:command name="setupSTEPtexts" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </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="style">
+ <cd:resolve name="value-style"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <!--
+
+ <cd:command name="setupSTEPline" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="height">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="setupSTEPlines" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:inherit name="setupSTEPline"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
+
+ <cd:command name="setupSTEPlines" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-list-optional"/>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes">
+ <cd:parameter name="rulethickness">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="height">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="distance">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="offset">
+ <cd:constant type="cd:dimension"/>
+ </cd:parameter>
+ <cd:parameter name="color">
+ <cd:constant type="cd:color"/>
+ </cd:parameter>
+ <cd:parameter name="alternative">
+ <cd:constant type="cd:number"/>
+ </cd:parameter>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="STEPchart" type="environment" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupSTEPchart"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="STEPtable" type="environment" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupSTEPchart"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="STEPaligntable" type="environment" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupSTEPchart"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="STEPchart" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupSTEPchart"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="makeSTEPchart" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="STEPcell" type="environment" file="m-steps.mkvi"/>
+
+ <cd:command name="cells" file="m-steps.mkvi">
+ <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="cells" variant="aligntable" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="texts" file="m-steps.mkvi">
+ <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="cell" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="text" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="toptext" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="bottext" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="topcell" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="botcell" file="m-steps.mkvi">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <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-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml
index 07c69e4dd..6c615b12a 100644
--- a/tex/context/interface/mkiv/i-synonym.xml
+++ b/tex/context/interface/mkiv/i-synonym.xml
@@ -80,9 +80,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="synonym" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="synonym" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
- <cd:variable value="synonym"/>
+ <cd:instance value="synonym"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
@@ -90,7 +90,7 @@
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="abbreviation"/>
+ <cd:resolve name="instance-synonym"/>
</cd:instances>
</cd:command>
@@ -107,10 +107,10 @@
</cd:arguments>
</cd:command>
- <cd:command name="placelistofsynonyms" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="placelistofsynonyms" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
<cd:string value="placelistof"/>
- <cd:variable value="synonyms"/>
+ <cd:instance value="synonyms"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -118,14 +118,14 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="abbreviations"/>
+ <cd:resolve name="instance-synonymlist"/>
</cd:instances>
</cd:command>
- <cd:command name="completelistofsynonyms" generated="yes" variant="example" file="strc-syn.mkiv">
+ <cd:command name="completelistofsynonyms" generated="yes" variant="instance" file="strc-syn.mkiv">
<cd:sequence>
<cd:string value="completelistof"/>
- <cd:variable value="synonyms"/>
+ <cd:instance value="synonyms"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -133,7 +133,7 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="abbreviations"/>
+ <cd:resolve name="instance-synonymlist"/>
</cd:instances>
</cd:command>
@@ -188,34 +188,38 @@
</cd:arguments>
</cd:command>
- <cd:command name="abbreviation" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-name-optional"/>
- <cd:resolve name="argument-text"/>
- <cd:content/>
- </cd:arguments>
- </cd:command>
-
<cd:command name="infull" file="strc-syn.mkiv">
<cd:arguments>
<cd:resolve name="argument-name"/>
</cd:arguments>
</cd:command>
- <cd:command name="placelistofabbreviations" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupsynonyms"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="completelistofabbreviations" file="strc-syn.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setupsynonyms"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="abbreviation" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:resolve name="argument-text"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="placelistofabbreviations" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupsynonyms"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="completelistofabbreviations" file="strc-syn.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setupsynonyms"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml
index 62ad41d17..be3a602ac 100644
--- a/tex/context/interface/mkiv/i-tabulation.xml
+++ b/tex/context/interface/mkiv/i-tabulation.xml
@@ -138,9 +138,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="tabulate" type="environment" generated="yes" variant="example" file="tabl-tbl.mkiv">
+ <cd:command name="tabulate" type="environment" generated="yes" variant="instance" file="tabl-tbl.mkiv">
<cd:sequence>
- <cd:variable value="tabulate"/>
+ <cd:instance value="tabulate"/>
</cd:sequence>
<cd:arguments>
<cd:resolve name="keyword-name-optional"/>
@@ -149,8 +149,7 @@
</cd:assignments>
</cd:arguments>
<cd:instances>
- <cd:constant value="legend"/>
- <cd:constant value="fact"/>
+ <cd:resolve name="instance-tabulate"/>
</cd:instances>
</cd:command>
@@ -174,25 +173,25 @@
<cd:command name="tabulateautoline" file="tabl-tbl.mkiv"/>
- <cd:command name="legend" type="environment" file="tabl-tbl.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-name-optional"/>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptabulate"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="fact" type="environment" file="tabl-tbl.mkiv">
- <cd:arguments>
- <cd:resolve name="keyword-name-optional"/>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptabulate"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
+ <cd:command name="legend" type="environment" file="tabl-tbl.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptabulate"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
- <!--
+ <cd:command name="fact" type="environment" file="tabl-tbl.mkiv">
+ <cd:arguments>
+ <cd:resolve name="keyword-name-optional"/>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptabulate"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
<cd:command name="VL" scope="tabulate" file="tabl-tbl.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml
index 14f413ce3..063a0c436 100644
--- a/tex/context/interface/mkiv/i-tagging.xml
+++ b/tex/context/interface/mkiv/i-tagging.xml
@@ -25,6 +25,13 @@
</cd:arguments>
</cd:command>
+ <cd:command name="element" type="environment" file="strc-tag.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-name"/>
+ <cd:resolve name="assignment-userdata-list-optional"/>
+ </cd:arguments>
+ </cd:command>
+
<cd:command name="doifelseinelement" file="strc-tag.mkiv">
<cd:arguments>
<cd:resolve name="argument-name"/>
diff --git a/tex/context/interface/mkiv/i-tooltip.xml b/tex/context/interface/mkiv/i-tooltip.xml
index 1504d70e1..f46ffb091 100644
--- a/tex/context/interface/mkiv/i-tooltip.xml
+++ b/tex/context/interface/mkiv/i-tooltip.xml
@@ -28,9 +28,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="tooltip" generated="yes" variant="example" file="scrn-fld.mkvi">
+ <cd:command name="tooltip" generated="yes" variant="instance" file="scrn-fld.mkvi">
<cd:sequence>
- <cd:variable value="tooltip"/>
+ <cd:instance value="tooltip"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -40,13 +40,13 @@
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="tooltip"/>
+ <cd:resolve name="instance-tooltip"/>
</cd:instances>
</cd:command>
- <cd:command name="tooltip" generated="yes" variant="example:argument" file="scrn-fld.mkvi">
+ <cd:command name="tooltip" generated="yes" variant="instance:argument" file="scrn-fld.mkvi">
<cd:sequence>
- <cd:variable value="tooltip"/>
+ <cd:instance value="tooltip"/>
</cd:sequence>
<cd:arguments>
<cd:keywords optional="yes">
@@ -58,30 +58,34 @@
<cd:resolve name="argument-text"/>
</cd:arguments>
<cd:instances>
- <cd:constant value="tooltip"/>
+ <cd:resolve name="instance-tooltip"/>
</cd:instances>
</cd:command>
- <cd:command name="tooltip" file="scrn-fld.mkvi">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptooltip"/>
- </cd:assignments>
- <cd:resolve name="argument-text"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <!--
- <cd:command name="tooltip" variant="argument" file="scrn-fld.mkvi">
- <cd:arguments>
- <cd:keywords optional="yes">
- <cd:constant type="left"/>
- <cd:constant type="middle"/>
- <cd:constant type="right"/>
- </cd:keywords>
- <cd:resolve name="argument-text"/>
- <cd:resolve name="argument-text"/>
- </cd:arguments>
- </cd:command>
+ <cd:command name="tooltip" file="scrn-fld.mkvi">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptooltip"/>
+ </cd:assignments>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="tooltip" variant="argument" file="scrn-fld.mkvi">
+ <cd:arguments>
+ <cd:keywords optional="yes">
+ <cd:constant type="left"/>
+ <cd:constant type="middle"/>
+ <cd:constant type="right"/>
+ </cd:keywords>
+ <cd:resolve name="argument-text"/>
+ <cd:resolve name="argument-text"/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-translate.xml b/tex/context/interface/mkiv/i-translate.xml
new file mode 100644
index 000000000..ba3510f0b
--- /dev/null
+++ b/tex/context/interface/mkiv/i-translate.xml
@@ -0,0 +1,26 @@
+<?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="translateinput" 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="enableinputtranslation" file="m-translate.mkiv"/>
+
+ <cd:command name="disableinputtranslation" file="m-translate.mkiv"/>
+
+ <cd:command name="readtranslatedfile" file="m-translate.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-file"/>
+ </cd:arguments>
+ </cd:command>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/context/interface/mkiv/i-unit.xml b/tex/context/interface/mkiv/i-unit.xml
index 551ff533f..3380585dc 100644
--- a/tex/context/interface/mkiv/i-unit.xml
+++ b/tex/context/interface/mkiv/i-unit.xml
@@ -75,23 +75,27 @@
</cd:arguments>
</cd:command>
- <cd:command name="unit" generated="yes" variant="example" file="phys-dim.mkiv">
+ <cd:command name="unit" generated="yes" variant="instance" file="phys-dim.mkiv">
<cd:sequence>
- <cd:variable value="unit"/>
+ <cd:instance value="unit"/>
</cd:sequence>
<cd:arguments>
<cd:content/>
</cd:arguments>
<cd:instances>
- <cd:constant value="unit"/>
+ <cd:resolve name="instance-unit"/>
</cd:instances>
</cd:command>
- <cd:command name="unit" file="phys-dim.mkiv">
- <cd:arguments>
- <cd:content/>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="unit" file="phys-dim.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ -->
<cd:command name="installunitsseparator" file="phys-dim.mkiv">
<cd:arguments>
diff --git a/tex/context/interface/mkiv/i-verbatim.xml b/tex/context/interface/mkiv/i-verbatim.xml
index 6a6d725df..7000cf77c 100644
--- a/tex/context/interface/mkiv/i-verbatim.xml
+++ b/tex/context/interface/mkiv/i-verbatim.xml
@@ -251,25 +251,9 @@
</cd:arguments>
</cd:command>
- <cd:command name="typing" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="typing" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="typing" type="environment" generated="yes" variant="example" file="buff-ver.mkiv">
+ <cd:command name="typing" type="environment" generated="yes" variant="instance" file="buff-ver.mkiv">
<cd:sequence>
- <cd:variable value="typing"/>
+ <cd:instance value="typing"/>
</cd:sequence>
<cd:arguments>
<cd:assignments list="yes" optional="yes">
@@ -277,18 +261,13 @@
</cd:assignments>
</cd:arguments>
<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:resolve name="instance-typing"/>
</cd:instances>
</cd:command>
- <cd:command name="typing" type="environment" generated="yes" variant="example:argument" file="buff-ver.mkiv">
+ <cd:command name="typing" type="environment" generated="yes" variant="instance:argument" file="buff-ver.mkiv">
<cd:sequence>
- <cd:variable value="typing"/>
+ <cd:instance value="typing"/>
</cd:sequence>
<cd:arguments>
<cd:keywords list="yes" optional="yes">
@@ -296,12 +275,7 @@
</cd:keywords>
</cd:arguments>
<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:resolve name="instance-typing"/>
</cd:instances>
</cd:command>
@@ -379,87 +353,107 @@
</cd:arguments>
</cd:command>
- <cd:command name="LUA" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="LUA" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:sequence>
- <cd:variable value="lua"/>
- </cd:sequence>
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="MP" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="MP" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="XML" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="XML" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="PARSEDXML" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="PARSEDXML" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="TEX" type="environment" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:assignments list="yes" optional="yes">
- <cd:inherit name="setuptyping"/>
- </cd:assignments>
- </cd:arguments>
- </cd:command>
-
- <cd:command name="TEX" type="environment" variant="argument" file="buff-ver.mkiv">
- <cd:arguments>
- <cd:keywords list="yes" optional="yes">
- <cd:constant type="continue"/>
- </cd:keywords>
- </cd:arguments>
- </cd:command>
+ <!--
+
+ <cd:command name="typing" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="typing" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="LUA" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="LUA" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:sequence>
+ <cd:variable value="lua"/>
+ </cd:sequence>
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="MP" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="MP" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="XML" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="XML" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="PARSEDXML" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="PARSEDXML" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="TEX" type="environment" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:assignments list="yes" optional="yes">
+ <cd:inherit name="setuptyping"/>
+ </cd:assignments>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="TEX" type="environment" variant="argument" file="buff-ver.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:constant type="continue"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ -->
</cd:interface>
diff --git a/tex/context/interface/mkiv/i-visual.xml b/tex/context/interface/mkiv/i-visual.xml
new file mode 100644
index 000000000..64ae3f79d
--- /dev/null
+++ b/tex/context/interface/mkiv/i-visual.xml
@@ -0,0 +1,154 @@
+<?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="fakerule" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-dimension"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="dorandomrecurse" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-number"/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakelines" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:keywords name="keywords" delimiters="braces">
+ <cd:constant type="cd:number"/>
+ <cd:constant type="cd:nothing"/>
+ </cd:keywords>
+ <cd:keywords name="keywords" delimiters="braces">
+ <cd:constant type="cd:number"/>
+ <cd:constant type="cd:nothing"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakewords" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:keywords name="keywords" delimiters="braces">
+ <cd:constant type="cd:number"/>
+ <cd:constant type="cd:nothing"/>
+ </cd:keywords>
+ <cd:keywords name="keywords" delimiters="braces">
+ <cd:constant type="cd:number"/>
+ <cd:constant type="cd:nothing"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakenwords" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-number"/>
+ <cd:keywords name="keywords" delimiters="braces">
+ <cd:constant type="cd:number"/>
+ <cd:constant type="cd:nothing"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="showfakewords" file="m-visual.mkiv"/>
+
+ <cd:command name="fakeword" file="m-visual.mkiv"/>
+
+ <cd:command name="fakeparindent" file="m-visual.mkiv"/>
+
+ <cd:command name="fakeddroppedcaps" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-number"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakefigure" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:inherit name="placefloat"/>
+ </cd:keywords>
+ <cd:resolve name="keyword-reference-list-optional"/>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakeimage" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ <cd:resolve name="argument-dimension"/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="fakeformula" file="m-visual.mkiv"/>
+
+ <cd:command name="fakespacingformula" file="m-visual.mkiv"/>
+
+ <cd:command name="smashedgrid" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:keywords list="yes" optional="yes">
+ <cd:inherit name="basegrid"/>
+ </cd:keywords>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="bodyfontgrid" file="m-visual.mkiv"/>
+
+ <cd:command name="emexgrid" file="m-visual.mkiv"/>
+
+ <cd:command name="simplethesis" file="m-visual.mkiv"/>
+
+ <cd:command name="showbaselines" file="m-visual.mkiv"/>
+
+ <cd:command name="showpagebuilder" file="m-visual.mkiv"/>
+
+ <cd:command name="tagbox" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:resolve name="argument-text"/>
+ <cd:keywords optional="yes">
+ <cd:constant type="l"/>
+ <cd:constant type="r"/>
+ <cd:constant type="t"/>
+ <cd:constant type="b"/>
+ <cd:constant type="lt"/>
+ <cd:constant type="lb"/>
+ <cd:constant type="rt"/>
+ <cd:constant type="rb"/>
+ <cd:constant type="tl"/>
+ <cd:constant type="bl"/>
+ <cd:constant type="tr"/>
+ <cd:constant type="br"/>
+ </cd:keywords>
+ <cd:csname/>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="coloredhbox" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="coloredvbox" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="coloredvtop" file="m-visual.mkiv">
+ <cd:arguments>
+ <cd:content/>
+ </cd:arguments>
+ </cd:command>
+
+ <cd:command name="coloredstrut" file="m-visual.mkiv"/>
+
+</cd:interface> \ No newline at end of file
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 18ed3da02..28f6848ae 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 : 11/18/16 22:20:13
+-- merge date : 11/22/16 20:03:56
do -- begin closure to overcome local limits and interference
@@ -13540,7 +13540,11 @@ local f_unicode=formatters["U%05X"]
local f_index=formatters["I%05X"]
local f_character_y=formatters["%C"]
local f_character_n=formatters["[ %C ]"]
-local doduplicates=true
+local check_duplicates=true
+local check_soft_hyphen=false
+directives.register("otf.checksofthyphen",function(v)
+ check_soft_hyphen=v
+end)
local function replaced(list,index,replacement)
if type(list)=="number" then
return replacement
@@ -13608,7 +13612,7 @@ local function unifyresources(fontdata,indices)
end
end
local done={}
- local duplicates=doduplicates and resources.duplicates
+ local duplicates=check_duplicates and resources.duplicates
if duplicates and not next(duplicates) then
duplicates=false
end
@@ -13845,10 +13849,31 @@ local function unifyresources(fontdata,indices)
unifythem(resources.sublookups)
end
local function copyduplicates(fontdata)
- if doduplicates then
+ if check_duplicates then
local descriptions=fontdata.descriptions
local resources=fontdata.resources
local duplicates=resources.duplicates
+ if check_soft_hyphen then
+ local ds=descriptions[0xAD]
+ if not ds or ds.width==0 then
+ if ds then
+ descriptions[0xAD]=nil
+ report("patching soft hyphen")
+ else
+ report("adding soft hyphen")
+ end
+ if not duplicates then
+ duplicates={}
+ resources.duplicates=duplicates
+ end
+ local dh=duplicates[0x2D]
+ if dh then
+ dh[#dh+1]={ [0xAD]=true }
+ else
+ duplicates[0x2D]={ [0xAD]=true }
+ end
+ end
+ end
if duplicates then
for u,d in next,duplicates do
local du=descriptions[u]