2017-05-15 21:54:00

author: Hans Hagen <pragma@wxs.nl> 2017-05-16 11:12:18 +0200
committer: Context Git Mirror Bot <phg42.2a@gmail.com> 2017-05-16 11:12:18 +0200
commit: cbc37c39432e0ebe38e0922fc6d14c2955ab3ba2 (patch)
tree: 38358e219d38f2a49f227d96d24fdc27eb2544e6 /tex
parent: fd0c4577a4b6e85ca2db664906e1a03807ce133f (diff)
download: context-cbc37c39432e0ebe38e0922fc6d14c2955ab3ba2.tar.gz
43 files changed, 2977 insertions, 17155 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index ec59205b7..b23a010d9 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2017.05.14 19:09}
+\newcontextversion{2017.05.15 21:48}
 
 %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 b31ece259..9b79652fe 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2017.05.14 19:09}
+\edef\contextversion{2017.05.15 21:48}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index ea14b4c7b..cad08c512 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2017.05.14 19:09}
+\newcontextversion{2017.05.15 21:48}
 
 %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 3d521d98c..509077bc9 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2017.05.14 19:09}
+\edef\contextversion{2017.05.15 21:48}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-ext.lua b/tex/context/base/mkiv/font-ext.lua
index 6edfe7025..965b6e6dc 100644
--- a/tex/context/base/mkiv/font-ext.lua
+++ b/tex/context/base/mkiv/font-ext.lua
@@ -1296,3 +1296,52 @@ do -- another hack for a crappy font
     }
 
 end
+
+do
+
+    local tounicode = fonts.mappings.tounicode
+
+    local function check(tfmdata,key,value)
+        if value == "ligatures" then
+            local private   = fonts.constructors and fonts.constructors.privateoffset or 0xF0000
+            local collected = fonts.handlers.otf.readers.getcomponents(tfmdata.shared.rawdata)
+            if collected and next(collected)then
+                for unicode, char in next, tfmdata.characters do
+                    if true then -- if unicode >= private or (unicode >= 0xE000 and unicode <= 0xF8FF) then
+                        local u = collected[unicode]
+                        if u then
+                            local n = #u
+                            for i=1,n do
+                                if u[i] > private then
+                                    n = 0
+                                    break
+                                end
+                            end
+                            if n > 0 then
+                                if n == 1 then
+                                    u = u[1]
+                                end
+                                char.unicode   = u
+                                char.tounicode = tounicode(u)
+                            end
+                        end
+                    end
+                end
+            end
+        end
+    end
+
+    -- forceunicodes=ligatures : aggressive lig resolving (e.g. for emoji)
+    --
+    -- kind of like: \enabletrackers[fonts.mapping.forceligatures]
+
+    registerotffeature {
+        name         = "forceunicodes",
+        description  = "forceunicodes",
+        manipulators = {
+            base = check,
+            node = check,
+        }
+    }
+
+end
diff --git a/tex/context/base/mkiv/font-gds.lua b/tex/context/base/mkiv/font-gds.lua
deleted file mode 100644
index 52bb9c983..000000000
--- a/tex/context/base/mkiv/font-gds.lua
+++ /dev/null
@@ -1,899 +0,0 @@
-if not modules then modules = { } end modules ['font-gds'] = {
-    version   = 1.000,
-    comment   = "companion to font-gds.mkiv",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
--- depends on ctx
-
-local type, next, tonumber = type, next, tonumber
-local gmatch, lower, find, splitup = string.gmatch, string.lower, string.find, string.splitup
-
-local fonts              = fonts
-local nodes              = nodes
-local attributes         = attributes
-local node               = node
-
-local trace_goodies      = false  trackers.register("fonts.goodies", function(v) trace_goodies = v end)
-local report_goodies     = logs.reporter("fonts","goodies")
-
-local allocate           = utilities.storage.allocate
-local setmetatableindex  = table.setmetatableindex
-
-local implement          = interfaces.implement
-
-local texsp              = tex.sp
-local formatters         = string.formatters
-
-local otf                = fonts.handlers.otf
-local afm                = fonts.handlers.afm
-local tfm                = fonts.handlers.tfm
-
-local registerotffeature = otf.features.register
-local registerafmfeature = afm.features.register
-local registertfmfeature = tfm.features.register
-
-local fontgoodies        = fonts.goodies or { }
-fonts.goodies            = fontgoodies
-
-local typefaces          = fonts.typefaces or allocate()
-fonts.typefaces          = typefaces
-
-local data               = fontgoodies.data or allocate()
-fontgoodies.data         = data
-
-local list               = fontgoodies.list or { }
-fontgoodies.list         = list -- no allocate as we want to see what is there
-
-local addotffeature      = otf.enhancers.addfeature
-
-local findfile           = resolvers.findfile
-
-local glyph_code         = nodes.nodecodes.glyph
-
-local nuts               = nodes.nuts
-local tonut              = nuts.tonut
-local getfont            = nuts.getfont
-local getchar            = nuts.getchar
-local getattr            = nuts.getattr
-local traverse_id        = nuts.traverse_id
-
-function fontgoodies.report(what,trace,goodies)
-    if trace_goodies or trace then
-        local whatever = goodies[what]
-        if whatever then
-            report_goodies("goodie %a found in %a",what,goodies.name)
-        end
-    end
-end
-
-local function loadgoodies(filename) -- maybe a merge is better
-    local goodies = data[filename] -- we assume no suffix is given
-    if goodies ~= nil then
-        -- found or tagged unfound
-    elseif type(filename) == "string" then
-        local fullname = findfile(file.addsuffix(filename,"lfg")) or "" -- prefered suffix
-        if fullname == "" then
-            fullname = findfile(file.addsuffix(filename,"lua")) or "" -- fallback suffix
-        end
-        if fullname == "" then
-            report_goodies("goodie file '%s.lfg' is not found",filename)
-            data[filename] = false -- signal for not found
-        else
-            goodies = dofile(fullname) or false
-            if not goodies then
-                report_goodies("goodie file %a is invalid",fullname)
-                return nil
-            elseif trace_goodies then
-                report_goodies("goodie file %a is loaded",fullname)
-            end
-            goodies.name = goodies.name or "no name"
-            for name, fnc in next, list do
-                if trace_goodies then
-                    report_goodies("handling goodie %a",name)
-                end
-                fnc(goodies)
-            end
-            goodies.initialized = true
-            data[filename] = goodies
-        end
-    end
-    return goodies
-end
-
-function fontgoodies.register(name,fnc) -- will be a proper sequencer
-    list[name] = fnc
-end
-
-fontgoodies.load = loadgoodies
-
--- register goodies file
-
-local function setgoodies(tfmdata,value)
-    local goodies = tfmdata.goodies
-    if not goodies then -- actually an error
-        goodies = { }
-        tfmdata.goodies = goodies
-    end
-    for filename in gmatch(value,"[^, ]+") do
-        -- we need to check for duplicates
-        local ok = loadgoodies(filename)
-        if ok then
-            if trace_goodies then
-                report_goodies("assigning goodie %a",filename)
-            end
-            goodies[#goodies+1] = ok
-        end
-    end
-end
-
--- this will be split into good-* files and this file might become good-ini.lua
-
--- featuresets
-
-local function flattenedfeatures(t,tt)
-    -- first set value dominates
-    local tt = tt or { }
-    for i=1,#t do
-        local ti = t[i]
-        if type(ti) == "table" then
-            flattenedfeatures(ti,tt)
-        elseif tt[ti] == nil then
-            tt[ti] = true
-        end
-    end
-    for k, v in next, t do
-        if type(k) ~= "number" then -- not tonumber(k)
-            if type(v) == "table" then
-                flattenedfeatures(v,tt)
-            elseif tt[k] == nil then
-                tt[k] = v
-            end
-        end
-    end
-    return tt
-end
-
--- fonts.features.flattened = flattenedfeatures
-
-local function prepare_features(goodies,name,set)
-    if set then
-        local ff = flattenedfeatures(set)
-        local fullname = goodies.name .. "::" .. name
-        local n, s = fonts.specifiers.presetcontext(fullname,"",ff)
-        goodies.featuresets[name] = s -- set
-        if trace_goodies then
-            report_goodies("feature set %a gets number %a and name %a",name,n,fullname)
-        end
-        return n
-    end
-end
-
-fontgoodies.prepare_features = prepare_features
-
-local function initialize(goodies,tfmdata)
-    local featuresets = goodies.featuresets
-    local goodiesname = goodies.name
-    if featuresets then
-        if trace_goodies then
-            report_goodies("checking featuresets in %a",goodies.name)
-        end
-        for name, set in next, featuresets do
-            prepare_features(goodies,name,set)
-        end
-    end
-end
-
-fontgoodies.register("featureset",initialize)
-
-local function setfeatureset(tfmdata,set,features)
-    local goodies = tfmdata.goodies -- shared ?
-    if goodies then
-        local properties = tfmdata.properties
-        local what
-        for i=1,#goodies do
-            -- last one wins
-            local g = goodies[i]
-            what = g.featuresets and g.featuresets[set] or what
-        end
-        if what then
-            for feature, value in next, what do
-                if features[feature] == nil then
-                    features[feature] = value
-                end
-            end
-            properties.mode = what.mode or properties.mode
-        end
-    end
-end
-
--- postprocessors (we could hash processor and share code)
-
-function fontgoodies.registerpostprocessor(tfmdata,f,prepend)
-    local postprocessors = tfmdata.postprocessors
-    if not postprocessors then
-        tfmdata.postprocessors = { f }
-    elseif prepend then
-        table.insert(postprocessors,f,1)
-    else
-        table.insert(postprocessors,f)
-    end
-end
-
-local function setpostprocessor(tfmdata,processor)
-    local goodies = tfmdata.goodies
-    if goodies and type(processor) == "string" then
-        local found = { }
-        local asked = utilities.parsers.settings_to_array(processor)
-        for i=1,#goodies do
-            local g = goodies[i]
-            local p = g.postprocessors
-            if p then
-                for i=1,#asked do
-                    local a = asked[i]
-                    local f = p[a]
-                    if type(f) == "function" then
-                        found[a] = f
-                    end
-                end
-            end
-        end
-        local postprocessors = tfmdata.postprocessors or { }
-        for i=1,#asked do
-            local a = asked[i]
-            local f = found[a]
-            if f then
-                postprocessors[#postprocessors+1] = f
-            end
-        end
-        if #postprocessors > 0 then
-            tfmdata.postprocessors = postprocessors
-        end
-    end
-end
-
--- colorschemes
-
-local colorschemes       = fontgoodies.colorschemes or allocate { }
-fontgoodies.colorschemes = colorschemes
-colorschemes.data        = colorschemes.data or { }
-
-local function setcolorscheme(tfmdata,scheme)
-    if type(scheme) == "string" then
-        local goodies = tfmdata.goodies
-        -- todo : check for already defined in shared
-        if goodies then
-            local what
-            for i=1,#goodies do
-                -- last one counts
-                local g = goodies[i]
-                what = g.colorschemes and g.colorschemes[scheme] or what
-            end
-            if type(what) == "table" then
-                -- this is font bound but we can share them if needed
-                -- just as we could hash the conversions (per font)
-                local hash       = tfmdata.resources.unicodes
-                local reverse    = { }
-                local characters = tfmdata.characters
-                for i=1,#what do
-                    local w = what[i]
-                    for j=1,#w do
-                        local name = w[j]
-                        if name == "*" then
-                            -- inefficient but only used for tracing anyway
-                            for _, unicode in next, hash do
-                                reverse[unicode] = i
-                            end
-                        elseif type(name) == "number" then
-                            reverse[name] = i
-                        elseif find(name,":",1,true) then
-                            local start, stop = splitup(name,":")
-                            start = tonumber(start)
-                            stop = tonumber(stop)
-                            if start and stop then
-                                -- limited usage: we only deal with non reassigned
-                                -- maybe some day I'll also support the ones with a
-                                -- tounicode in this range
-                                for unicode=start,stop do
-                                    if characters[unicode] then
-                                        reverse[unicode] = i
-                                    end
-                                end
-                            end
-                        else
-                            local unicode = hash[name]
-                            if unicode then
-                                reverse[unicode] = i
-                            end
-                        end
-                    end
-                end
-                tfmdata.properties.colorscheme = reverse
-                return
-            end
-        end
-    end
-    tfmdata.properties.colorscheme = false
-end
-
-local fontproperties = fonts.hashes.properties
-
-local a_colorscheme  = attributes.private('colorscheme')
-local setnodecolor   = nodes.tracers.colors.set
-
--- function colorschemes.coloring(head)
---     local lastfont, lastscheme
---     local done = false
---     for n in traverse_id(glyph_code,tonut(head)) do
---         local a = getattr(n,a_colorscheme)
---         if a then
---             local f = getfont(n)
---             if f ~= lastfont then
---                 lastscheme = fontproperties[f].colorscheme
---                 lastfont   = f
---             end
---             if lastscheme then
---                 local sc = lastscheme[getchar(n)]
---                 if sc then
---                     done = true
---                     setnodecolor(n,"colorscheme:"..a..":"..sc) -- slow
---                 end
---             end
---         end
---     end
---     return head, done
--- end
-
--- seldom used, mostly in manuals, so non critical .. anyhow, somewhat faster:
-
--- function colorschemes.coloring(head)
---     local lastfont   = nil
---     local lastattr   = nil
---     local lastscheme = nil
---     local lastprefix = nil
---     local done       = nil
---     for n in traverse_id(glyph_code,tonut(head)) do
---         local a = getattr(n,a_colorscheme)
---         if a then
---             if a ~= lastattr then
---                 lastattr   = a
---                 lastprefix = "colorscheme:" .. a .. ":"
---             end
---             local f = getfont(n)
---             if f ~= lastfont then
---                 lastfont   = f
---                 lastscheme = fontproperties[f].colorscheme
---             end
---             if lastscheme then
---                 local sc = lastscheme[getchar(n)]
---                 if sc then
---                     setnodecolor(n,lastprefix .. sc) -- slow
---                     done = true
---                 end
---             end
---         end
---     end
---     return head, done
--- end
-
--- ok, in case we have hundreds of pages colored:
-
-local cache = { } -- this could be a weak table
-
-setmetatableindex(cache,function(t,a)
-    local v = { }
-    setmetatableindex(v,function(t,c)
-        local v = "colorscheme:" .. a .. ":" .. c
-        t[c] = v
-        return v
-    end)
-    t[a]= v
-    return v
-end)
-
-function colorschemes.coloring(head)
-    local lastfont   = nil
-    local lastattr   = nil
-    local lastcache  = nil
-    local lastscheme = nil
-    local done       = nil
-    for n in traverse_id(glyph_code,tonut(head)) do
-        local a = getattr(n,a_colorscheme)
-        if a then
-            local f = getfont(n)
-            if f ~= lastfont then
-                lastfont   = f
-                lastscheme = fontproperties[f].colorscheme
-            end
-            if a ~= lastattr then
-                lastattr  = a
-                lastcache = cache[a]
-            end
-            if lastscheme then
-                local sc = lastscheme[getchar(n)]
-                if sc then
-                    setnodecolor(n,lastcache[sc]) -- we could inline this one
-                    done = true
-                end
-            end
-        end
-    end
-    return head, done
-end
-
-function colorschemes.enable()
-    nodes.tasks.appendaction("processors","fonts","fonts.goodies.colorschemes.coloring")
-    function colorschemes.enable() end
-end
-
-local function setextrafeatures(tfmdata)
-    local goodies = tfmdata.goodies
-    if goodies then
-        for i=1,#goodies do
-            local g = goodies[i]
-            local f = g.features
-            if f then
-                for feature, specification in next, f do
-                    addotffeature(tfmdata.shared.rawdata,feature,specification)
-                    registerotffeature {
-                        name        = feature,
-                        description = formatters["extra: %s"](feature)
-                    }
-                end
-            end
-        end
-    end
-end
-
-local function setextensions(tfmdata)
-    local goodies = tfmdata.goodies
-    if goodies then
-        for i=1,#goodies do
-            local g = goodies[i]
-            local e = g.extensions
-            if e then
-                local goodie = g.name or "unknown"
-                for i=1,#e do
-                    local name = "extension-" .. i
-                 -- report_goodies("adding extension %s from %s",name,goodie)
-                    otf.enhancers.addfeature(tfmdata.shared.rawdata,name,e[i])
-                end
-            end
-        end
-    end
-end
-
--- installation
-
-local goodies_specification = {
-    name         = "goodies",
-    description  = "goodies on top of built in features",
-    initializers = {
-        position = 1,
-        base     = setgoodies,
-        node     = setgoodies,
-    }
-}
-
-registerotffeature(goodies_specification)
-registerafmfeature(goodies_specification)
-registertfmfeature(goodies_specification)
-
--- maybe more of the following could be for type one too
-
-registerotffeature {
-    name        = "extrafeatures",
-    description = "extra features",
-    default     = true,
-    initializers = {
-        position = 2,
-        base     = setextrafeatures,
-        node     = setextrafeatures,
-    }
-}
-
-registerotffeature {
-    name        = "extensions",
-    description = "extensions to features",
-    default     = true,
-    initializers = {
-        position = 2,
-        base     = setextensions,
-        node     = setextensions,
-    }
-}
-
-registerotffeature {
-    name        = "featureset",
-    description = "goodie feature set",
-    initializers = {
-        position = 3,
-        base     = setfeatureset,
-        node     = setfeatureset,
-    }
-}
-
-registerotffeature {
-    name        = "colorscheme",
-    description = "goodie color scheme",
-    initializers = {
-        base = setcolorscheme,
-        node = setcolorscheme,
-    }
-}
-
-registerotffeature {
-    name        = "postprocessor",
-    description = "goodie postprocessor",
-    initializers = {
-        base = setpostprocessor,
-        node = setpostprocessor,
-    }
-}
-
--- experiment, we have to load the definitions immediately as they precede
--- the definition so they need to be initialized in the typescript
-
-local function initialize(goodies)
-    local mathgoodies = goodies.mathematics
-    if mathgoodies then
-        local virtuals = mathgoodies.virtuals
-        local mapfiles = mathgoodies.mapfiles
-        local maplines = mathgoodies.maplines
-        if virtuals then
-            for name, specification in next, virtuals do
-                -- beware, they are all constructed
-                mathematics.makefont(name,specification,goodies)
-            end
-        end
-        if mapfiles then
-            for i=1,#mapfiles do
-                fonts.mappings.loadfile(mapfiles[i]) -- todo: backend function
-            end
-        end
-        if maplines then
-            for i=1,#maplines do
-                fonts.mappings.loadline(maplines[i]) -- todo: backend function
-            end
-        end
-    end
-end
-
-fontgoodies.register("mathematics", initialize)
-
--- the following takes care of explicit file specifications
---
--- files = {
---     name = "antykwapoltawskiego",
---     list = {
---         ["AntPoltLtCond-Regular.otf"] = {
---          -- name   = "antykwapoltawskiego",
---             style  = "regular",
---             weight = "light",
---             width  = "condensed",
---         },
---     },
--- }
-
--- math italics (not rteally needed)
---
--- it would be nice to have a \noitalics\font option
-
-local function initialize(tfmdata)
-    local goodies = tfmdata.goodies
-    if goodies then
-        local shared = tfmdata.shared
-        for i=1,#goodies do
-            local mathgoodies = goodies[i].mathematics
-            local mathitalics = mathgoodies and mathgoodies.italics
-            if mathitalics then
-                local properties = tfmdata.properties
-                if properties.setitalics then
-                    mathitalics = mathitalics[file.nameonly(properties.name)] or mathitalics
-                    if mathitalics then
-                        if trace_goodies then
-                            report_goodies("loading mathitalics for font %a",properties.name)
-                        end
-                        local corrections   = mathitalics.corrections
-                        local defaultfactor = mathitalics.defaultfactor
-                     -- properties.mathitalic_defaultfactor = defaultfactor -- we inherit outer one anyway (name will change)
-                        if corrections then
-                            fontgoodies.registerpostprocessor(tfmdata, function(tfmdata) -- this is another tfmdata (a copy)
-                                -- better make a helper so that we have less code being defined
-                                local properties = tfmdata.properties
-                                local parameters = tfmdata.parameters
-                                local characters = tfmdata.characters
-                                properties.mathitalic_defaultfactor = defaultfactor
-                                properties.mathitalic_defaultvalue  = defaultfactor * parameters.quad
-                                if trace_goodies then
-                                    report_goodies("assigning mathitalics for font %a",properties.name)
-                                end
-                                local quad    = parameters.quad
-                                local hfactor = parameters.hfactor
-                                for k, v in next, corrections do
-                                    local c = characters[k]
-                                    if c then
-                                        if v > -1 and v < 1 then
-                                            c.italic = v * quad
-                                        else
-                                            c.italic = v * hfactor
-                                        end
-                                    else
-                                        report_goodies("invalid mathitalics entry %U for font %a",k,properties.name)
-                                    end
-                                end
-                            end)
-                        end
-                        return -- maybe not as these can accumulate
-                    end
-                end
-            end
-        end
-    end
-end
-
-registerotffeature {
-    name         = "mathitalics",
-    description  = "additional math italic corrections",
- -- default      = true,
-    initializers = {
-        base = initialize,
-        node = initialize,
-    }
-}
-
--- fontgoodies.register("mathitalics", initialize)
-
--- files
-
-local function initialize(goodies)
-    local files = goodies.files
-    if files then
-        fonts.names.register(files)
-    end
-end
-
-fontgoodies.register("files", initialize)
-
--- some day we will have a define command and then we can also do some
--- proper tracing
---
--- fonts.typefaces["antykwapoltawskiego-condensed"] = {
---     shortcut     = "rm",
---     shape        = "serif",
---     fontname     = "antykwapoltawskiego",
---     normalweight = "light",
---     boldweight   = "medium",
---     width        = "condensed",
---     size         = "default",
---     features     = "default",
--- }
-
-local function initialize(goodies)
-    local typefaces = goodies.typefaces
-    if typefaces then
-        local ft = fonts.typefaces
-        for k, v in next, typefaces do
-            ft[k] = v
-        end
-    end
-end
-
-fontgoodies.register("typefaces", initialize)
-
-local compositions = { }
-
-function fontgoodies.getcompositions(tfmdata)
-    return compositions[file.nameonly(tfmdata.properties.filename or "")]
-end
-
-local function initialize(goodies)
-    local gc = goodies.compositions
-    if gc then
-        for k, v in next, gc do
-            compositions[k] = v
-        end
-    end
-end
-
-fontgoodies.register("compositions", initialize)
-
--- extra treatments (on top of defaults): \loadfontgoodies[mytreatments]
-
-local treatmentdata = fonts.treatments.data
-
-local function initialize(goodies)
-    local treatments = goodies.treatments
-    if treatments then
-        for name, data in next, treatments do
-            treatmentdata[name] = data -- always wins
-        end
-    end
-end
-
-fontgoodies.register("treatments", initialize)
-
-local filenames       = fontgoodies.filenames or allocate()
-fontgoodies.filenames = filenames
-
-local filedata        = filenames.data or allocate()
-filenames.data        = filedata
-
-local function initialize(goodies) -- design sizes are registered global
-    local fn = goodies.filenames
-    if fn then
-        for usedname, alternativenames in next, fn do
-            filedata[usedname] = alternativenames
-        end
-    end
-end
-
-fontgoodies.register("filenames", initialize)
-
-function fontgoodies.filenames.resolve(name)
-    local fd = filedata[name]
-    if fd and findfile(name) == "" then
-        for i=1,#fd do
-            local fn = fd[i]
-            if findfile(fn) ~= "" then
-                return fn
-            end
-        end
-    else
-        -- no lookup, just use the regular mechanism
-    end
-    return name
-end
-
-local designsizes       = fontgoodies.designsizes or allocate()
-fontgoodies.designsizes = designsizes
-
-local designdata        = designsizes.data or allocate()
-designsizes.data        = designdata
-
-local function initialize(goodies) -- design sizes are registered global
-    local gd = goodies.designsizes
-    if gd then
-        for name, data in next, gd do
-            local ranges = { }
-            for size, file in next, data do
-                if size ~= "default" then
-                    ranges[#ranges+1] =  { texsp(size), file } -- also lower(file)
-                end
-            end
-            table.sort(ranges,function(a,b) return a[1] < b[1] end)
-            designdata[lower(name)] = { -- overloads, doesn't merge!
-                default = data.default,
-                ranges  = ranges,
-            }
-        end
-    end
-end
-
-fontgoodies.register("designsizes", initialize)
-
-function fontgoodies.designsizes.register(name,size,specification)
-    local d = designdata[name]
-    if not d then
-        d = {
-            ranges  = { },
-            default = nil, -- so we have no default set
-        }
-        designdata[name] = d
-    end
-    if size == "default" then
-        d.default = specification
-    else
-        if type(size) == "string" then
-            size = texsp(size) -- hm
-        end
-        local ranges = d.ranges
-        ranges[#ranges+1] = { size, specification }
-    end
-end
-
-function fontgoodies.designsizes.filename(name,spec,size) -- returns nil of no match
-    local data = designdata[lower(name)]
-    if data then
-        if not spec or spec == "" or spec == "default" then
-            return data.default
-        elseif spec == "auto" then
-            local ranges = data.ranges
-            if ranges then
-                for i=1,#ranges do
-                    local r = ranges[i]
-                    if r[1] >= size then -- todo: rounding so maybe size - 100
-                        return r[2]
-                    end
-                end
-            end
-            return data.default or (ranges and ranges[#ranges][2])
-        end
-    end
-end
-
--- The following file (husayni.lfg) is the experimental setup that we used
--- for Idris font. For the moment we don't store this in the cache and quite
--- probably these files sit in one of the paths:
---
--- tex/context/fonts/goodies
--- tex/fonts/goodies/context
--- tex/fonts/data/foundry/collection
---
--- see lfg files in distribution
-
--- interface
-
-implement {
-    name      = "loadfontgoodies",
-    actions   = fontgoodies.load,
-    arguments = "string",
-    overload  = true, -- for now, permits new font loader
-}
-
-implement {
-    name      = "enablefontcolorschemes",
-    onlyonce  = true,
-    actions   = colorschemes.enable,
-    overload  = true, -- for now, permits new font loader
-}
-
--- weird place ... depends on math
-
-local function finalize(tfmdata,feature,value)
-    mathematics.overloaddimensions(tfmdata,tfmdata,value)
-end
-
-registerotffeature {
-    name         = "mathdimensions",
-    description  = "manipulate math dimensions",
- -- default      = true,
-    manipulators = {
-        base = finalize,
-        node = finalize,
-    }
-}
-
--- kern hackery:
---
--- yes  : use goodies table
--- auto : assume features to be set (often ccmp only)
-
-local function setkeepligatures(tfmdata,value)
-    if not tfmdata.properties.keptligatures then
-        local goodies = tfmdata.goodies
-        if goodies then
-            for i=1,#goodies do
-                local g = goodies[i]
-                local letterspacing = g.letterspacing
-                if letterspacing then
-                    local keptligatures = letterspacing.keptligatures
-                    if keptligatures then
-                        local unicodes = tfmdata.resources.unicodes -- so we accept names
-                        local hash = { }
-                        for k, v in next, keptligatures do
-                            local u = unicodes[k]
-                            if u then
-                                hash[u] = true
-                            else
-                                -- error: unknown name
-                            end
-                        end
-                        tfmdata.properties.keptligatures = hash
-                    end
-                end
-            end
-        end
-    end
-end
-
-registerotffeature {
-    name         = "keepligatures",
-    description  = "keep ligatures in letterspacing",
-    initializers = {
-        base = setkeepligatures,
-        node = setkeepligatures,
-    }
-}
diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua
index cf369708c..706c5b709 100644
--- a/tex/context/base/mkiv/font-map.lua
+++ b/tex/context/base/mkiv/font-map.lua
@@ -19,9 +19,9 @@ local trace_mapping = false  trackers.register("fonts.mapping", function(v) trac
 
 local report_fonts  = logs.reporter("fonts","loading") -- not otf only
 
--- force_ligatures is true per 2017-04-20 so that these emoji's with bad names work too
+-- force_ligatures was true for a while so that these emoji's with bad names work too
 
-local force_ligatures = true  directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end)
+local force_ligatures = false  directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end)
 
 local fonts         = fonts or { }
 local mappings      = fonts.mappings or { }
@@ -279,6 +279,9 @@ do
         ffl = { name = "f_f_l", unicode = { 0x66, 0x66, 0x6C }, mess = 0xFB04 },
         fj  = { name = "f_j",   unicode = { 0x66, 0x6A } },
         fk  = { name = "f_k",   unicode = { 0x66, 0x6B } },
+
+     -- endash = { name = "endash", unicode = 0x2013, mess = 0x2013 },
+     -- emdash = { name = "emdash", unicode = 0x2014, mess = 0x2014 },
     }
 
     local o = { }
@@ -299,7 +302,7 @@ do
 
 end
 
-function mappings.addtounicode(data,filename,checklookups)
+function mappings.addtounicode(data,filename,checklookups,forceligatures)
     local resources = data.resources
     local unicodes  = resources.unicodes
     if not unicodes then
@@ -517,22 +520,26 @@ function mappings.addtounicode(data,filename,checklookups)
 
     if not collected then
         -- move on
-    elseif force_ligatures then
+    elseif forceligatures or force_ligatures then
         for i=1,#dlist do
             local du = dlist[i]
-            local u  = collected[du] -- always tables
-            if u then
-                resolve(descriptions[du],u)
+            if du >= private or (du >= 0xE000 and du <= 0xF8FF) then
+                local u  = collected[du] -- always tables
+                if u then
+                    resolve(descriptions[du],u)
+                end
             end
         end
     else
         for i=1,#dlist do
-            local du    = dlist[i]
-            local glyph = descriptions[du]
-            if glyph.class == "ligature" and not glyph.unicode then
-                local u = collected[du] -- always tables
-                if u then
-                     resolve(glyph,u)
+            local du = dlist[i]
+            if du >= private or (du >= 0xE000 and du <= 0xF8FF) then
+                local glyph = descriptions[du]
+                if glyph.class == "ligature" and not glyph.unicode then
+                    local u = collected[du] -- always tables
+                    if u then
+                         resolve(glyph,u)
+                    end
                 end
             end
         end
diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua
index c166f5ce4..2ecf1ba42 100644
--- a/tex/context/base/mkiv/font-ocl.lua
+++ b/tex/context/base/mkiv/font-ocl.lua
@@ -40,7 +40,7 @@ else
 
     function otf.getactualtext(s)
         return
-            "/Span << /ActualText <feff" .. n .. "> >> BDC",
+            "/Span << /ActualText <feff" .. s .. "> >> BDC",
             "EMC"
     end
 
diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua
index 634f8a83c..2c79500e7 100644
--- a/tex/context/base/mkiv/font-otj.lua
+++ b/tex/context/base/mkiv/font-otj.lua
@@ -1434,6 +1434,35 @@ function injections.isspace(n,threshold,id)
     end
 end
 
+-- We have a plugin so that Kai can use the next in plain. Such a plugin is rather application
+-- specific.
+--
+-- local getboth = nodes.direct.getboth
+-- local getid   = nodes.direct.getid
+-- local getprev = nodes.direct.getprev
+-- local getnext = nodes.direct.getnext
+--
+-- local whatsit_code = nodes.nodecodes.whatsit
+-- local glyph_code   = nodes.nodecodes.glyph
+--
+-- local function getspaceboth(n) -- fragile: what it prev/next has no width field
+--     local prev, next = getboth(n)
+--     while prev and (getid(prev) == whatsit_code or (getwidth(prev) == 0 and getid(prev) ~= glyph_code)) do
+--         prev = getprev(prev)
+--     end
+--     while next and (getid(next) == whatsit_code or (getwidth(next) == 0 and getid(next) ~= glyph_code)) do
+--         next = getnext(next)
+--     end
+-- end
+--
+-- injections.installgetspaceboth(getspaceboth)
+
+local getspaceboth = getboth
+
+function injections.installgetspaceboth(gb)
+    getspaceboth = gb or getboth
+end
+
 local function injectspaces(head)
 
     if not triggers then
@@ -1458,9 +1487,9 @@ local function injectspaces(head)
     end
 
     for n in traverse_id(glue_code,tonut(head)) do
-        local prev, next = getboth(n)
-        local prevchar = ischar(prev)
-        local nextchar = ischar(next)
+        local prev, next = getspaceboth(n)
+        local prevchar = prev and ischar(prev)
+        local nextchar = next and ischar(next)
         if nextchar then
             local font = getfont(next)
             local trig = triggers[font]
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index 16c2ce735..04ecaa923 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -4289,9 +4289,9 @@ local function spaceinitializer(tfmdata,value) -- attr
                                         if type(kern) ~= "table" then
                                             left[k] = kern
                                         elseif single then
-                                            left[k] = v[3]
+                                            left[k] = kern[3]
                                         else
-                                            local one = v[1]
+                                            local one = kern[1]
                                             if one then
                                                 left[k] = one[3]
                                             end
diff --git a/tex/context/base/mkiv/font-tmp.lua b/tex/context/base/mkiv/font-tmp.lua
deleted file mode 100644
index 8db5cff14..000000000
--- a/tex/context/base/mkiv/font-tmp.lua
+++ /dev/null
@@ -1,118 +0,0 @@
-if not modules then modules = { } end modules ['font-tmp'] = {
-    version   = 1.001,
-    comment   = "companion to font-ini.mkiv",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
--- There is a complete feature loader but it needs a bit of testing, first so this
--- one does design size only (as needed for identifying).
-
-local next, type = next, type
-
-local report       = logs.reporter("otf reader")
-
-local readers      = fonts.handlers.otf.readers
-local streamreader = readers.streamreader
-
-local readushort   = streamreader.readcardinal2  -- 16-bit unsigned integer
-local readulong    = streamreader.readcardinal4  -- 24-bit unsigned integer
-local readshort    = streamreader.readinteger2   -- 16-bit   signed integer
-local readtag      = streamreader.readtag
-local skipshort    = streamreader.skipshort
-local setposition  = streamreader.setposition
-
-local plugins      = { }
-
-function plugins.size(f,fontdata,tableoffset,parameters)
-    if not fontdata.designsize then
-        setposition(f,tableoffset+parameters)
-        local designsize = readushort(f)
-        if designsize > 0 then
-            fontdata.designsize = designsize
-            skipshort(f,2)
-            fontdata.minsize = readushort(f)
-            fontdata.maxsize = readushort(f)
-        end
-    end
-end
-
-local function readscripts(f,fontdata,what)
-    local datatable = fontdata.tables[what]
-    if not datatable then
-        return
-    end
-    local tableoffset = datatable.offset
-    setposition(f,tableoffset)
-    local version = readulong(f)
-    if version ~= 0x00010000 then
-        report("table version %a of %a is not supported (yet), maybe font %s is bad",version,what,fontdata.filename)
-        return
-    end
-    --
-    local scriptoffset  = tableoffset + readushort(f)
-    local featureoffset = tableoffset + readushort(f)
-    local lookupoffset  = tableoffset + readushort(f)
-    --
-    setposition(f,scriptoffset)
-    local nofscripts = readushort(f)
-    local scripts    = { }
-    for i=1,nofscripts do
-        scripts[readtag(f)] = scriptoffset + readushort(f)
-    end
-    local languagesystems = table.setmetatableindex("table") -- we share when possible
-    for script, offset in next, scripts do
-        setposition(f,offset)
-        local defaultoffset = readushort(f)
-        local noflanguages  = readushort(f)
-        local languages     = { }
-        if defaultoffset > 0 then
-            languages.dflt = languagesystems[offset + defaultoffset]
-        end
-        for i=1,noflanguages do
-            local language      = readtag(f)
-            local offset        = offset + readushort(f)
-            languages[language] = languagesystems[offset]
-        end
-        scripts[script] = languages
-    end
-    --
-    setposition(f,featureoffset)
-    local features    = { }
-    local noffeatures = readushort(f)
-    for i=1,noffeatures do
-        features[i] = {
-            tag    = readtag(f),
-            offset = readushort(f)
-        }
-    end
-    --
-    for i=1,noffeatures do
-        local feature = features[i]
-        local offset  = featureoffset + feature.offset
-        setposition(f,offset)
-        local parameters = readushort(f) -- feature.parameters
-        local noflookups = readushort(f)
-        skipshort(f,noflookups+1)
-        if parameters > 0 then
-            feature.parameters = parameters
-            local plugin = plugins[feature.tag]
-            if plugin then
-                plugin(f,fontdata,offset,parameters)
-            end
-        end
-    end
-end
-
-function readers.gsub(f,fontdata,specification)
-    if specification.details then
-        readscripts(f,fontdata,"gsub")
-    end
-end
-
-function readers.gpos(f,fontdata,specification)
-    if specification.details then
-        readscripts(f,fontdata,"gpos")
-    end
-end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ccf6de7ab..56ab3aa69 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 37f242020..85a976f79 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkii/cont-en.xml b/tex/context/interface/mkii/cont-en.xml
deleted file mode 100644
index 59a6bf6bb..000000000
--- a/tex/context/interface/mkii/cont-en.xml
+++ /dev/null
@@ -1,10396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- versions:
-
-     comment  : user interface definitions of ConTeXt
-
-     authors  : Hans Hagen, Taco Hoekwater, Patrick Gundlach, Wolfgang Schuster, and others
-
-     versions : 2004.11.17 : initial version
-                2006.08.02 : define + resolve
-
--->
-
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context test" language="en" version="2006.08.02">
-
-  <!-- there are some more -->
-
-  <cd:define name="align">
-    <cd:constant type="inner"/>
-    <cd:constant type="outer"/>
-    <cd:constant type="left"/>
-    <cd:constant type="right"/>
-    <cd:constant type="flushleft"/>
-    <cd:constant type="flushright"/>
-    <cd:constant type="middle"/>
-    <cd:constant type="center"/>
-    <cd:constant type="normal"/>
-    <cd:constant type="no"/>
-    <cd:constant type="yes"/>
-    <cd:constant type="broad"/>
-    <cd:constant type="last"/>
-    <cd:constant type="r2l"/>
-    <cd:constant type="l2r"/>
-  </cd:define>
-
-  <cd:define name="symalign">
-    <cd:constant type="left"/>
-    <cd:constant type="right"/>
-    <cd:constant type="flushleft"/>
-    <cd:constant type="flushright"/>
-    <cd:constant type="middle"/>
-    <cd:constant type="center"/>
-  </cd:define>
-
-  <cd:define name="indenting">
-    <cd:constant type="never"/>
-    <cd:constant type="none"/>
-    <cd:constant type="not"/>
-    <cd:constant type="no"/>
-    <cd:constant type="yes"/>
-    <cd:constant type="always"/>
-    <cd:constant type="first"/>
-    <cd:constant type="next"/>
-    <cd:constant type="small"/>
-    <cd:constant type="medium"/>
-    <cd:constant type="big"/>
-    <cd:constant type="normal"/>
-    <cd:constant type="odd"/>
-    <cd:constant type="even"/>
-    <cd:constant type="cd:dimension"/>
-  </cd:define>
-
-  <cd:define name="indentnext">
-    <cd:constant type="yes"/>
-    <cd:constant type="no"/>
-  </cd:define>
-
-  <cd:define name="style">
-    <cd:constant type="normal"/>
-    <cd:constant type="bold"/>
-    <cd:constant type="slanted"/>
-    <cd:constant type="boldslanted"/>
-    <cd:constant type="type"/>
-    <cd:constant type="cap"/>
-    <cd:constant type="small..."/>
-    <cd:constant type="cd:command"/>
-  </cd:define>
-
-  <cd:define name="language">
-    <cd:constant type="nl"/>
-    <cd:constant type="fr"/>
-    <cd:constant type="en"/>
-    <cd:constant type="uk"/>
-    <cd:constant type="de"/>
-    <cd:constant type="es"/>
-    <cd:constant type="cz"/>
-    <cd:constant type=".."/>
-  </cd:define>
-
-  <cd:define name="texts">
-    <cd:constant type="cd:text"/>
-    <cd:constant type="cd:section"/>
-    <cd:constant type="date"/>
-    <cd:constant type="cd:mark"/>
-    <cd:constant type="pagenumber"/>
-  </cd:define>
-
-  <cd:define name="layout-h">
-    <cd:constant type="text" default="yes"/>
-    <cd:constant type="margin"/>
-    <cd:constant type="edge"/>
-  </cd:define>
-
-  <cd:define name="layout-v">
-    <cd:constant type="top"/>
-    <cd:constant type="header"/>
-    <cd:constant type="text" default="yes"/>
-    <cd:constant type="footer"/>
-    <cd:constant type="bottom"/>
-  </cd:define>
-
-  <cd:define name="bodyfont">
-    <cd:constant type="5pt"/>
-    <cd:constant type="..."/>
-    <cd:constant type="12pt"/>
-    <cd:constant type="small"/>
-    <cd:constant type="big"/>
-  </cd:define>
-
-  <cd:command name="installlanguage" file="lang-ini.tex" category="language">
-    <cd:sequence>
-      <cd:string value="installlanguage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="spacing">
-          <cd:constant type="packed" default="yes"/>
-          <cd:constant type="broad"/>
-        </cd:parameter>
-        <cd:parameter name="lefthyphenmin">
-          <cd:constant type="cd:number" default="2"/>
-        </cd:parameter>
-        <cd:parameter name="righthyphenmin">
-          <cd:constant type="cd:number" default="2"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="leftsentence">
-          <cd:constant type="cd:command" default="---"/>
-        </cd:parameter>
-        <cd:parameter name="rightsentence">
-          <cd:constant type="cd:command" default="---"/>
-        </cd:parameter>
-        <cd:parameter name="leftsubsentence">
-          <cd:constant type="cd:command" default="---"/>
-        </cd:parameter>
-        <cd:parameter name="rightsubsentence">
-          <cd:constant type="cd:command" default="---"/>
-        </cd:parameter>
-        <cd:parameter name="leftquote">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="rightquote">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="leftquotation">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="rightquotation">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="leftspeech">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="middlespeech">
-          <cd:constant type="cd:command" default=""/>
-        </cd:parameter>
-        <cd:parameter name="rightspeech">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="limittext">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="date">
-          <cd:constant type="cd:text"/> <!-- TODO -->
-        </cd:parameter>
-        <cd:parameter name="compoundhyphen">
-          <cd:constant type="cd:command" default="\compoundhyphen"/>
-        </cd:parameter>
-        <cd:parameter name="leftcompoundhyphen">
-          <cd:constant type="cd:command" default="\compoundhyphen"/>
-        </cd:parameter>
-        <cd:parameter name="rightcompoundhyphen">
-          <cd:constant type="cd:command" default=""/>
-        </cd:parameter>
-        <cd:parameter name="default">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplanguage" file="lang-ini.tex" category="language">
-    <cd:sequence>
-      <cd:string value="setuplanguage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:resolve name="language"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="installlanguage" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="language" file="lang-ini.tex" category="language">
-    <cd:sequence>
-      <cd:string value="language"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:resolve name="language"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="mainlanguage" file="lang-ini.tex" category="language">
-    <cd:sequence>
-      <cd:string value="mainlanguage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:resolve name="language"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="translate" file="lang-lab.tex" category="language">
-    <cd:sequence>
-      <cd:string value="translate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="cd:name">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useencoding" file="enco-ini.tex" category="encoding" obsolete="yes"> <!-- engine="pdftex" -->
-    <cd:sequence>
-      <cd:string value="useencoding"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usespecials" file="spec-ini.tex">
-    <cd:sequence>
-      <cd:string value="usespecials"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="reset"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineoutput" file="spec-ini.tex">
-    <cd:sequence>
-      <cd:string value="defineoutput"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupoutput" file="spec-ini.tex">
-    <cd:sequence>
-      <cd:string value="setupoutput"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definebodyfontenvironment" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definebodyfontenvironment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes"> <!-- it's possible to use 1+2+3, 2+3, what about 1+2? -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="no"> <!-- have to force no, otherwise \showsetup is wrong ! -->
-        <cd:constant type="5pt"/> <!-- TODO: maybe <cd:resolve name="bodyfont"/> -->
-        <cd:constant type="..."/>
-        <cd:constant type="12pt"/>
-        <cd:constant type="default"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:parameter name="text">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="script">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="scriptscript">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="x">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="xx">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="a">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="b">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="c">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="d">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="small">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="big">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="interlinespace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="em">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbodyfontenvironment" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="setupbodyfontenvironment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes"> <!-- same as definebodyfontenvironment; you can define the whole commant to inherit, not only parameters-->
-        <cd:inherit name="definebodyfontenvironment" n="1"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="no">
-        <cd:inherit name="definebodyfontenvironment" n="2" optional="no"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="definebodyfontenvironment" n="3"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showbodyfontenvironment" file="font-run.tex" category="fonts"> <!-- and debug -->
-    <cd:sequence>
-      <cd:string value="showbodyfontenvironment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:inherit name="setupbodyfont" n="1"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definebodyfont" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definebodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes"> <!-- <cd:constant type="default"/> -->
-        <cd:resolve name="bodyfont"/> <!-- TODO: check this -->
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="rm" default="yes"/>
-        <cd:constant type="ss"/>
-        <cd:constant type="tt"/>
-        <cd:constant type="hw"/>
-        <cd:constant type="cg"/>
-        <cd:constant type="mm"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="tf">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="bf">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="sl">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="it">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="bs">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="bi">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="sc">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="mr">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="ex">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="mi">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="sy">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="ma">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="mb">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="mc">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="md">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definebodyfontDEF" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definebodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:inherit name="setupbodyfont" n="2"/>
-      </cd:keywords>
-      <cd:keywords n="1">
-        <cd:inherit name="setupbodyfont" n="3"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definebodyfontREF" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definebodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:inherit name="setupbodyfont" n="1"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:inherit name="setupbodyfont" n="2"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showbodyfont" file="font-run.tex" category="fonts"> <!-- visual debugging -->
-    <cd:sequence>
-      <cd:string value="showbodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:inherit name="setupbodyfont" n="1"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbodyfont" file="font-run.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="setupbodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes"> <!-- TODO: many missing, maybe also <cd:resolve name="bodyfont"/> -->
-        <cd:constant type="cd:name"/>
-        <cd:constant type="serif"/>
-        <cd:constant type="regular"/>
-        <cd:constant type="roman"/>
-        <cd:constant type="sans"/>
-        <cd:constant type="support"/>
-        <cd:constant type="sansserif"/>
-        <cd:constant type="mono"/>
-        <cd:constant type="type"/>
-        <cd:constant type="teletype"/>
-        <cd:constant type="handwritten"/>
-        <cd:constant type="calligraphic"/>
-        <cd:constant type="5pt"/>
-        <cd:constant type="..."/>
-        <cd:constant type="12pt"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="switchtobodyfont" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="switchtobodyfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-        <cd:constant type="serif"/>
-        <cd:constant type="regular"/>
-        <cd:constant type="roman"/>
-        <cd:constant type="sans"/>
-        <cd:constant type="support"/>
-        <cd:constant type="sansserif"/>
-        <cd:constant type="mono"/>
-        <cd:constant type="type"/>
-        <cd:constant type="teletype"/>
-        <cd:constant type="handwritten"/>
-        <cd:constant type="calligraphic"/>
-        <cd:constant type="5pt"/>
-        <cd:constant type="..."/>
-        <cd:constant type="12pt"/>
-        <cd:constant type="small"/>
-        <cd:constant type="big"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefont" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definefont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcolor" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="setupcolor"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcolors" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="setupcolors"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="global"/>
-          <cd:constant type="local"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="always"/>
-          <cd:constant type="never"/>
-        </cd:parameter>
-        <cd:parameter name="reduction">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="rgb">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="cmyk">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="mpcmyk">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="mpspot">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="textcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="split">
-          <cd:constant type="c"/>
-          <cd:constant type="m"/>
-          <cd:constant type="y"/>
-          <cd:constant type="k"/>
-          <cd:constant type="p"/>
-          <cd:constant type="s"/>
-          <cd:constant type="no"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="all"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="intent">
-          <cd:constant type="none"/>
-          <cd:constant type="overprint"/>
-          <cd:constant type="knockout"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definecolor" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="definecolor"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="r">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="g">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="b">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="c">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="m">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="y">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="k">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="s">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="h">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="t">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="a">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="p">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="e">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="color" type="environment" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="color"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="color" file="colo-ini.tex">
-    <cd:sequence>
-      <cd:string value="color"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="graycolor" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="graycolor"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showcolor" file="colo-run.tex" category="colors"> <!-- and debug -->
-    <cd:sequence>
-      <cd:string value="showcolor"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definepalet" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="definepalet"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="cd:name">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppalet" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="setuppalet"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definecolorgroup" file="colo-ini.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="definecolorgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="rgb" default="yes"/>
-        <cd:constant type="cmyk"/>
-        <cd:constant type="gray"/>
-        <cd:constant type="s"/>
-      </cd:keywords>
-      <cd:triplet n="3" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showpalet" file="colo-run.tex" category="colors"> <!-- and debug -->
-    <cd:sequence>
-      <cd:string value="showpalet"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="horizontal"/>
-        <cd:constant type="vertical"/>
-        <cd:constant type="name"/>
-        <cd:constant type="value"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showcolorgroup" file="colo-run.tex" category="colors"> <!-- and debug-->
-    <cd:sequence>
-      <cd:string value="showcolorgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="horizontal"/>
-        <cd:constant type="vertical"/>
-        <cd:constant type="name"/>
-        <cd:constant type="value"/>
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="comparepalet" file="colo-run.tex" category="colors"> <!-- and debug? -->
-    <cd:sequence>
-      <cd:string value="comparepalet"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="comparecolorgroup" file="colo-run.tex" category="colors">
-    <cd:sequence>
-      <cd:string value="comparecolorgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showmakeup" file="supp-vis.tex" category="debug">
-    <cd:sequence>
-      <cd:string value="showmakeup"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="definetype" file="core-ver.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="definetype"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setuptype" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptype" file="core-ver.tex" category="verbatim"> <!-- TODO -->
-    <cd:sequence>
-      <cd:string value="setuptype"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="space">
-          <cd:constant type="on"/>
-          <cd:constant type="off" default="yes"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="slanted"/>
-          <cd:constant type="normal"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="type" file="verb-ini.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="type"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="typ" file="core-ver.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="typ"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="tex" file="core-ver.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="tex"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- cd:command name="arg" file="core-ver.tex"> command broken
-  <cd:sequence>
-    <cd:string value="arg"/>
-  </cd:sequence>
-  <cd:arguments>
-    <cd:content/>
-  </cd:arguments>
-</cd:command -->
-
-  <cd:command name="definetyping" file="core-ver.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="definetyping"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:inherit name="setuptyping" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setuptyping" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptyping" file="core-ver.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="setuptyping"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="file"/>
-        <cd:constant type="typing"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="option">
-          <cd:constant type="slanted"/>
-          <cd:constant type="normal"/>
-          <cd:constant type="commands" version="mkiv"/>
-          <cd:constant type="color"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="icommand">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="vcommand">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="ccommand">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command" default="\blank"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command" default="\blank"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="evenmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="oddmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="blank">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="halfline"/>
-          <cd:constant type="line"/>
-        </cd:parameter>
-        <cd:parameter name="escape">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="space">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="tab">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="palet">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="range">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="lines">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="hyphenated"/>
-        </cd:parameter>
-        <cd:parameter name="empty">
-          <cd:constant type="yes"/>
-          <cd:constant type="all"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="numbering">
-          <cd:constant type="line"/>
-          <cd:constant type="file"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="strip">
-          <cd:constant type="no"/>
-          <cd:constant type="auto"/>
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="typing" type="environment" generated="yes" file="verb-ini.tex"
-    category="verbatim">
-    <cd:sequence>
-      <cd:variable value="typing"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="typefile" file="verb-ini.tex" category="verbatim">
-    <cd:sequence>
-      <cd:string value="typefile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfootnotes" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="setupfootnotes"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-        </cd:parameter>
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="page"/>
-          <cd:constant type="cd:text"/>
-          <cd:constant type="columns"/>
-          <cd:constant type="firstcolumn"/>
-          <cd:constant type="lastcolumn"/>
-          <cd:constant type="high"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="rule">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </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="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="columndistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="margindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="numbercommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="textcommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="split">
-          <cd:constant type="tolerant"/>
-          <cd:constant type="strict"/>
-          <cd:constant type="verystrict"/>
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="textstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="textcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="paragraph">
-          <cd:constant type="yes"/>
-          <cd:constant type="no" default="yes"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfootnotedefinition" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="setupfootnotedefinition"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:inherit name="setupdescriptions" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="footnote" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="footnote"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="footnotetext" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="footnotetext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="note" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="note"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" interactive="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="localfootnotes" type="environment" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="localfootnotes"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="placelocalfootnotes" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="placelocalfootnotes"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfootnotes" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placefootnotes" file="core-not.tex" category="footnotes">
-    <cd:sequence>
-      <cd:string value="placefootnotes"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfootnotes" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupunderbar" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="setupunderbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="c"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bottomoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rulecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="underbar" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="underbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="underbars" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="underbars"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overbar" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="overbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overbars" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="overbars"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overstrike" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="overstrike"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overstrikes" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="overstrikes"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="romannumerals" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="romannumerals"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Romannumerals" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="Romannumerals"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="numbers" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="numbers"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="character" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="character"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Character" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="Character"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="characters" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="characters"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Characters" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="Characters"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="mediaeval" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="mediaeval"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="month" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="month"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="MONTH" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="MONTH"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="weekday" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="weekday"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="WEEKDAY" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="WEEKDAY"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcapitals" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="setupcapitals"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="title">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="sc">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="cap" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="cap"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nocap" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="nocap"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="CAP" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="CAP"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Cap" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="Cap"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Caps" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="Caps"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="WORD" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="WORD"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="WORDS" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="WORDS"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Word" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="Word"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="Words" file="core-fnt.tex" category="Fonts">
-    <cd:sequence>
-      <cd:string value="Words"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="stretched" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="stretched"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:word n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definesymbol" file="symb-ini.tex">
-    <cd:sequence>
-      <cd:string value="definesymbol"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefiguresymbol" file="symb-ini.tex">
-    <cd:sequence>
-      <cd:string value="definefiguresymbol"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupexternalfigures" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="symbol" file="symb-ini.tex">
-    <cd:sequence>
-      <cd:string value="symbol"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="symbolset" type="environment" file="symb-ini.tex" category="symbols">
-    <cd:sequence>
-      <cd:string value="symbolset"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsymbolset" file="symb-ini.tex" category="symbols">
-    <cd:sequence>
-      <cd:string value="setupsymbolset"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usesymbols" file="symb-ini.tex" category="symbols">
-    <cd:sequence>
-      <cd:string value="usesymbols"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showsymbolset" file="symb-run.tex" category="symbols"> <!-- and symbols -->
-    <cd:sequence>
-      <cd:string value="showsymbolset"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineconversion" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="defineconversion"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:command"/>
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="convertnumber" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="convertnumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupheadtext" file="lang-lab.tex">
-    <cd:sequence>
-      <cd:string value="setupheadtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="language"/>
-      </cd:keywords>
-      <cd:assignments n="2">
-        <cd:parameter name="cd:name">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplabeltext" file="lang-lab.tex">
-    <cd:sequence>
-      <cd:string value="setuplabeltext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="language"/>
-      </cd:keywords>
-      <cd:assignments n="2">
-        <cd:parameter name="cd:name">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="headtext" file="lang-lab.tex">
-    <cd:sequence>
-      <cd:string value="headtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="labeltext" file="lang-lab.tex">
-    <cd:sequence>
-      <cd:string value="labeltext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupmarginrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupmarginrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1">
-        <cd:parameter name="level">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="marginrule" type="environment" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="marginrule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="marginrule" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="marginrule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplinewidth" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setuplinewidth"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupframed" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupframed"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/> <!-- defines a command with that name -->
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="height">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="fixed"/>
-          <cd:constant type="local"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="autowidth">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="force"/>
-        </cd:parameter>
-        <cd:parameter name="offset">
-          <cd:constant type="none"/>
-          <cd:constant type="overlay"/>
-          <cd:constant type="default"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="depth"/>
-          <cd:constant type="hanging"/>
-          <cd:constant type="high"/>
-          <cd:constant type="lohi"/>
-          <cd:constant type="low"/>
-          <cd:constant type="top"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="bottom"/>
-          <cd:constant type="keep"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="none"/>
-          <cd:constant type="empty"/>
-        </cd:parameter>
-        <cd:parameter name="strut">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="global"/>
-          <cd:constant type="local"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="bottom">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="top">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="frame">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-          <cd:constant type="none"/>
-          <cd:constant type="overlay"/>
-        </cd:parameter>
-        <cd:parameter name="topframe">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="bottomframe">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="leftframe">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="rightframe">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="frameoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="framedepth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="framecorner">
-          <cd:constant type="round"/>
-          <cd:constant type="rectangular"/>
-        </cd:parameter>
-        <cd:parameter name="frameradius">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="framecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="background">
-          <cd:constant type="screen"/>
-          <cd:constant type="color"/>
-          <cd:constant type="none"/>
-          <cd:constant type="foreground"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundscreen">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundoffset">
-          <cd:constant type="frame"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="backgrounddepth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundcorner">
-          <cd:constant type="round"/>
-          <cd:constant type="rectangular"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundradius">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="corner">
-          <cd:constant type="round"/>
-          <cd:constant type="rectangular"/>
-        </cd:parameter>
-        <cd:parameter name="radius">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="empty">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="foregroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="foregroundstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="framed" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="framed"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inframed" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="inframed"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="thinrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="thinrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes">
-        <cd:inherit name="setupthinrules" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupthinrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupthinrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1">
-        <cd:parameter name="interlinespace">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="c"/>
-          <cd:constant type="d"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="background">
-          <cd:constant type="color"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="hairline" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="hairline"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="thinrule" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="thinrule"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="defineframedtext" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="defineframedtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupframedtexts" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineframed" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="defineframed"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupframedtexts" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupframedtexts" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupframedtexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </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="inner">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="linecorrection">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="depthcorrection">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="standard"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="indenting">
-          <cd:resolve name="indenting"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="framedtext" type="environment" generated="yes" file="core-rul.tex">
-    <cd:sequence>
-      <cd:variable value="framedtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="none"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupframedtexts" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="framedtext" generated="yes" file="core-rul.tex">
-    <cd:sequence>
-      <cd:variable value="framedtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupframedtexts" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="background" type="environment" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="background"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="background" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="background"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbackground" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupbackground"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="leftoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bottomoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fillinrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="fillinrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfillinrules" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-      <cd:content n="3" optional="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fillintext" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="fillintext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfillinrules" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-      <cd:content n="3" optional="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfillinrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupfillinrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </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="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="interlinespace">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fillinline" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="fillinline"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfillinlines" n="1"/>
-      </cd:assignments>
-      <cd:nothing n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfillinlines" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupfillinlines"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptextrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setuptextrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="inmargin"/>
-        </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="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="rulecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="textrule" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="textrule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-      </cd:keywords>
-      <cd:content n="2" optional="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="textrule" type="environment" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="textrule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-      </cd:keywords>
-      <cd:content n="2" optional="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="blackrule" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="blackrule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupblackrules" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="blackrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="blackrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:inherit name="setupblackrules" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupblackrules" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupblackrules"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension" default="1em"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension" default="1ex"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="a" default="yes"/>
-          <cd:constant type="b"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension" default=".25ex"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number" default="3"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineoverlay" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="defineoverlay"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:command"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usemodule" file="core-fil.tex"> <!-- TODO -->
-    <cd:sequence>
-      <cd:string value="usemodule"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="reset" file="core-num.tex">
-    <cd:sequence>
-      <cd:string value="reset"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- <cd:command name="donttest">
-  <cd:sequence>
-    <cd:string value="donttest"/>
-  </cd:sequence>
-</cd:command> -->
-
-  <cd:command name="localenvironment" type="environment" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="localenvironment"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupsystem" file="core-sys.tex">
-    <cd:sequence>
-      <cd:string value="setupsystem"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="resolution">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="file">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="directory">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="random">
-          <cd:constant type="normal"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usedirectory" file="core-job.mkii"> <!-- usepath, todo: more than one file -->
-    <cd:sequence>
-      <cd:string value="usedirectory"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-        <cd:constant type="reset"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="low" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="low"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="high" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="high"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="lohi" file="core-fnt.tex">
-    <cd:sequence>
-      <cd:string value="lohi"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showframe" file="page-run.tex">
-    <cd:sequence>
-      <cd:string value="showframe"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-        <cd:constant type="margin"/>
-        <cd:constant type="edge"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="leftaligned" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="leftaligned"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="rightaligned" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="rightaligned"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="midaligned" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="midaligned"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="wordright" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="wordright"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inmargin" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="inmargin"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inothermargin" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="inothermargin"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inleft" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="inleft"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inright" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="inright"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="ininner" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="ininner"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inouter" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="inouter"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="column" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="column"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="showstruts" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="showstruts"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="showsetups" file="page-run.tex">
-    <cd:sequence>
-      <cd:string value="showsetups"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="showlayout" file="page-run.tex">
-    <cd:sequence>
-      <cd:string value="showlayout"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="margintext" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="margintext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="+"/>
-        <cd:constant type="-"/>
-        <cd:constant type="low"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupmarginblocks" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="setupmarginblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="inmargin"/>
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="top">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="bottom">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="marginblock" type="environment" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="marginblock"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="part" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="part"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="title" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="title"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="chapter" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="chapter"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="section" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="section"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="subsection" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="subsection"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="subsubsection" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="subsubsection"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="subject" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="subject"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="subsubject" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="subsubject"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="subsubsubject" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="subsubsubject"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="appendix" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="appendix"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="in" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="in"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="yes"/>
-      <cd:content n="2" interactive="yes"/>
-      <cd:reference n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="at" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="at"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="yes"/>
-      <cd:content n="2" interactive="yes"/>
-      <cd:reference n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="about" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="about"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="yes"/>
-      <cd:reference n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="somewhere" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="somewhere"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-      <cd:reference n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="atpage" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="atpage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="ref" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="ref"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="t"/>
-        <cd:constant type="p"/>
-        <cd:constant type="r"/>
-        <cd:constant type="s"/>
-        <cd:constant type="e"/>
-      </cd:keywords>
-      <cd:reference n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="textreference" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="textreference"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="pagereference" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="pagereference"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="reference" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="reference"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usereferences" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="usereferences"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definereference" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="definereference"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:reference n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definereferenceformat" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="definereferenceformat"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="left">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="label">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="hl" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="hl"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="vl" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="vl"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="godown" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="godown"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="whitespace" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="whitespace"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="nowhitespace" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="nowhitespace"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="crlf" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="crlf"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="space" file="syst-pln.tex">
-    <cd:sequence>
-      <cd:string value="space"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="fixedspaces" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="fixedspaces"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="emptylines" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="emptylines"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nospace" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="nospace"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="packed" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="packed"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupdescriptions" file="core-des.tex">
-    <cd:sequence>
-      <cd:string value="setupdescriptions"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="style">
-          <cd:resolve name="style"/> <!-- TODO: style=normal -->
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="cd:dimension" default="8em"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="sample">
-          <cd:constant type="cd:text" default=""/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="closecommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="closesymbol">
-          <cd:constant type="cd:text" default=""/>
-        </cd:parameter>
-        <cd:parameter name="titleleft">
-          <cd:constant type="cd:text" default="("/>
-        </cd:parameter>
-        <cd:parameter name="titleright">
-          <cd:constant type="cd:text" default=")"/>
-        </cd:parameter>
-        <cd:parameter name="titledistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="titlestyle">
-          <cd:resolve name="style"/> <!-- TODO: default=bold -->
-        </cd:parameter>
-        <cd:parameter name="titlecolor">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="standard"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no" default="yes"/> <!-- TODO: this is default; conflicting syntax? -->
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left" default="yes"/>
-          <cd:constant type="right"/>
-          <cd:constant type="top"/>
-          <cd:constant type="serried"/>
-          <cd:constant type="inmargin"/>
-          <cd:constant type="inleft"/>
-          <cd:constant type="inright"/>
-          <cd:constant type="hanging"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/> <!-- TODO: default=bold -->
-        </cd:parameter>
-        <cd:parameter name="headcolor">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-        <cd:parameter name="headcommand">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="hang">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command" default="\blank"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command" default="\blank"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command" default="\blank"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/> <!-- default=yes -->
-        </cd:parameter>
-        <cd:parameter name="indenting">
-          <cd:resolve name="indenting"/> <!-- default=never -->
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="display">
-          <cd:constant type="yes" default="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupenumerations" file="core-des.tex">
-    <cd:sequence>
-      <cd:string value="setupenumerations"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupdescriptions" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineenumeration" file="core-des.tex">
-    <cd:sequence>
-      <cd:string value="defineenumeration"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupenumerations" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="enumeration" generated="yes" file="core-des.tex">
-    <cd:sequence>
-      <cd:variable value="enumeration"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:nothing n="1" interactive="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="enumeration" type="environment" generated="yes" file="core-des.tex">
-    <cd:sequence>
-      <cd:variable value="enumeration"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="definedescription" file="core-des.tex">
-    <cd:sequence>
-      <cd:string value="definedescription"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupdescriptions" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="description" generated="yes" file="core-des.tex">
-    <cd:sequence>
-      <cd:variable value="description"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:nothing n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="description" type="environment" generated="yes" file="core-des.tex">
-    <cd:sequence>
-      <cd:variable value="description"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupindentedtext" file="strc-des.tex">
-    <cd:sequence>
-      <cd:string value="setupindentedtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="sample">
-          <cd:constant type="cd:text"/>
-        </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="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineindentedtext" file="strc-des.tex">
-    <cd:sequence>
-      <cd:string value="defineindentedtext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupindentedtext" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="indentation" generated="yes" file="core-spa.tex">
-    <cd:sequence>
-      <cd:variable value="indentation"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:nothing n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definelabel" file="core-des.tex">
-    <cd:sequence>
-      <cd:string value="definelabel"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="text">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="inmargin"/>
-          <cd:constant type="intext"/>
-        </cd:parameter>
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="blockway">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="headcolor">
-          <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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="labeling" generated="yes" file="core-des.tex">
-    <cd:sequence>
-      <cd:variable value="labeling"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcolumns" file="page-mul.tex">
-    <cd:sequence>
-      <cd:string value="setupcolumns"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes"> <!-- no idea why it is optional -->
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ntop">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="rule">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/> <!-- default and unknown missing -->
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="tolerance">
-          <cd:constant type="verystrict"/>
-          <cd:constant type="strict"/>
-          <cd:constant type="tolerant"/>
-          <cd:constant type="verytolerant"/>
-          <cd:constant type="stretch"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="balance">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:constant type="text"/>
-          <!-- cd:constant type="yes"/ -->
-          <!-- cd:constant type="no"/ -->
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="blank">
-          <cd:constant type="fixed"/>
-          <cd:constant type="halfline"/>
-          <cd:constant type="line"/>
-          <cd:constant type="flexible"/>
-          <cd:constant type="big"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="small"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="background"/>
-        </cd:parameter>
-        <cd:parameter name="direction">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="columns" type="environment" file="page-mul.tex">
-    <cd:sequence>
-      <cd:string value="columns"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupcolumns" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definetext" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="definetext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="header"/>
-        <cd:constant type="footer"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="4" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="5" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupheader" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupheader"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text" default="yes"/>
-        <cd:constant type="margin"/>
-        <cd:constant type="edge"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="normal"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="high"/>
-          <cd:constant type="none"/>
-          <cd:constant type="nomarking"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="strut">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="leftstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="rightstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="leftwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightwidth">
-          <cd:constant type="cd:dimension"/>
-        </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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfooter" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupfooter"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:inherit name="setupheader" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupheader" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptext" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setuptext"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:inherit name="setupheader" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupheader" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptop" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setuptop"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:inherit name="setupheader" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupheader" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbottom" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupbottom"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:inherit name="setupheader" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupheader" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="noheaderandfooterlines" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="noheaderandfooterlines"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="notopandbottomlines" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="notopandbottomlines"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupheadertexts" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupheadertexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfootertexts" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupfootertexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptexttexts" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setuptexttexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptoptexts" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setuptoptexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbottomtexts" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="setupbottomtexts"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="settextcontent" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="settextcontent"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:resolve name="layout-v"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="4" optional="yes">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-      <cd:keywords n="5" optional="yes">
-        <cd:resolve name="texts"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="resettextcontent" file="page-txt.tex">
-    <cd:sequence>
-      <cd:string value="resettextcontent"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:resolve name="layout-v"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:resolve name="layout-h"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:constant type="lefttext"/>
-        <cd:constant type="middletext"/>
-        <cd:constant type="righttext"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definemarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="definemarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="couplemarking" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="couplemarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="decouplemarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="decouplemarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="resetmarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="resetmarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupmarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="setupmarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="marking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="marking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="getmarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="getmarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="first"/>
-        <cd:constant type="last"/>
-        <cd:constant type="previous"/>
-        <cd:constant type="both"/>
-        <cd:constant type="all"/>
-        <cd:constant type="current"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nomarking" file="core-mar.tex">
-    <cd:sequence>
-      <cd:string value="nomarking"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplayout" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="setuplayout"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="middle"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="middle"/>
-        </cd:parameter>
-        <cd:parameter name="backspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="header">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="footer">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="top">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bottom">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="leftedge">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightedge">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="headerdistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="footerdistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topdistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bottomdistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="leftedgedistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightedgedistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="horoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="veroffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="marking">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-          <cd:constant type="color"/>
-          <cd:constant type="screen"/>
-          <cd:constant type="cd:text"/>
-          <cd:constant type="page"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="right"/>
-          <cd:constant type="bottom"/>
-          <cd:constant type="top"/>
-          <cd:constant type="singlesided"/>
-          <cd:constant type="doublesided"/>
-        </cd:parameter>
-        <cd:parameter name="scale">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="nx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ny">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="dx">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="dy">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="lines">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="columns">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="columndistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="grid">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="bottomspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="cutspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="textdistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="textwidth">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="textmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="clipoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="paper">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="adaptlayout" file="page-lay.tex">
-    <cd:sequence>
-      <cd:string value="adaptlayout"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="lines">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showgrid" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="showgrid"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="reset"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="none"/>
-        <cd:constant type="all"/>
-        <cd:constant type="lines"/>
-        <cd:constant type="frame"/>
-        <cd:constant type="nonumber"/>
-        <cd:constant type="right"/>
-        <cd:constant type="left"/>
-        <cd:constant type="outer"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placeongrid" file="core-grd.tex">
-    <cd:sequence>
-      <cd:string value="placeongrid"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:inherit name="moveongrid" n="1"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="moveongrid" file="core-grd.tex">
-    <cd:sequence>
-      <cd:string value="moveongrid"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="standard" default="yes"/> <!-- also 'normal', 'yes' and 'force' -->
-        <cd:constant type="top"/>
-        <cd:constant type="both"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="-top"/>
-        <cd:constant type="-both"/>
-        <cd:constant type="-bottom"/>
-        <cd:constant type="cd:text"/>
-        <cd:constant type="high"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="low"/>
-        <cd:constant type="page"/>
-        <cd:constant type="broad"/>
-        <cd:constant type="fit"/>
-        <cd:constant type="depth"/>
-        <cd:constant type="line"/>
-        <cd:constant type="reset"/>
-        <cd:constant type="none"/>
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="project" type="environment" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="project"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:file n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="environment" type="environment" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="environment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:file n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="product" type="environment" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="product"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:file n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="component" type="environment" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="component"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:file n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nomorefiles" file="core-job.tex">
-    <cd:sequence>
-      <cd:string value="nomorefiles"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupinterlinespace" variant="1" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setupinterlinespace"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="reset"/>
-        <cd:constant type="small" default="yes"/>
-        <cd:constant type="medium"/>
-        <cd:constant type="auto"/>
-        <cd:constant type="big"/>
-        <cd:constant type="on"/>
-        <cd:constant type="off"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinterlinespace2" variant="2" file="core-spa.tex">
-     <!-- attached a 2 to make this definition usable with \showsetup -->
-    <cd:sequence>
-      <cd:string value="setupinterlinespace"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="height">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="line">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="top">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="bottom">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppagenumbering" file="page-num.tex">
-    <cd:sequence>
-      <cd:string value="setuppagenumbering"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="singlesided"/>
-          <cd:constant type="doublesided"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="header"/>
-          <cd:constant type="footer"/>
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="margin"/>
-          <cd:constant type="marginedge"/>
-          <cd:constant type="inleft"/>
-          <cd:constant type="inright"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="numberseparator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="textseparator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="cd:sectionnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="strut">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="last"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupnarrower" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setupnarrower"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="left">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="middle">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="define" file="syst-ext.tex">
-    <cd:sequence>
-      <cd:string value="define"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-      <cd:csname n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usecommands" file="core-sys.tex">
-    <cd:sequence>
-      <cd:string value="usecommands"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definestartstop" file="core-sys.tex">
-    <cd:sequence>
-      <cd:string value="definestartstop"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="commands">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupheads" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="setupheads"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="sectionnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="cd:number"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="normal"/>
-          <cd:constant type="margin"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="cd:text"/>
-          <cd:constant type="paragraph"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="stopper">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="aligntitle">
-          <cd:constant type="yes"/>
-          <cd:constant type="float"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="tolerance">
-          <cd:constant type="verystrict"/>
-          <cd:constant type="strict"/>
-          <cd:constant type="tolerant"/>
-          <cd:constant type="verytolerant"/>
-          <cd:constant type="stretch"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:twoarguments"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcaptions" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="setupcaptions"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="top"/>
-          <cd:constant type="bottom"/>
-          <cd:constant type="none"/>
-          <cd:constant type="high"/>
-          <cd:constant type="low"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="right"/>
-          <cd:constant type="lefthanging"/>
-          <cd:constant type="righthanging"/>
-          <cd:constant type="leftmargin"/>
-          <cd:constant type="rightmargin"/>
-          <cd:constant type="innermargin"/>
-          <cd:constant type="outermargin"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="max"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="minwidth">
-          <cd:constant type="fit"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="number">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-        </cd:parameter>
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="stopper">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcaption" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="setupcaption"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupcaptions" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfloats" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="setupfloats"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="middle"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="fit"/>
-          <cd:constant type="cd:dimension"/>
-        </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="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="spacebefore">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="spaceafter">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="sidespacebefore">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="sidespaceafter">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/>
-        </cd:parameter>
-        <cd:parameter name="ntop">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="nbottom">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="nlines">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="default">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="tolerance">
-          <cd:constant type="0"/>
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="sidealign">
-          <cd:constant type="normal"/>
-          <cd:constant type="line"/>
-        </cd:parameter>
-        <cd:parameter name="numbering">
-          <cd:constant type="yes"/>
-          <cd:constant type="nocheck"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfloatsplitting" file="core-tsp.tex">
-    <cd:sequence>
-      <cd:string value="setupfloatsplitting"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-        </cd:parameter>
-        <cd:parameter name="lines">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="splitfloat" file="core-tsp.tex">
-    <cd:sequence>
-      <cd:string value="splitfloat"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupfloatsplitting" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupoppositeplacing" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="setupoppositeplacing"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="opposite" type="environment" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="opposite"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setuphyphenmark" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setuphyphenmark"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1">
-        <cd:parameter name="sign">
-          <cd:constant type="--"/>
-          <cd:constant type="---"/>
-          <cd:constant type="-"/>
-          <cd:constant type="~"/>
-          <cd:constant type="("/>
-          <cd:constant type=")"/>
-          <cd:constant type="="/>
-          <cd:constant type="/"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppositioning" file="page-lyr.tex">
-    <cd:sequence>
-      <cd:string value="setuppositioning"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="overlay"/>
-        </cd:parameter>
-        <cd:parameter name="unit">
-          <cd:constant type="cm"/>
-          <cd:constant type="pt"/>
-          <cd:constant type="em"/>
-          <cd:constant type="mm"/>
-          <cd:constant type="ex"/>
-          <cd:constant type="es"/>
-          <cd:constant type="in"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="scale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="offset">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="xstep">
-          <cd:constant type="absolute"/>
-          <cd:constant type="relative"/>
-        </cd:parameter>
-        <cd:parameter name="ystep">
-          <cd:constant type="absolute"/>
-          <cd:constant type="relative"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="positioning" type="environment" file="page-lyr.tex">
-    <cd:sequence>
-      <cd:string value="positioning"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="grid" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="grid"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="x">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="y">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="nx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ny">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="dx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="dy">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="xstep">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ystep">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="offset">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="scale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="unit">
-          <cd:constant type="cm"/>
-          <cd:constant type="pt"/>
-          <cd:constant type="em"/>
-          <cd:constant type="mm"/>
-          <cd:constant type="ex"/>
-          <cd:constant type="es"/>
-          <cd:constant type="in"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="page" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="page"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="yes" default="yes"/>
-        <cd:constant type="makeup"/>
-        <cd:constant type="no"/>
-        <cd:constant type="preference"/>
-        <cd:constant type="bigpreference"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="disable"/>
-        <cd:constant type="last"/>
-        <cd:constant type="quadruple"/>
-        <cd:constant type="even"/>
-        <cd:constant type="odd"/>
-        <cd:constant type="blank"/>
-        <cd:constant type="empty"/>
-        <cd:constant type="reset"/>
-        <cd:constant type="start"/>
-        <cd:constant type="stop"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupreferencing" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="setupreferencing"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="cd:sectionnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="+"/>
-          <cd:constant type="-"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="label"/>
-          <cd:constant type="cd:text"/>
-          <cd:constant type="all"/>
-          <cd:constant type="symbol"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <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="convertfile">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="small"/>
-          <cd:constant type="big"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="autofile">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="page"/>
-        </cd:parameter>
-        <cd:parameter name="global">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="export">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupurl" file="core-ref.tex" category="references">
-    <cd:sequence>
-      <cd:string value="setupurl"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="urlalternative">
-          <cd:constant type="none"/>
-          <cd:constant type="both"/>
-          <cd:constant type="before"/>
-          <cd:constant type="after"/>
-        </cd:parameter>
-        <cd:parameter name="urlspace">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="writetoreferencelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="writetoreferencelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placereferencelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="placereferencelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definereferencelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="definereferencelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupreferencelist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupreferencelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="setupreferencelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="cd:section"/>
-          <cd:constant type="local"/>
-          <cd:constant type="previous"/>
-          <cd:constant type="all"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="writetolist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="writetolist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:section"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="here"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-      </cd:assignments>
-      <cd:content n="3"/>
-      <cd:content n="4"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="writebetweenlist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="writebetweenlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:section"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="here"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-      </cd:assignments>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nolist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="nolist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="listsymbol" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="listsymbol"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="placelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setuplist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="determinelistcharacteristics" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="determinelistcharacteristics"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setuplist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placecombinedlist" variant="1" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="placecombinedlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupcombinedlist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definelist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="definelist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes"> <!-- inherits from -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setuplist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="setuplist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="c"/>
-          <cd:constant type="..."/>
-          <cd:constant type="none"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-        <cd:parameter name="coupling">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="cd:section"/>
-          <cd:constant type="local"/>
-          <cd:constant type="previous"/>
-          <cd:constant type="current"/>
-          <cd:constant type="here"/>
-          <cd:constant type="intro"/>
-          <cd:constant type="all"/>
-        </cd:parameter>
-        <cd:parameter name="extras">
-          <cd:constant type="cd:list"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="numberstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="textstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="pagestyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:threearguments"/>
-        </cd:parameter>
-        <cd:parameter name="numbercommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="textcommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="pagecommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="sectionnumber"/>
-          <cd:constant type="text"/>
-          <cd:constant type="pagenumber"/>
-          <cd:constant type="all"/>
-          <cd:constant type="none"/>
-        </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="left">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="label">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="pagenumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="headnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="cd:sectionnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="aligntitle">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="stopper">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="none"/>
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-          <cd:constant type="3"/>
-          <cd:constant type="..."/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-        <cd:parameter name="maxwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="order">
-          <cd:constant type="command"/>
-          <cd:constant type="all"/>
-          <cd:constant type="normal"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplistalternative" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="setuplistalternative"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="no">
-        <cd:constant type="a"/>
-        <cd:constant type="b"/>
-        <cd:constant type="c"/>
-        <!-- cd:constant type="cd:name"/ -->
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="stretch">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definecombinedlist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="definecombinedlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:list"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupcombinedlist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcombinedlist" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="setupcombinedlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="level">
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-          <cd:constant type="3"/>
-          <cd:constant type="4"/>
-          <cd:constant type="cd:section"/>
-          <cd:constant type="current"/>
-        </cd:parameter>
-        <cd:inherit name="setuplist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placecombinedlist" variant="2" generated="yes" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="place"/>
-      <cd:variable value="combinedlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupcombinedlist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="completecombinedlist" generated="yes" file="core-lst.tex">
-    <cd:sequence>
-      <cd:string value="complete"/>
-      <cd:variable value="combinedlist"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupcombinedlist" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupnumbering" file="core-num.tex">
-    <cd:sequence>
-      <cd:string value="setupnumbering"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupformulas" file="core-mat.tex">
-    <cd:sequence>
-      <cd:string value="setupformulas"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="middle"/>
-        </cd:parameter>
-        <cd:parameter name="strut">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:constant type="flushleft"/>
-          <cd:constant type="flushright"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="center"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="spacebefore">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="publication" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="publication"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppublications" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setuppublications"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="apa"/>
-          <cd:constant type="normal"/>
-        </cd:parameter>
-        <cd:inherit name="setupenumerations" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplines" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="setuplines"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="indenting">
-          <cd:resolve name="indenting"/>
-        </cd:parameter>
-        <cd:parameter name="space">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="packed"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="lines" type="environment">
-    <cd:sequence>
-      <cd:string value="lines"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupparagraphnumbering" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="setupparagraphnumbering"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="reset"/>
-          <cd:constant type="line"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplinenumbering" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="setuplinenumbering"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-          <cd:constant type="cd:text"/>
-        </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="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="middle"/>
-          <cd:constant type="left"/>
-          <cd:constant type="margin"/>
-          <cd:constant type="inmargin"/>
-          <cd:constant type="inleft"/>
-          <cd:constant type="right"/>
-          <cd:constant type="inright"/>
-          <cd:constant type="inner"/>
-          <cd:constant type="outer"/>
-          <cd:constant type="text"/>
-          <cd:constant type="begin"/>
-          <cd:constant type="end"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="referencing">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="linenumbering" type="environment" file="page-lin.tex"> <!-- mkii/mkiv -->
-    <cd:sequence>
-      <cd:string value="linenumbering"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="continue"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="line" type="environment">
-    <cd:sequence>
-      <cd:string value="line"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="someline" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="someline"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="inline" file="page-lin.tex">
-    <cd:sequence>
-      <cd:string value="inline"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinmargin" file="page-mar.tex">
-    <cd:sequence>
-      <cd:string value="setupinmargin"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="both"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </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="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="line">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="separator">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="stack">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppagenumber" file="page-num.tex">
-    <cd:sequence>
-      <cd:string value="setuppagenumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="number">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="keep"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsubpagenumber" file="page-num.tex">
-    <cd:sequence>
-      <cd:string value="setupsubpagenumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="way">
-          <cd:constant type="bytext"/>
-          <cd:constant type="bycd:section"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupblank" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setupblank"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="normal" default="yes"/>
-        <cd:constant type="default"/>
-        <cd:constant type="standard"/>
-        <cd:constant type="line"/>
-        <cd:constant type="halfline"/>
-        <cd:constant type="cd:dimension"/>
-        <cd:constant type="big"/>
-        <cd:constant type="medium"/>
-        <cd:constant type="small"/>
-        <cd:constant type="fixed"/>
-        <cd:constant type="flexible"/>
-        <cd:constant type="global"/>
-        <cd:constant type="unknown"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineblank" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="defineblank"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:inherit name="setupblank" n="1"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definepapersize" file="page-lay.tex">
-    <cd:sequence>
-      <cd:string value="definepapersize"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="offset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="scale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppaper" file="page-lay.tex">
-    <cd:sequence>
-      <cd:string value="setuppaper"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="paper">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="nx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ny">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="backspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="max"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="method">
-          <cd:constant type="normal"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuppapersize" file="page-lay.tex">
-    <cd:sequence>
-      <cd:string value="setuppapersize"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="A3"/>
-        <cd:constant type="A4" default="yes"/>
-        <cd:constant type="A5"/>
-        <cd:constant type="A6"/>
-        <cd:constant type="letter"/>
-        <cd:constant type="..."/>
-        <cd:constant type="CD"/>
-        <cd:constant type="cd:name"/>
-        <cd:constant type="landscape"/>
-        <cd:constant type="mirrored"/>
-        <cd:constant type="rotated"/>
-        <cd:constant type="90"/>
-        <cd:constant type="180"/>
-        <cd:constant type="270"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="negative"/>
-        <cd:inherit name="setuppapersize" n="1"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuparranging" file="page-imp.tex">
-    <cd:sequence>
-      <cd:string value="setuparranging"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="disable"/>
-        <cd:constant type="2*16"/>
-        <cd:constant type="2*8"/>
-        <cd:constant type="2*4"/>
-        <cd:constant type="2*2"/>
-        <cd:constant type="2**2"/>
-        <cd:constant type="2*2*4"/>
-        <cd:constant type="2*4*2"/>
-        <cd:constant type="2UP"/>
-        <cd:constant type="2DOWN"/>
-        <cd:constant type="2SIDE"/>
-        <cd:constant type="2TOP"/>
-        <cd:constant type="mirrored"/>
-        <cd:constant type="rotated"/>
-        <cd:constant type="doublesided"/>
-        <cd:constant type="negative"/>
-        <cd:constant type="background"/>
-        <cd:constant type="90"/>
-        <cd:constant type="180"/>
-        <cd:constant type="270"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showprint" file="page-run.tex"> <!-- page-lay.tex -->
-    <cd:sequence>
-      <cd:string value="showprint"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:inherit name="setuppapersize" n="1"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:inherit name="setuppapersize" n="2"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:inherit name="setuplayout" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definelogo" file="page-log.tex">
-    <cd:sequence>
-      <cd:string value="definelogo"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="top"/>
-        <cd:constant type="header"/>
-        <cd:constant type="footer"/>
-        <cd:constant type="bottom"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="none"/>
-        <cd:constant type="page"/>
-        <cd:constant type="leftedge"/>
-        <cd:constant type="leftmargin"/>
-        <cd:constant type="left"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="right"/>
-        <cd:constant type="rightmargin"/>
-        <cd:constant type="rightedge"/>
-      </cd:keywords>
-      <cd:assignments n="4" list="yes">
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placelogos" file="page-log.tex">
-    <cd:sequence>
-      <cd:string value="placelogos"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupwhitespace">
-    <cd:sequence>
-      <cd:string value="setupwhitespace"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="none" default="yes"/>
-        <cd:constant type="small"/>
-        <cd:constant type="medium"/>
-        <cd:constant type="big"/>
-        <cd:constant type="line"/>
-        <cd:constant type="fixed"/>
-        <cd:constant type="fix"/>
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupindenting">
-    <cd:sequence>
-      <cd:string value="setupindenting"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:resolve name="indenting"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definesectionblock" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="definesectionblock"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:inherit name="setupsectionblock" n="1"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupsectionblock" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsectionblock" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="setupsectionblock"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="number">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="yes"/>
-          <cd:constant type="right"/>
-        </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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definesection" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="definesection"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsection" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="setupsection"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="conversion">
-          <cd:constant type="numbers"/>
-          <cd:constant type="characters"/>
-          <cd:constant type="Characters"/>
-          <cd:constant type="romannumerals"/>
-          <cd:constant type="Romannumerals"/>
-        </cd:parameter>
-        <cd:parameter name="previousnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuphead" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="setuphead"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:section"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="textstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="numberstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="textcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="numbercolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="number">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="ownnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-        <cd:parameter name="continue">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="header">
-          <cd:constant type="none"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="high"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="none"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="high"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="footer">
-          <cd:constant type="none"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="high"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <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="normal"/>
-          <cd:constant type="inmargin"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="hang">
-          <cd:constant type="none"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="line"/>
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:twoarguments"/>
-        </cd:parameter>
-        <cd:parameter name="numbercommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="textcommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="deepnumbercommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="deeptextcommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="+"/>
-          <cd:constant type="-"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="placehead">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="empty"/>
-        </cd:parameter>
-        <cd:parameter name="incrementnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="cd:list"/>
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="resetnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="file">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-        <cd:parameter name="margintext">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="list"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:inherit name="setupheads" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupheadnumber" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="setupheadnumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:section"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:number"/>
-        <cd:constant type="+cd:number"/>
-        <cd:constant type="-cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="headnumber">
-    <cd:sequence>
-      <cd:string value="headnumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:section"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="determineheadnumber" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="determineheadnumber"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:section"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="currentheadnumber" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="currentheadnumber"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="nextsection" generated="yes" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="next"/>
-      <cd:variable value="section"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="definehead" file="core-sec.tex">
-    <cd:sequence>
-      <cd:string value="definehead"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:section"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <!--
-
-  <cd:feature name="itemgroups" file="strc-itm">
-
-    <cd:description language="en"> </cd:description>
-
-  -->
-
-  <cd:command name="defineitemgroup" file="strc-itm">
-    <cd:sequence>
-      <cd:string value="defineitemgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupitemgroup" file="strc-itm">
-    <!-- we mis a few experimental keys here, like alignsymbol and indentation -->
-    <cd:sequence>
-      <cd:string value="setupitemgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:number"/>
-        <cd:constant type="each"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes" list="yes">
-        <cd:constant type="standard" default="yes"/>
-        <cd:constant type="broad"/>
-        <cd:constant type="serried"/>
-        <cd:constant type="packed"/>
-        <cd:constant type="unpacked"/>
-        <cd:constant type="nowhite"/>
-        <cd:constant type="before"/>
-        <cd:constant type="after"/>
-        <cd:constant type="stopper"/>
-        <cd:constant type="joinedup"/>
-        <cd:constant type="atmargin"/>
-        <cd:constant type="inmargin"/>
-        <cd:constant type="autointro"/>
-        <cd:constant type="loose"/>
-        <cd:constant type="repeat"/>
-        <cd:constant type="cd:section"/>
-        <cd:constant type="paragraph"/>
-        <cd:constant type="intext"/>
-        <cd:constant type="random"/>
-        <cd:constant type="reverse"/>
-      </cd:keywords>
-      <cd:assignments n="4" optional="yes" list="yes">
-        <cd:parameter name="margin">
-          <cd:constant type="no"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargin">
-          <cd:constant type="no"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargin">
-          <cd:constant type="no"/>
-          <cd:constant type="standard"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="step">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="items">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="start">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="beforehead">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="afterhead">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="marstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="symstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="stopper">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="symalign">
-          <cd:resolve name="symalign"/>
-        </cd:parameter>
-        <cd:parameter name="indentnext">
-          <cd:resolve name="indentnext"/>
-        </cd:parameter>
-        <cd:parameter name="textdistance">
-          <!-- maybe resolve here too -->
-          <cd:constant type="none"/>
-          <cd:constant type="big"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="small"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="itemgroup" type="environment" generated="yes" file="strc-itm">
-    <cd:sequence>
-      <cd:variable value="itemgroup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="a"/>
-        <cd:constant type="A"/>
-        <cd:constant type="KA"/>
-        <cd:constant type="n"/>
-        <cd:constant type="N"/>
-        <cd:constant type="m"/>
-        <cd:constant type="r"/>
-        <cd:constant type="R"/>
-        <cd:constant type="KR"/>
-        <cd:constant type="cd:number"/>
-        <cd:constant type="continue"/>
-        <cd:constant type="standard" default="yes"/>
-        <cd:constant type="broad"/>
-        <cd:constant type="serried"/>
-        <cd:constant type="packed"/>
-        <cd:constant type="stopper"/>
-        <cd:constant type="joinedup"/>
-        <cd:constant type="atmargin"/>
-        <cd:constant type="inmargin"/>
-        <cd:constant type="intro"/>
-        <cd:constant type="columns"/>
-        <cd:constant type="text"/>
-        <cd:constant type="paragraph"/>
-        <cd:constant type="repeat"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupitemgroup" n="4"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="item" environment="yes" shortcut="yes" file="strc-itm">
-    <cd:sequence>
-      <cd:string value="item"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <!--
-    <cd:command name="item" file="core-itm.tex">
-      <cd:sequence>
-        <cd:string value="item"/>
-      </cd:sequence>
-      <cd:arguments>
-        <cd:reference n="1" optional="yes" list="yes"/>
-      </cd:arguments>
-    </cd:command>
-  -->
-
-  <cd:command name="but">
-    <cd:sequence>
-      <cd:string value="but"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" interactive="exclusive"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="its">
-    <cd:sequence>
-      <cd:string value="its"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="ran">
-    <cd:sequence>
-      <cd:string value="ran"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="head">
-    <cd:sequence>
-      <cd:string value="head"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="mar">
-    <cd:sequence>
-      <cd:string value="mar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="sub">
-    <cd:sequence>
-      <cd:string value="sub"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="sym" file="core-itm.tex">
-    <cd:sequence>
-      <cd:string value="sym"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nop">
-    <cd:sequence>
-      <cd:string value="nop"/>
-    </cd:sequence>
-  </cd:command>
-
-  <!-- </cd:feature> -->
-
-  <cd:command name="defineregister" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="defineregister"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:plural"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupregister" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="setupregister"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="balance">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="pagestyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="textstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="indicator">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="coupling">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="cd:sectionnumber">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="cd:section"/>
-          <cd:constant type="local"/>
-          <cd:constant type="all"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-          <cd:constant type="..."/>
-          <cd:constant type="n"/>
-          <cd:constant type="a"/>
-          <cd:constant type="..."/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="pagenumber"/>
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-        <cd:parameter name="referencing">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:parameter name="maxwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="unknownreference">
-          <cd:constant type="empty"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="A"/>
-          <cd:constant type="B"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="both"/>
-          <cd:constant type="first"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="compress">
-          <cd:constant type="no"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-        <cd:parameter name="deeptextcommand">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="register" generated="yes" file="core-reg.tex">
-    <cd:sequence>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:index n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="startregister" generated="yes" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="start"/>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:index n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="writetoregister" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="writetoregister"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:index n="3" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="coupledregister" generated="yes">
-    <cd:sequence>
-      <cd:string value="coupled"/>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:index n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="coupleregister" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="coupleregister"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placeregister" variant="1" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="placeregister"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupregister" n="3"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="seeregister" generated="yes">
-    <cd:sequence>
-      <cd:string value="see"/>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-      <cd:index n="3" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="completeregister" generated="yes" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="complete"/>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="yes" optional="yes" list="yes">
-        <cd:inherit name="setupregister" n="3"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placeregister" variant="2" generated="yes" file="core-reg.tex">
-    <cd:sequence>
-      <cd:string value="place"/>
-      <cd:variable value="register"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="yes" optional="yes" list="yes">
-        <cd:inherit name="setupregister" n="3"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definesynonyms" file="core-syn.tex">
-    <cd:sequence>
-      <cd:string value="definesynonyms"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:plural"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:command"/>
-      </cd:keywords>
-      <cd:keywords n="4" optional="yes">
-        <cd:constant type="cd:command"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsynonyms" file="core-syn.tex">
-    <cd:sequence>
-      <cd:string value="setupsynonyms"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="textstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="synonymstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="top"/>
-          <cd:constant type="serried"/>
-          <cd:constant type="inmargin"/>
-          <cd:constant type="inleft"/>
-          <cd:constant type="inright"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="all"/>
-          <cd:constant type="used"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:threearguments"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="synonym" generated="yes">
-    <cd:sequence>
-      <cd:variable value="synonym"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="completelistofsynonyms" generated="yes">
-    <cd:sequence>
-      <cd:string value="completelistof"/>
-      <cd:variable value="synonyms"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="placelistofsynonyms" generated="yes">
-    <cd:sequence>
-      <cd:string value="placelistof"/>
-      <cd:variable value="synonyms"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="loadsynonyms" generated="yes">
-    <cd:sequence>
-      <cd:string value="load"/>
-      <cd:variable value="synonyms"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="definesorting" file="core-syn.tex">
-    <cd:sequence>
-      <cd:string value="definesorting"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:plural"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:constant type="cd:command"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsorting" file="core-syn.tex">
-    <cd:sequence>
-      <cd:string value="setupsorting"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:oneargument"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="criterium">
-          <cd:constant type="all"/>
-          <cd:constant type="used"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="expansion">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="sort" generated="yes">
-    <cd:sequence>
-      <cd:variable value="sort"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="completelistofsorts" generated="yes">
-    <cd:sequence>
-      <cd:string value="completelistof"/>
-      <cd:variable value="sorts"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="placelistofsorts" generated="yes">
-    <cd:sequence>
-      <cd:string value="placelistof"/>
-      <cd:variable value="sorts"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="loadsorts" generated="yes">
-    <cd:sequence>
-      <cd:string value="load"/>
-      <cd:variable value="sorts"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="definemakeup" file="page-mak.tex">
-    <cd:sequence>
-      <cd:string value="definemakeup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:inherit name="setupmakeup" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="makeup" type="environment">
-    <cd:sequence>
-      <cd:string value="makeup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupmakeup" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupmakeup" file="page-mak.tex">
-    <cd:sequence>
-      <cd:string value="setupmakeup"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="left"/>
-          <cd:constant type="yes"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:parameter name="commands">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="doublesided">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <cd:constant type="empty"/>
-        </cd:parameter>
-        <cd:parameter name="headerstate">
-          <cd:constant type="normal"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="none"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="footerstate">
-          <cd:constant type="normal"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="none"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="textstate">
-          <cd:constant type="normal"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="none"/>
-          <cd:constant type="nomarking"/>
-        </cd:parameter>
-        <cd:parameter name="topstate">
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-        </cd:parameter>
-        <cd:parameter name="bottomstate">
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-        </cd:parameter>
-        <cd:parameter name="pagestate">
-          <cd:constant type="stop"/>
-          <cd:constant type="start"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="namemakeup" type="environment" generated="yes">
-    <cd:sequence>
-      <cd:variable value="name"/>
-      <cd:string value="makeup"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="version">
-    <cd:sequence>
-      <cd:string value="version"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="final" default="yes"/>
-        <cd:constant type="concept"/>
-        <cd:constant type="temporary"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="currentdate">
-    <cd:sequence>
-      <cd:string value="currentdate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:inherit name="date" n="2"/> <!-- or vice versa :) -->
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="date" file="core-con.tex">
-    <cd:sequence>
-      <cd:string value="date"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes"> <!-- if not given, current date is used -->
-        <cd:parameter name="d">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="m">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="y">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="day"/>
-        <cd:constant type="month"/>
-        <cd:constant type="year"/>
-        <cd:constant type="weekday"/>
-        <cd:constant type="d"/>
-        <cd:constant type="m"/>
-        <cd:constant type="y"/> <!-- also j -->
-        <cd:constant type="w"/>
-        <cd:constant type="dd"/>
-        <cd:constant type="mm"/>
-        <cd:constant type="yy"/> <!-- also jj -->
-        <cd:constant type="space"/>
-        <cd:constant type="--"/>
-        <cd:constant type="day+"/>
-        <cd:constant type="d+"/>
-        <cd:constant type="dd+"/>
-        <cd:constant type="referral"/>
-        <cd:constant type="cd:text"/> <!-- any other text -->
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="referraldate" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="referraldate"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="indenting" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="indenting"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:resolve name="indenting"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="noindenting" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="noindenting"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="blank" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="blank"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="small"/>
-        <cd:constant type="medium"/>
-        <cd:constant type="big" default="yes"/>
-        <cd:constant type="nowhite"/>
-        <cd:constant type="back"/>
-        <cd:constant type="white"/>
-        <cd:constant type="disable"/>
-        <cd:constant type="force"/>
-        <cd:constant type="reset"/>
-        <cd:constant type="line"/>
-        <cd:constant type="halfline"/>
-        <cd:constant type="cd:formula"/>
-        <cd:constant type="fixed"/>
-        <cd:constant type="flexible"/>
-        <cd:constant type="none"/>
-        <cd:constant type="always"/>
-        <cd:constant type="outer"/>
-        <cd:constant type="joinedup"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="packed" type="environment" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="packed"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="blank"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="unpacked" type="environment">
-    <cd:sequence>
-      <cd:string value="unpacked"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="linecorrection" type="environment">
-    <cd:sequence>
-      <cd:string value="linecorrection"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="correctwhitespace" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="correctwhitespace"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="postponing" type="environment">
-    <cd:sequence>
-      <cd:string value="postponing"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="local" type="environment">
-    <cd:sequence>
-      <cd:string value="local"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="narrower" type="environment">
-    <cd:sequence>
-      <cd:string value="narrower"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="middle" default="yes"/>
-        <cd:constant type="right"/>
-        <cd:constant type="-left"/>
-        <cd:constant type="-middle"/>
-        <cd:constant type="-right"/>
-        <cd:constant type="-none"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="hiding" type="environment">
-    <cd:sequence>
-      <cd:string value="hiding"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupalign" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setupalign"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="width"/>
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="inner"/>
-        <cd:constant type="outer"/>
-        <cd:constant type="wide"/>
-        <cd:constant type="broad"/>
-        <cd:constant type="height"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="line"/>
-        <cd:constant type="reset"/>
-        <cd:constant type="hanging"/>
-        <cd:constant type="nothanging"/>
-        <cd:constant type="hyphenated"/>
-        <cd:constant type="nothyphenated"/>
-        <cd:constant type="lesshyphenation"/>
-        <cd:constant type="morehyphenation"/>
-        <cd:constant type="new"/>
-        <cd:constant type="old"/>
-        <cd:constant type="normal"/>
-        <cd:constant type="yes"/>
-        <cd:constant type="no"/>
-        <cd:constant type="flushleft"/>
-        <cd:constant type="flushright"/>
-        <cd:constant type="flushouter"/>
-        <cd:constant type="flushinner"/>
-        <cd:constant type="center"/>
-        <cd:constant type="hz"/>
-        <cd:constant type="nohz"/>
-        <cd:constant type="spacing"/>
-        <cd:constant type="nospacing"/>
-        <cd:constant type="tolerant"/>
-        <cd:constant type="verytolerant"/>
-        <cd:constant type="stretch"/>
-        <cd:constant type="extremestretch"/>
-        <cd:constant type="lefttoright"/>
-        <cd:constant type="righttoleft"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-
-  <cd:command name="alignment" type="environment" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="alignment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:inherit name="setupalign" n="1"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupspacing">
-    <cd:sequence>
-      <cd:string value="setupspacing"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="broad"/>
-        <cd:constant type="packed"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptolerance" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setuptolerance"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="horizontal"/>
-        <cd:constant type="vertical"/>
-        <cd:constant type="stretch"/>
-        <cd:constant type="space"/>
-        <cd:constant type="verystrict" default="yes"/>
-        <cd:constant type="strict"/>
-        <cd:constant type="tolerant"/>
-        <cd:constant type="verytolerant"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- cd:command name="pagetype" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="pagetype"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command -->
-
-  <cd:command name="processpage" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="processpage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="yes" default="yes"/>
-        <cd:constant type="no"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="couplepage" file="page-ini.tex">
-    <cd:sequence>
-      <cd:string value="couplepage"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="option">
-          <cd:constant type="doublesided"/>
-        </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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="position" file="page-lyr.tex">
-    <cd:sequence>
-      <cd:string value="position"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:position n="1" list="yes"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupscreens" file="core-rul.tex">
-    <cd:sequence>
-      <cd:string value="setupscreens"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="method">
-          <cd:constant type="dot"/>
-          <cd:constant type="rule"/>
-          <cd:constant type="external"/>
-        </cd:parameter>
-        <cd:parameter name="resolution">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="screen">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbackgrounds" file="page-bck.tex">
-    <cd:sequence>
-      <cd:string value="setupbackgrounds"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="top"/>
-        <cd:constant type="header"/>
-        <cd:constant type="cd:text"/>
-        <cd:constant type="footer"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="page"/>
-        <cd:constant type="paper"/>
-        <cd:constant type="leftpage"/>
-        <cd:constant type="rightpage"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="leftedge"/>
-        <cd:constant type="leftmargin"/>
-        <cd:constant type="cd:text"/>
-        <cd:constant type="rightmargin"/>
-        <cd:constant type="rightedge"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="cd:repeat"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="buffer" type="environment" generated="yes" file="core-buf.tex">
-    <cd:sequence>
-      <cd:variable value="buffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="buffer" type="environment" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="buffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="getbuffer">
-    <cd:sequence>
-      <cd:string value="getbuffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="typebuffer" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="typebuffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definebuffer" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="definebuffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbuffer" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="setupbuffer"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="paragraph">
-          <cd:constant type="cd:number"/>
-        </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:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineblock" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="defineblock"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="nomoreblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="nomoreblocks"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="hideblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="hideblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="keepblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="keepblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="all"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="useblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="processblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="processblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="bypassblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="bypassblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="forceblocks">
-    <cd:sequence>
-      <cd:string value="forceblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="selectblocks" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="selectblocks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes">
-        <cd:parameter name="criterium">
-          <cd:constant type="all"/>
-          <cd:constant type="cd:section"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupblock" file="core-buf.tex">
-    <cd:sequence>
-      <cd:string value="setupblock"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inner">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="file">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="formula" type="environment" generated="yes">
-    <cd:sequence>
-      <cd:variable value="formula"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="mathematics" file="supp-mat.tex">
-    <cd:sequence>
-      <cd:string value="mathematics"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placeformula" file="core-mat.tex">
-    <cd:sequence>
-      <cd:string value="placeformula"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2" optional="yes"/>
-      <cd:displaymath n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placesubformula" file="core-mat.tex">
-    <cd:sequence>
-      <cd:string value="placesubformula"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" optional="yes" list="yes"/>
-      <cd:content n="2" optional="yes"/>
-      <cd:displaymath n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placefloat" generated="yes" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="place"/>
-      <cd:variable value="float"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="here" default="yes"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="inleft"/>
-        <cd:constant type="inright"/>
-        <cd:constant type="inmargin"/>
-        <cd:constant type="margin"/>
-        <cd:constant type="leftmargin"/>
-        <cd:constant type="rightmargin"/>
-        <cd:constant type="leftedge"/>
-        <cd:constant type="rightedge"/>
-        <cd:constant type="innermargin"/>
-        <cd:constant type="outermargin"/>
-        <cd:constant type="inneredge"/>
-        <cd:constant type="outeredge"/>
-        <cd:constant type="inner"/>
-        <cd:constant type="outer"/>
-        <cd:constant type="line"/>
-        <cd:constant type="high"/>
-        <cd:constant type="low"/>
-        <cd:constant type="fit"/>
-        <cd:constant type="page"/>
-        <cd:constant type="leftpage"/>
-        <cd:constant type="rightpage"/>
-        <cd:constant type="opposite"/>
-        <cd:constant type="always"/>
-        <cd:constant type="auto"/>
-        <cd:constant type="force"/>
-        <cd:constant type="tall"/>
-        <cd:constant type="reset"/>
-        <cd:constant type="line"/>
-        <cd:constant type="height"/>
-        <cd:constant type="depth"/>
-        <cd:constant type="split"/>
-        <cd:constant type="90"/>
-        <cd:constant type="180"/>
-        <cd:constant type="270"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes" list="yes"/>
-      <cd:content n="3"/>
-      <cd:content n="4"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="reservefloat" generated="yes">
-    <cd:sequence>
-      <cd:string value="reserve"/>
-      <cd:variable value="float"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="frame">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-      </cd:assignments>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:reference n="3" optional="yes" list="yes"/>
-      <cd:content n="4"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefloat" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="definefloat"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:singular"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:plural"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfloat" file="page-flt.tex">
-    <cd:sequence>
-      <cd:string value="setupfloat"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="maxheight">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="maxwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="minwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="default">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="pageboundaries">
-          <cd:constant type="cd:list"/>
-        </cd:parameter>
-        <cd:parameter name="leftmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightmargindistance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="floattext" type="environment" generated="yes">
-    <cd:sequence>
-      <cd:variable value="float"/>
-      <cd:string value="text"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="high"/>
-        <cd:constant type="middle"/>
-        <cd:constant type="low"/>
-        <cd:constant type="offset"/>
-        <cd:constant type="tall"/>
-      </cd:keywords>
-      <cd:reference n="2" optional="yes"/>
-      <cd:content n="3"/>
-      <cd:content n="4"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placelistoffloats" generated="yes">
-    <cd:sequence>
-      <cd:string value="placelistof"/>
-      <cd:variable value="floats"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="completelistoffloats" generated="yes">
-    <cd:sequence>
-      <cd:string value="completelistof"/>
-      <cd:variable value="floats"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="referral" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="referral"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="bet">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="ken">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="dat">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="van">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="aan">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="ref">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="selectpaper">
-    <cd:sequence>
-      <cd:string value="selectpaper"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="family">
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="couplepaper">
-    <cd:sequence>
-      <cd:string value="couplepaper"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="chem" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="chem"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fraction" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="fraction"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="periods" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="periods"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="items">
-    <cd:sequence>
-      <cd:string value="items"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupitems" n="1"/>
-      </cd:assignments>
-      <cd:content n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupitems" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setupitems"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-          <cd:constant type="inmargin"/>
-          <cd:constant type="top"/>
-          <cd:constant type="bottom"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="1"/>
-          <cd:constant type="2"/>
-          <cd:constant type="..."/>
-          <cd:constant type="n"/>
-          <cd:constant type="a"/>
-          <cd:constant type="..."/>
-          <cd:constant type="cd:text"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="unknown"/>
-        </cd:parameter>
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="quotation" type="environment" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="quotation"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="middle" default="yes"/>
-        <cd:constant type="right"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="quotation" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="quotation"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="quote" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="quote"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupquote" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setupquote"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="cd:text"/>
-          <cd:constant type="margin"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineparagraphs" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="defineparagraphs"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="rule">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="fit"/>
-          <cd:constant type="cd:dimension"/>
-        </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="inner">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="tolerance">
-          <cd:constant type="verystrict"/>
-          <cd:constant type="strict"/>
-          <cd:constant type="tolerant"/>
-          <cd:constant type="verytolerant"/>
-          <cd:constant type="stretch"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="paragraph" generated="yes">
-    <cd:sequence>
-      <cd:variable value="paragraph"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="paragraph" type="environment" generated="yes">
-    <cd:sequence>
-      <cd:variable value="paragraph"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupparagraphs" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setupparagraphs"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:number"/>
-        <cd:constant type="each"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="tolerance">
-          <cd:constant type="verystrict"/>
-          <cd:constant type="strict"/>
-          <cd:constant type="tolerant"/>
-          <cd:constant type="verytolerant"/>
-          <cd:constant type="stretch"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </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="inner">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="command">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="rule">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptab" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setuptab"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="sample">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="headstyle">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="tab">
-    <cd:sequence>
-      <cd:string value="tab"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:nothing n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="document" type="environment">
-    <cd:sequence>
-      <cd:string value="document"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="labels">
-    <cd:sequence>
-      <cd:string value="labels"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definetabulate" file="core-tbl.tex">
-    <cd:sequence>
-      <cd:string value="definetabulate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="tabulate" type="environment" generated="yes">
-    <cd:sequence>
-      <cd:variable value="tabulate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupexternalfigures" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptabulate" file="core-tbl.tex">
-    <cd:sequence>
-      <cd:string value="setuptabulate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="unit">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="indenting">
-          <cd:resolve name="indenting"/>
-        </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="inner">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="EQ">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="rulecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="blank"/>
-          <cd:constant type="grid"/>
-          <cd:constant type="depth"/>
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="rule">
-          <cd:constant type="normal"/>
-          <cd:constant type="line"/>
-        </cd:parameter>
-        <cd:parameter name="split">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuptables" file="core-tab.tex">
-    <cd:sequence>
-      <cd:string value="setuptables"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="distance">
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="HL">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="VL">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="strut"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="strut"/>
-        </cd:parameter>
-        <cd:parameter name="rulethickness">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rulecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="commands">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="background">
-          <cd:constant type="screen"/>
-          <cd:constant type="color"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundscreen">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="backgroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="table" type="environment">
-    <cd:sequence>
-      <cd:string value="table"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="tables" type="environment">
-    <cd:sequence>
-      <cd:string value="tables"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definetabletemplate" file="core-tab.tex">
-    <cd:sequence>
-      <cd:string value="definetabletemplate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="4" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useexternalfiles" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="useexternalfiles"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-        <cd:parameter name="file">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useexternalfile" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="useexternalfile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-      <cd:assignments n="4" list="yes">
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useexternalfigure" file="core-fig.tex">
-    <cd:sequence>
-      <cd:string value="useexternalfigure"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes">
-        <cd:constant type="cd:name"/> <!-- parent -->
-      </cd:keywords>
-      <cd:assignments n="4" optional="yes" list="yes">
-        <cd:inherit name="setupexternalfigures" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="externalfigure" file="core-fig.tex">
-    <cd:sequence>
-      <cd:string value="externalfigure"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupexternalfigures" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupexternalfigures" file="core-fig.tex">
-    <cd:sequence>
-      <cd:string value="setupexternalfigures"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1">
-        <cd:parameter name="scale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="yscale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="yscale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="max"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-        </cd:parameter>
-        <cd:parameter name="wfactor">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="max"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="hfactor">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="max"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="frame">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="preset">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="display">
-          <cd:constant type="cd:file"/>
-        </cd:parameter>
-        <cd:parameter name="preview">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="repeat">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="object">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="type">
-          <cd:constant type="eps"/>
-          <cd:constant type="mps"/>
-          <cd:constant type="pdf"/>
-          <cd:constant type="tif"/>
-          <cd:constant type="png"/>
-          <cd:constant type="jpg"/>
-          <cd:constant type="mov"/>
-          <cd:constant type="cd:tex"/>
-        </cd:parameter>
-        <cd:parameter name="method">
-          <cd:constant type="eps"/>
-          <cd:constant type="mps"/>
-          <cd:constant type="pdf"/>
-          <cd:constant type="tif"/>
-          <cd:constant type="png"/>
-          <cd:constant type="jpg"/>
-          <cd:constant type="mov"/>
-          <cd:constant type="cd:tex"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="frame"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="test"/>
-        </cd:parameter>
-        <cd:parameter name="frames">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="ymax">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="xmax">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="directory">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="local"/>
-          <cd:constant type="global"/>
-          <cd:constant type="default"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="maxwidth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="maxheight">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="conversion">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="prefix">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="interaction">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-          <!-- more will follow -->
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showexternalfigures" file="core-fig.tex">
-    <cd:sequence>
-      <cd:string value="showexternalfigures"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="c"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useexternalsoundtrack" file="core-fig.tex">
-    <cd:sequence>
-      <cd:string value="useexternalsoundtrack"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="name" file="syst-gen.tex">
-    <cd:sequence>
-      <cd:string value="name"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="legend" type="environment">
-    <cd:sequence>
-      <cd:string value="legend"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="two"/>
-      </cd:keywords>
-      <cd:tex n="2" command="leg"/>
-      <cd:nothing n="3"/>
-      <cd:nothing n="4" separator="backslash"/>
-      <cd:nothing n="5" separator="backslash"/>
-      <cd:tex n="6" separator="backslash" command="leg"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fact" type="environment">
-    <cd:sequence>
-      <cd:string value="fact"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:tex n="1" command="fact"/>
-      <cd:nothing n="2"/>
-      <cd:nothing n="3" separator="backslash"/>
-      <cd:nothing n="4" separator="backslash"/>
-      <cd:tex n="5" separator="backslash" command="fact"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="rotate" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="rotate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setuprotate" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuprotate" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setuprotate"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="rotation">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="normal"/>
-          <cd:constant type="high"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="broad"/>
-          <cd:constant type="depth"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="mirror" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="mirror"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="scale" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="scale"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:parameter name="sx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="sy">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupcombinations" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="setupcombinations"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="top"/>
-          <cd:constant type="middle"/>
-          <cd:constant type="bottom"/>
-          <cd:constant type="left"/>
-          <cd:constant type="right"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="combination" type="environment">
-    <cd:sequence>
-      <cd:string value="combination"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:matrix"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placesidebyside" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="placesidebyside"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placeontopofeachother" file="core-mis.tex">
-    <cd:sequence>
-      <cd:string value="placeontopofeachother"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overlay" type="environment">
-    <cd:sequence>
-      <cd:string value="overlay"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="overview" type="environment">
-    <cd:sequence>
-      <cd:string value="overview"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinteractionscreen" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupinteractionscreen"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="max"/>
-        </cd:parameter>
-        <cd:parameter name="backspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topspace">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="horoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="veroffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="max"/>
-          <cd:constant type="fit"/>
-          <cd:constant type="doublesided"/>
-          <cd:constant type="singlesided"/>
-          <cd:constant type="auto"/>
-          <cd:constant type="none"/>
-          <cd:constant type="bookmark"/>
-        </cd:parameter>
-        <cd:parameter name="delay">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="screen" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="screen"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setuppagetransitions" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setuppagetransitions"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="reset"/>
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinteraction" file="core-nav.tex">
-    <cd:sequence>
-      <cd:string value="setupinteraction"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="menu">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-        <cd:parameter name="page">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="click">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="split">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="display">
-          <cd:constant type="new"/>
-        </cd:parameter>
-        <cd:parameter name="openaction">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="closeaction">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="openpageaction">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="closepageaction">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="calculate">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="strut">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="contrastcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="symbolset">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="title">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="subtitle">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="author">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="date">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="keyword">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <!-- maybe this will move elsewhere -->
-        <cd:parameter name="fieldlayer">
-          <cd:constant type="auto"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinteractionmenu" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupinteractionmenu"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="before">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="after">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="middle">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-          <cd:constant type="none"/>
-          <cd:constant type="local"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="contrastcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="overlay"/>
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="samepage">
-          <cd:constant type="yes"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="no"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="unknownreference">
-          <cd:constant type="yes"/>
-          <cd:constant type="empty"/>
-          <cd:constant type="no"/>
-          <cd:constant type="none"/>
-        </cd:parameter>
-        <cd:parameter name="leftoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="rightoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="topoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="bottomoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="position">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/> <!-- maybe not all parameters from framed -->
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineinteractionmenu" variant="1" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="defineinteractionmenu"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive" list="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupinteractionmenu" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineinteractionmenu" variant="2" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="defineinteractionmenu"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupinteractionmenu" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="interactionmenu" type="environment">
-    <cd:sequence>
-      <cd:string value="interactionmenu"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="disableinteractionmenu" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="disableinteractionmenu"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="top"/>
-        <cd:constant type="bottom"/>
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:reference n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useexternaldocument" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="useexternaldocument"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="file"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="useURL" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="useURL"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="file"/>
-      </cd:keywords>
-      <cd:keywords n="4">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="coupledocument" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="coupledocument"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="file"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="from" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="from"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:reference n="1" interactive="exclusive"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="interactionbar">
-    <cd:sequence>
-      <cd:string value="interactionbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:inherit name="setupinteractionbar" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="interactionbuttons" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="interactionbuttons"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" optional="yes" list="yes">
-        <cd:inherit name="setupinteractionbar" n="1"/>
-      </cd:assignments>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupinteractionbar" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupinteractionbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="alternative">
-          <cd:constant type="a"/>
-          <cd:constant type="b"/>
-          <cd:constant type="c"/>
-          <cd:constant type="d"/>
-          <cd:constant type="e"/>
-          <cd:constant type="f"/>
-          <cd:constant type="g"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="height"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="height"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="depth">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="step">
-          <cd:constant type="cd:number"/>
-          <cd:constant type="small"/>
-          <cd:constant type="medium"/>
-          <cd:constant type="big"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="synchronize" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="synchronize"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="synchronization" type="environment">
-    <cd:sequence>
-      <cd:string value="synchronization"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupsynchronizationbar" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupsynchronizationbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="page"/>
-          <cd:constant type="local"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-          <cd:constant type="height"/>
-          <cd:constant type="fit"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="synchronizationbar" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="synchronizationbar"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="alternative">
-          <cd:constant type="page"/>
-          <cd:constant type="local"/>
-        </cd:parameter>
-        <cd:inherit name="setupsynchronizationbar" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupsynchronization" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupsynchronization"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineprofile" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="defineprofile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupprofiles" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupprofiles"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="option">
-          <cd:constant type="test"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="profile" type="environment">
-    <cd:sequence>
-      <cd:string value="profile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="followprofile" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="followprofile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="exclusive"/>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placebookmarks" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="placebookmarks"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-        <cd:constant type="all"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:parameter name="force">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="bookmark" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="bookmark"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="version" type="environment">
-    <cd:sequence>
-      <cd:string value="version"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive" list="yes">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupversions" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupversions"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="number">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="markversion" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="markversion"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="selectversion" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="selectversion"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="defineversion" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="defineversion"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:number"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="followversion" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="followversion"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="exclusive"/>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="followprofileversion" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="followprofileversion"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="exclusive"/>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="defineprogram" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="defineprogram"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupprograms" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="setupprograms"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" list="yes">
-        <cd:parameter name="directory">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="program" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="program"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="figure" type="environment">
-    <cd:sequence>
-      <cd:string value="figure"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" interactive="exclusive">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="frame">
-          <cd:constant type="on"/>
-          <cd:constant type="off"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- referring*figure skipped -->
-
-  <!-- marking*figure skipped -->
-
-  <!-- remark skipped -->
-
-  <cd:command name="goto" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="goto"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="exclusive"/>
-      <cd:content n="2" interactive="exclusive"/>
-      <cd:reference n="3" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="gotobox" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="gotobox"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1" interactive="exclusive"/>
-      <cd:reference n="2" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="button" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="button"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" interactive="exclusive" optional="yes" list="yes">
-        <cd:inherit name="setupbuttons" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-      <cd:reference n="3" list="yes"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupbuttons" file="core-ref.tex">
-    <cd:sequence>
-      <cd:string value="setupbuttons"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- menubutton skipped -->
-
-  <cd:command name="setupcomment" file="core-int.tex">
-    <cd:sequence>
-      <cd:string value="setupcomment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="title">
-          <cd:constant type="cd:text"/>
-        </cd:parameter>
-        <cd:parameter name="space">
-          <cd:constant type="yes"/>
-          <cd:constant type="no"/>
-        </cd:parameter>
-        <cd:parameter name="symbol">
-          <cd:constant type="normal"/>
-          <cd:constant type="New"/>
-          <cd:constant type="Balloon"/>
-          <cd:constant type="Addition"/>
-          <cd:constant type="Help"/>
-          <cd:constant type="Paragraph"/>
-          <cd:constant type="Key"/>
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="max"/>
-          <cd:constant type="buffer"/>
-        </cd:parameter>
-        <cd:parameter name="margin">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="comment" type="environment">
-    <cd:sequence>
-      <cd:string value="comment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupcomment" n="1"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="comment">
-    <cd:sequence>
-      <cd:string value="comment"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2" optional="yes" list="yes">
-        <cd:inherit name="setupcomment" n="1"/>
-      </cd:assignments>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="definefield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1"> <!-- name -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2"> <!-- type -->
-        <cd:constant type="text"/>
-        <cd:constant type="line"/> <!-- equal to text -->
-        <cd:constant type="push"/>
-        <cd:constant type="check"/>
-        <cd:constant type="radio"/>
-        <cd:constant type="combo"/>
-        <cd:constant type="choice"/> <!-- equal to combo -->
-        <cd:constant type="popup"/> <!-- equal to combo -->
-      </cd:keywords>
-      <cd:keywords n="3"> <!-- group -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="4" list="yes"> <!-- optional for text? -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="5" optional="yes"> <!-- default -->
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definesubfield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="definesubfield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="3" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="copyfield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="copyfield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="clonefield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="clonefield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="4" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="field" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="field"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fitfield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="fitfield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fillinfield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="fillinfield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="tooltip" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="tooltip"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes">
-        <cd:constant type="left"/>
-        <cd:constant type="right"/>
-        <cd:constant type="middle"/>
-      </cd:keywords>
-      <cd:content n="2"/>
-      <cd:content n="3"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="showfields" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="showfields"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="logfields" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="logfields"/>
-    </cd:sequence>
-  </cd:command>
-
-  <cd:command name="setupfield" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="setupfield"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="label"/>
-        <cd:constant type="horizontal"/>
-        <cd:constant type="vertical"/>
-        <cd:constant type="frame"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:inherit name="setupfields" n="2"/>
-      </cd:assignments>
-      <cd:assignments n="4" list="yes"> </cd:assignments>
-      <cd:assignments n="5" list="yes"> </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfields" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="setupfields"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes"> <!-- TODO: if it's reset, only a single argument, no list -->
-        <cd:constant type="reset"/>
-        <cd:constant type="label"/>
-        <cd:constant type="horizontal"/>
-        <cd:constant type="vertical"/>
-        <cd:constant type="frame"/>
-      </cd:keywords>
-      <cd:assignments n="2" list="yes">
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </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="color">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="style">
-          <cd:resolve name="style"/>
-        </cd:parameter>
-        <cd:parameter name="align">
-          <cd:resolve name="align"/>
-        </cd:parameter>
-        <cd:parameter name="option">
-          <cd:constant type="readonly"/>
-          <cd:constant type="required"/>
-          <cd:constant type="protected"/>
-          <cd:constant type="sorted"/>
-          <cd:constant type="unavailable"/>
-          <cd:constant type="hidden"/>
-          <cd:constant type="printable"/>
-        </cd:parameter>
-        <cd:parameter name="clickin">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="clickout">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="regionin">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="regionout">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="afterkey">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="format">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="validate">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="calculate">
-          <cd:constant type="cd:reference"/>
-        </cd:parameter>
-        <cd:parameter name="fieldoffset">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="fieldframecolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="fieldbackgroundcolor">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:inherit name="setupframed" n="2"/>
-      </cd:assignments>
-      <cd:assignments n="3" list="yes">
-        <cd:inherit name="setupfields" n="2"/>
-      </cd:assignments>
-      <cd:assignments n="4" list="yes">
-        <cd:inherit name="setupfields" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupforms" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="setupforms"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="method">
-          <cd:constant type="HTML"/>
-          <cd:constant type="FDF"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefieldstack" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="definefieldstack"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" list="yes">
-        <cd:inherit name="setupfields" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="fieldstack" file="core-fld.tex">
-    <cd:sequence>
-      <cd:string value="fieldstack"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes" list="yes">
-        <cd:inherit name="setupfields" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="clip" file="core-trf.tex">
-    <cd:sequence>
-      <cd:string value="clip"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" optional="yes" list="yes">
-        <cd:inherit name="setupclipping" n="1"/>
-      </cd:assignments>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupclipping" file="core-trf.tex">
-    <cd:sequence>
-      <cd:string value="setupclipping"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="state">
-          <cd:constant type="start"/>
-          <cd:constant type="stop"/>
-        </cd:parameter>
-        <cd:parameter name="n">
-          <cd:constant type="cd:number" default="1"/>
-        </cd:parameter>
-        <cd:parameter name="nx">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="ny">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="x">
-          <cd:constant type="cd:number" default="1"/>
-        </cd:parameter>
-        <cd:parameter name="y">
-          <cd:constant type="cd:number" default="1"/>
-        </cd:parameter>
-        <cd:parameter name="sx">
-          <cd:constant type="cd:number" default="1"/>
-        </cd:parameter>
-        <cd:parameter name="sy">
-          <cd:constant type="cd:number" default="1"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="hoffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="voffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="offset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="leftoffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="rightoffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="topoffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="bottomoffset">
-          <cd:constant type="cd:dimension" default="0pt"/>
-        </cd:parameter>
-        <cd:parameter name="mp">
-          <cd:constant type="cd:name" default=""/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="placelegend">
-    <cd:sequence>
-      <cd:string value="placelegend"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:content n="1"/>
-      <cd:content n="2"/>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setuplegend">
-    <cd:sequence>
-      <cd:string value="setuplegend"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:assignments n="1" list="yes">
-        <cd:parameter name="n">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="distance">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="inbetween">
-          <cd:constant type="cd:command"/>
-        </cd:parameter>
-        <cd:parameter name="width">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="height">
-          <cd:constant type="cd:dimension"/>
-        </cd:parameter>
-        <cd:parameter name="location">
-          <cd:constant type="right"/>
-          <cd:constant type="bottom"/>
-        </cd:parameter>
-        <cd:parameter name="bodyfont">
-          <cd:resolve name="bodyfont"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupstrut" file="core-spa.tex">
-    <cd:sequence>
-      <cd:string value="setupstrut"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="yes" default="yes"/>
-        <cd:constant type="no"/>
-        <cd:constant type="cap"/>
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usetypescriptfile" file="type-ini.tex">
-    <cd:sequence>
-      <cd:string value="usetypescriptfile"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1"  list="yes">
-        <cd:constant type="cd:file"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="usetypescript" file="type-ini.tex">
-    <cd:sequence>
-      <cd:string value="usetypescript"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="3" optional="yes" list="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definetypeface" file="type-ini.tex">
-    <cd:sequence>
-      <cd:string value="definetypeface"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="rm"/>
-        <cd:constant type="ss"/>
-        <cd:constant type="tt"/>
-        <cd:constant type="mm"/>
-        <cd:constant type="hw"/>
-        <cd:constant type="cg"/>
-      </cd:keywords>
-      <cd:keywords n="3">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="4">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="5" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="6" optional="yes">
-        <cd:parameter name="features">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="rscale">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="encoding">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="text">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefontfeature" file="type-ini.tex">
-    <cd:sequence>
-      <cd:string value="definefontfeature"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="2" optional="yes">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="no">
-        <cd:parameter name="compose">
-          <cd:constant type="no" default="yes"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-        <cd:parameter name="mode">
-          <cd:constant type="node"/>
-          <cd:constant type="base" default="yes"/>
-        </cd:parameter>
-        <cd:parameter name="tlig">
-          <cd:constant type="no" default="yes"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-        <cd:parameter name="trep">
-          <cd:constant type="no" default="yes"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-        <cd:parameter name="script">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="language">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="..tag.."> <!-- can't use &gt; here, \showsetup gives an error -->
-          <cd:constant type="no" default="yes"/>
-          <cd:constant type="yes"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definefonthandling" file="hand-ini.mkii">
-    <cd:sequence>
-      <cd:string value="definefonthandling"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name" list="yes"/>
-      </cd:keywords>
-      <cd:assignments n="3">
-        <cd:parameter name="type">
-          <cd:constant type="hanging" default="yes"/>
-          <cd:constant type="hz"/>
-          <cd:constant type="spacing"/>
-          <cd:constant type="tag"/>
-        </cd:parameter>
-        <cd:parameter name="right">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="left">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="factor">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="min">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="max">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-        <cd:parameter name="step">
-          <cd:constant type="cd:number"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfonthandling" file="hand-ini.mkii">
-    <cd:sequence>
-      <cd:string value="setupfonthandling"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2">
-        <cd:inherit name="definefonthandling" n="2"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <!-- mkii:
-
-  <cd:command name="definefontsynonym" file="font-ini.tex">
-    <cd:sequence>
-      <cd:string value="definefontsynonym"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes">
-        <cd:parameter name="encoding">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="features">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="handling">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="mapping">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  -->
-
-  <cd:command name="definefontsynonym" file="font-ini.tex">
-    <cd:sequence>
-      <cd:string value="definefontsynonym"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:text"/>
-      </cd:keywords>
-      <cd:assignments n="3" optional="yes">
-        <cd:parameter name="fallbacks">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="features">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-        <cd:parameter name="goodies">
-          <cd:constant type="cd:name"/>
-        </cd:parameter>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="setupfontsynonym" file="font-ini.tex">
-    <cd:sequence>
-      <cd:string value="setupfontsynonym"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:name"/>
-      </cd:keywords>
-      <cd:assignments n="2">
-        <cd:inherit name="definefontsynonym" n="3"/>
-      </cd:assignments>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="mapfontsize" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="mapfontsize"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-      <cd:keywords n="2">
-        <cd:constant type="cd:dimension"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-  <cd:command name="definedfont" file="font-ini.tex" category="fonts">
-    <cd:sequence>
-      <cd:string value="definedfont"/>
-    </cd:sequence>
-    <cd:arguments>
-      <cd:keywords n="1">
-        <cd:inherit name="definefont" n="2"/>
-      </cd:keywords>
-    </cd:arguments>
-  </cd:command>
-
-</cd:interface>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 27a797b07..9d3fa3314 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index e08b84165..daf6f6248 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/common/s-mag-01.tex b/tex/context/modules/common/s-mag-01.tex
deleted file mode 100644
index e2d30f4e5..000000000
--- a/tex/context/modules/common/s-mag-01.tex
+++ /dev/null
@@ -1,438 +0,0 @@
-%D \module
-%D   [      file=s-mag-01,
-%D        version=2002.12.14,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=\CONTEXT\ Magazine Base Style,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-% This style is used for producing explanationary documents.
-% Don't misuse it for other purposes, since it may confuse
-% users. Don't change the title either, since it provides a
-% way to categorize documents. Numbers are disabled in
-% instances produced outside PRAGMA ADE.
-%
-% The layout setup is such that one has several text areas
-% available: headers and footers, margins and edges as well
-% as the main text area. The surrounding (gray) makes the
-% main page stand out and is suitable for viewing in spread
-% mode.
-%
-% Since this style is under constant construction, messing
-% around with settings will produce unwanted side effects.
-% So, if some feature or settings is needed, let me know.
-
-% todo: mp frames
-
-\setvariables[magazine][number=0]
-\setvariables[magazine][author=]
-\setvariables[magazine][title={Zero Issue}]
-\setvariables[magazine][date=\currentdate]
-
-% These are reserved for PRAGMA-ADE, don't use them yourself!
-
-% \setvariables[magazine][main=Tricky]
-% \setvariables[magazine][main=Update]
-% \setvariables[magazine][main=HOWTO]
-
-% \setvariables[magazine][main=This Way]      % preludes to a/the manual
-% \setvariables[magazine][main=A Better Way]  % dirty versus clean
-% \setvariables[magazine][main=No Way]        % how users should not do it
-% \setvariables[magazine][main=Your Way]      % how users do it
-% \setvariables[magazine][main=My Way]        % how users do it
-% \setvariables[magazine][main=Our Way]       % how we do things at pragma
-% \setvariables[magazine][main=Their Way]     % how to do latex things in context
-
-\setvariables[magazine][main=My Way]
-
-\startmode[atpragma]
-  \setvariables[magazine][main=This Way]
-\stopmode
-
-\definepapersize
-  [magazine]
-  [width=\dimexpr\paperwidth-.1\paperwidth\relax,
-   height=\dimexpr\paperheight-.1\paperheight\relax]
-
-\setuppapersize
-  [magazine]
-  [A4]
-
-\setupinteractionscreen
-  [option=doublesided]
-
-\definecolor[OuterColor][s=.3]
-\definecolor[InnerColor][s=.8]
-\definecolor[MainColor] [s=.2]
-\definecolor[TitleColor][s=.7]
-
-\definecolor[MyRed]  [r=.6]
-\definecolor[MyGreen][g=.6]
-\definecolor[MyBlue] [b=.6]
-
-\startuseMPgraphic{paper}
-  sh := define_circular_shade(a,a,0,bbheight(OverlayBox),
-   \MPcolor{InnerColor},\MPcolor{OuterColor}) ;
-  fill OverlayBox withshade sh ;
-\stopuseMPgraphic
-
-\startreusableMPgraphic{middlepaper}
-  pair a ; a := center OverlayBox ;
-  \includeMPgraphic{paper}
-\stopreusableMPgraphic
-
-\startreusableMPgraphic{rightpaper}
-  pair a ; a := .5[urcorner OverlayBox,lrcorner OverlayBox] ;
-  \includeMPgraphic{paper}
-\stopreusableMPgraphic
-
-\startreusableMPgraphic{leftpaper}
-  pair a ; a := .5[ulcorner OverlayBox,llcorner OverlayBox] ;
-  \includeMPgraphic{paper}
-\stopreusableMPgraphic
-
-\startreusableMPgraphic{page}
-  fill OverlayBox withcolor white ;
-\stopreusableMPgraphic
-
-\startusableMPgraphic{text}
-  StartPage ;
-    for i = Header,Text,Footer :
-      for j = LeftEdge, LeftMargin, Text, RightMargin, RightEdge :
-        draw Field[i][j] withpen pencircle scaled .5pt ;
-      endfor ;
-    endfor ;
-  StopPage ;
-  setbounds currentpicture to Field[Text][Text] ;
-\stopusableMPgraphic
-
-\startsetups[paper]
-
-  \doifmodeelse{*makeup}
-    {\reuseMPgraphic{middlepaper}}
-    {\doifoddpageelse
-       {\reuseMPgraphic{rightpaper}}
-       {\reuseMPgraphic{leftpaper}}}
-
-\stopsetups
-
-\defineoverlay[paper] [\setups{paper}]
-\defineoverlay[page]  [\reuseMPgraphic{page}]
-\defineoverlay[text]  [\doifmode{frame}{\useMPgraphic{text}}]
-
-\setupbackgrounds [paper] [background=paper]
-\setupbackgrounds [page]  [background={page,title}]
-\setupbackgrounds [text]  [background=text]
-
-\definelayer
-  [title]
-  [state=repeat,
-   hoffset=-1cm,
-   voffset=1cm,
-   width=\paperwidth,
-   height=\paperheight]
-
-\setupoutput
-  [pdftex]
-
-\setuplayout
-  [width=middle,
-   topspace=1.5cm,
-   height=middle,
-   header=1.5cm,
-   footer=1cm,
-  %grid=yes,
-   headerdistance=.25cm,
-   footerdistance=.5cm,
-   backspace=3cm,
-   margin=1.5cm,
-   margindistance=.25cm,
-   edge=.75cm,
-   edgedistance=.25cm,
-   bottomdistance=1.5cm,
-   bottom=.1\printpaperheight]
-
-\definelayout
-  [makeup]
-  [topspace=1cm,
-   backspace=1cm,
-   header=0pt,
-   footer=0pt,
-   bottom=0pt]
-
-\setuppagenumbering
-  [alternative=doublesided]
-
-\setupcolors
-  [state=start]
-
-\usetypescript
-  [palatino][\defaultencoding]
-
-\setupbodyfont
-  [palatino,10pt]
-
-\setuptolerance
-  [verytolerant,stretch]
-
-\appendtoks\setups[papershift]\to\beforeeverypage
-
-\startsetups[papershift]
-
-  \setuppapersize[top=\vskip.5cm,bottom=\vss]
-
-  \doifmodeelse{*makeup}
-    {\setuppapersize[left=\hfill,right=\hfill]}
-    {\doifoddpageelse
-       {\setuppapersize[right=\hfill]}
-       {\setuppapersize[left=\hfill]}}
-
-\stopsetups
-
-\setupbottomtexts
-  [\setups{rightbanner}] []
-  [] [\setups{leftbanner}]
-
-\startsetups [leftbanner]
-
-  \definedfont[Regular at \the\bottomheight]
-  \setbox\scratchbox\hbox{\TitleColor\getvariable{magazine}{main}}
-  \ht\scratchbox1ex
-  \dp\scratchbox\zeropoint
-  \MainColor
-  \definedfont[Regular sa 2]
-  \doifsomething{\getvariable{magazine}{number}}
-    {\doifnot{\getvariable{magazine}{number}}{0}
-       {\#\getvariable{magazine}{number}}}
-  \quad
-  \currentdate
-  \quad
-  \scale[height=.25\bottomheight]{\box\scratchbox}
-  \quad
-  \hbox to 1.5em{\hss\pagenumber\hss}
-  \quad
-  \hskip-\backspace
-
-\stopsetups
-
-\startsetups [rightbanner]
-
-  \definedfont[Regular at \the\bottomheight]
-  \setbox\scratchbox\hbox{\TitleColor\getvariable{magazine}{main}}
-  \ht\scratchbox1ex
-  \dp\scratchbox\zeropoint
-  \MainColor
-  \hskip-\backspace
-  \definedfont[Regular sa 2]
-  \quad
-  \hbox to 1.5em{\hss\pagenumber\hss}
-  \quad
-  \scale[height=.25\bottomheight]{\box\scratchbox}
-  \quad
-  \currentdate
-  \quad
-  \doifmode{atpragma}{\#\getvariable{magazine}{number}}
-
-\stopsetups
-
-\startsetups[titlepage]
-
-  \disablemode[frame]
-
-  \setuplayout[makeup]
-
-  \startstandardmakeup[doublesided=no]
-
-  \dontcomplain
-
-  \definelayer
-    [makeup]
-    [width=\textwidth,
-     height=\textheight]
-
-  \setlayerframed
-    [makeup]
-    [corner={left,top},location={right,bottom}]
-    [frame=off,
-     foregroundcolor=MainColor]
-    {\scale
-       [width=\makeupwidth]
-       {\definedfont[Regular sa 10]%
-        \getvariable{magazine}{main}}}
-
-  \setlayerframed
-    [makeup]
-    [corner={right,top},location={left},y=.4\textheight]
-    [frame=off,
-     foregroundcolor=MainColor,
-     width=\textwidth,
-     align=left]
-    {\definedfont[Regular sa 2.5]\setupinterlinespace
-     \startmode[atpragma]
-       \strut \ConTeXt\ magazine \#\getvariable{magazine}{number}\endgraf
-     \stopmode
-     \strut \getvariable{magazine}{date} \endgraf
-     \blank
-     \strut \getvariable{magazine}{title}\endgraf
-     \doifsomething{\getvariable{magazine}{author}}
-       {\strut \getvariable{magazine}{author}\endgraf}
-     \doifsomething{\getvariable{magazine}{affiliation}}
-       {\strut \getvariable{magazine}{affiliation}\endgraf}}
-
-  \setlayerframed
-    [makeup]
-    [corner={right,bottom},location={left,top}]
-    [frame=off,
-     align=normal,
-     width=.8\textwidth,
-     foregroundcolor=MainColor]
-    {\getbuffer[abstract]}
-
-  \flushlayer[makeup]
-
-  \stopstandardmakeup
-
-  \setuplayout[reset]
-
-\stopsetups
-
-\startsetups[listing]
-
-  \page \disablemode[frame]
-
-  \setuptexttexts  [][] \setuptexttexts  []
-  \setupheadertexts[][] \setupheadertexts[source code of this document]
-  \setupfootertexts[][] \setupfootertexts[]
-
-  \start \dontcomplain
-
-    \typefile[TEX]{\inputfilename}
-
-  \stop
-
-\stopsetups
-
-\startsetups[lastpage]
-
-  \page \disablemode[frame] \page[even]
-
-  \doifoddpageelse
-    {}
-    {\setuplayout[makeup]
-     \startstandardmakeup[doublesided=no,page=]
-     \stopstandardmakeup
-     \setuplayout[reset]}
-
-\stopsetups
-
-\startsetups[title]
-
-  \disablemode[frame]
-
-  \setlayerframed
-    [title]
-    [corner={left,top},location={left,bottom},
-     rotation=90]
-    [frame=off,
-     foregroundcolor=MainColor]
-    {\definedfont[RegularBold sa 2]\strut\getvariable{magazine}{title}}
-
-  \setlayerframed
-    [title]
-    [corner={right,top},
-     rotation=270]
-    [frame=off,
-     foregroundcolor=MainColor]
-    {\definedfont[RegularBold sa 2]\strut\getvariable{magazine}{title}}
-
-\stopsetups
-
-\startbuffer[abstract]
-  % no abstract
-\stopbuffer
-
-\setuphead
-  [chapter]
-  [page=yes,
-   after={\blank[2*big]},
-   color=MainColor,
-   style=\bfc]
-
-\setuphead
-  [section]
-  [before={\blank[2*big]},
-   after=\blank,
-   color=MainColor,
-   style=\bfb]
-
-\setuphead
-  [subsection]
-  [before=\blank,
-   after=,
-   color=MainColor,
-   style=\bf]
-
-\setupwhitespace
-  [big]
-
-\definetyping[xtyping] [style=\ttx]
-\definetyping[xxtyping][style=\ttxx]
-
-\definetypeface
-  [narrowtt] [tt]
-  [mono] [modern-cond] [default] [encoding=\defaultencoding]
-
-\definetyping[ntyping] \setuptyping[ntyping][style=\narrowtt]
-\definetype  [ntype]   \setuptype  [ntype]  [style=\narrowtt]
-
-\doifnotmode{demo}{\endinput}
-
-% \usemodule[mag-01]
-
-\setvariables
-  [magazine]
-  [title={Introduction},
-   author=Hans Hagen,
-   affiliation=PRAGMA ADE,
-   date=Januari 2003,
-   number=0]
-
-\startbuffer[abstract]
-  This is the zero issue of a semi periodical. The
-  associated style can be used by \CONTEXT\ users to
-  typeset and publish their own issues.
-\stopbuffer
-
-\starttext \setups [titlepage] \setups [title]
-
-\setupheadertexts[welcome]
-
-This is the zero issue of a range of \CONTEXT\ related
-publications, in most cases short introductions to new
-functionality. The style may be used by users for providing
-similar documents, but preferably not for other purposes,
-since it may confuse readers in their expectations.
-
-We've chosen a layout which is more functional than
-beautiful. This layout provides several text areas: headers
-and footers, margins and edges as well as a main text area.
-The surrounding (gray) makes the main page (which is
-slightly smaller than A4) stand out and is suitable for
-viewing in spread mode.
-
-The documents produced at \PRAGMA\ are called {\bf This
-Way}, user documents gets the title {\bf My Way}. The
-\PRAGMA\ issues are numbered. We strongly advise you not to
-use the \type {mag-} prefix for your issues, since this may
-lead to clashes with files distributed by \PRAGMA.
-
-\setups [listing]
-
-\setups [lastpage]
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-01.tex b/tex/context/modules/common/s-pre-01.tex
deleted file mode 100644
index 89c5642f9..000000000
--- a/tex/context/modules/common/s-pre-01.tex
+++ /dev/null
@@ -1,404 +0,0 @@
-%D \module
-%D   [      file=s-pre-01,
-%D        version=1997.07.22,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 1,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This environment can be used to typeset interactive
-%D presentations. This module was first used at the 1997 \TUG\
-%D meeting.
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {language}
-%D
-%D Because this module is defined in english, we default to the
-%D english hyphenation patterns and labels too.
-
-\language
-  [en]
-
-%D \macros
-%D   {setupbodyfont,setuplayout}
-%D
-%D For screen reading, a Lucida Bright font looks nice. We use
-%D a 14.4 point bodyfont for the main text, but switch back to
-%D 12 points for ornaments.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setuplayout
-  [style=smallbodyfont]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D Screen presentations without color just look dull, so we
-%D enable color support. We define ourselves a yellowish
-%D backgroundcolor and a not too dark blue interactioncolor.
-
-\setupcolors
-  [state=start]
-
-\definecolor [BackgroundColor]  [r=1,  g=1,  b=.7]
-\definecolor [InteractionColor] [r=.1, g=.5, b=.8]
-\definecolor [ContrastColor]    [r=.9, g=.5, b=.2]
-
-%D \macros
-%D   {setuppapersize,setuplayout,setupinteractionscreen}
-%D
-%D
-%D We use a nice large screen, and dedicate the right edge and
-%D bottom part to navigational tools. We automatically set
-%D the width and height of the page and start up full screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=12pt,
-   header=0pt,
-   footer=0pt,
-   height=402pt, % 450 - 12 - 15 - 12 - 12 + 3
-   bottomdistance=15pt,
-   bottom=12pt,
-   backspace=12pt,
-   margin=0pt,
-   width=fit,
-   edgedistance=12pt,
-   rightedge=96pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupbackgrounds}
-%D
-%D We set the pagecolor to yellow except the part of the screen
-%D that is used to display the running text. By seting the
-%D offset to 3pt the text will not touch the yellow parts. We
-%D do not set the depth.
-
-\setupbackgrounds
-  [page]
-  [background=color,
-   backgroundcolor=BackgroundColor,
-   offset=3pt]
-
-\setupbackgrounds
-  [text][text]
-  [background=color,
-   backgroundcolor=white]
-
-%D I considered the next setup too, but finaly decided to
-%D comment it out.
-%D
-%D \starttyping
-%D \setupbackgrounds
-%D   [bottom][text]
-%D   [frame=on,
-%D    framecolor=white]
-%D \stoptyping
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D We did not enable interactive text support yet, so let's do
-%D that now. We force page reference to circumvent problems
-%D with named destinations in buggy viewers.
-
-\setupinteraction
-  [page=yes,
-   color=InteractionColor,
-   contrastcolor=ContrastColor,
-   menu=on,
-   state=start]
-
-%D \macros
-%D   {setupinteractionmenu,startinteractionmenu}
-%D
-%D At the bottom of the screen we show two navigational bars.
-%D At the left we show the subpage bar, at the right we use a
-%D non default backward|/|forward bar.
-
-\setupinteractionmenu
-  [bottom]
-  [leftoffset=-3pt,
-   rightoffset=-3pt]
-
-\startinteractionmenu[bottom]
-  \txt \InteractionBar \\
-  \txt \InteractionButtons \\
-\stopinteractionmenu
-
-%D \macros
-%D   {interactionbar}
-%D
-%D The left bar gets a white border (on the yellow background).
-%D Because we don't want to typeset an empty frame when no
-%D subpage bar is shown, we check for the number of subpages.
-
-\def\InteractionBar%
-  {\ifnum\nofsubpages>1
-     \framed
-       [framecolor=white,rulethickness=1pt,
-        height=\bottomheight,strut=no]
-       {\interactionbar[alternative=f,width=.5\makeupwidth,height=1ex]}
-   \fi}
-
-%D \macros
-%D   {setupinteractionbar, interactionbuttons}
-%D
-%D The right hand buttons enable us to jump backward and forward,
-%D as well as to the previous and next jump. We also enable to
-%D close the presentation.
-
-\setupinteractionbar
-  [framecolor=white,rulethickness=1pt,
-   height=\bottomheight,strut=no]
-
-\def\InteractionButtons%
-  {\interactionbuttons
-     [width=15em]
-     [PreviousJump,NextJump,
-      firstpage,
-      firstsubpage,previouspage,nextpage,lastsubpage,
-      lastpage,
-      CloseDocument]}
-
-%D \macros
-%D  {StartTitlePage, TitlePage}
-%D
-%D The titlepage is rather simple and can be typeset in two
-%D ways:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D text \\ text \\ text
-%D \StopTitlepage
-%D \stoptyping
-%D
-%D or more straightforward:
-%D
-%D \starttyping
-%D \TitlePage{text\\text\\text}
-%D \stoptyping
-%D
-%D The first alternative can be used for more complicated
-%D title pages.
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {TitlePage, Topics, Topic, Subject}
-%D
-%D A presentation after loading this module looks like:
-%D
-%D \starttyping
-%D \TitlePage {About Whatever\\Topics}
-%D
-%D \Topics {Todays Talk}
-%D
-%D \Topic {Some topic}
-%D
-%D \Subject {Alfa}
-%D
-%D .....
-%D
-%D \Subject {Beta}
-%D
-%D .....
-%D \stoptyping
-
-%D \macros
-%D   {definehead}
-%D
-%D The commands \type{\Topic} and \type{\Subject} are defined
-%D as copies of head. We use \type{\Nopic} for internal
-%D purposes.
-
-\definehead [Topic]   [chapter]
-\definehead [Subject] [section]
-
-\definehead [Nopic]   [title]
-
-%D \macros
-%D   {setuphead}
-%D
-%D Because chapters and sections do not make sense in
-%D presentations, we use our own command for typesetting the
-%D titles. Sectionnumbers are of course hidden from viewing.
-%D Each topic is followed by a list of subjects that belong
-%D to the topic.
-
-\setuphead
-  [Topic, Nopic, Subject]
-  [command=\HeadLine,
-   page=yes,
-   style=\tfb,
-   after=\blank,
-   sectionnumber=no]
-
-\setuphead
-  [Topic]
-  [after=\PlaceSubjectList]
-
-\setuphead
-  [Subject]
-  [continue=no]
-
-%D \macros
-%D   {framed, midalined}
-%D
-%D The command used to typeset the head lines is rather simple.
-%D We just center the framed title. The frame macro optimizes
-%D the alignment and at the same time enables us to typeset a
-%D nice colored rule.
-
-\def\HeadLine#1#2%
-  {\midaligned
-     {\framed
-        [framecolor=BackgroundColor,rulethickness=1pt,
-         width=.8\hsize,align=middle,strut=no]
-        {#2}}}
-
-%D \macros
-%D   {setuplist}
-%D
-%D The subject list is automatically placed. We center each
-%D subject line by using one of the default alternatives (g). We
-%D could have said:
-%D
-%D \starttyping
-%D \setuplist
-%D   [Subject]
-%D   [alternative=none,
-%D    command=\SubjectListLine,
-%D    interaction=all]
-%D
-%D \def\SubjectListLine#1#2#3%
-%D   {\midaligned{#2}}
-%D \stoptyping
-%D
-%D But why should we complicate things when we can use
-%D alternative~\type{g}. The test is only needed if one
-%D does not automatically goes a new page with each subject.
-
-\def\PlaceSubjectList%
-  {\blank
-   \determinelistcharacteristics[Subject]
- % \ifnum\utilitylistlength>0 \placelist[Subject] \fi}
-   \doifmode{*list}{\placelist[Subject]}}
-
-\setuplist
-  [Subject, Topic]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-% %D \macros
-% %D   {setuptexttexts}
-% %D
-% %D The topics will be listed in the right edge, using:
-%
-% \setuptexttexts
-%   [edge]
-%   [][\TopicList]
-
-%D \macros
-%D   {setuplist, placelist,startinteractionmenu}
-%D
-%D The actual topic list is typeset using a \type{\vbox}. We
-%D have to specify \type{criteriumcriterium=all} because otherwise no
-%D list will be typeset. (By default lists are typeset
-%D locally.)
-
-\startinteractionmenu[right]
-  \placelist
-    [Topic]
-    [alternative=f, % command, % none,
-     maxwidth=\hsize,
-     width=\hsize,
-     offset=0pt,
-     criterium=all,
-     align=left,
-     style=\setsmallbodyfont\bfx]
-\stopinteractionmenu
-
-\def\Topics#1% temporary hack
-  {\Nopic{#1}
-   \placelist[Topic][criterium=all]}
-
-\def\Subjects%
-  {}
-
-%D \macros
-%D   {setuptexttexts, button}
-%D
-%D During a presentation, we want to use the cursor to point to
-%D parts of the text. Furthermore we want to be able to jump to
-%D the next page, without the need to move the cursor on buttons.
-%D Therefore we make the text part of the screen into an
-%D invisible button.
-
-\setuptexttexts
-  [\GotoNextPage][]
-
-\def\GotoNextPage
-  {\button[width=\hsize,height=\vsize,frame=off]{}[nextpage]}
-
-%D \macros
-%D   {setupsubpagenumber}
-%D
-%D The left bottom navigation bar shows the subpages, which will
-%D be counted by text. One can change this in the preentation
-%D itself by saying \type {[way=byTopic]}.
-
-\setupsubpagenumber
-  [way=bytext, % Topic,
-   state=start]
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-original}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-02.tex b/tex/context/modules/common/s-pre-02.tex
deleted file mode 100644
index d7a6fe458..000000000
--- a/tex/context/modules/common/s-pre-02.tex
+++ /dev/null
@@ -1,381 +0,0 @@
-%D \module
-%D   [      file=s-pre-02,
-%D        version=1998.04.21,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 2,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This environment can be used to typeset interactive
-%D presentations. This module was first used at the 1998
-%D publishers conference of the European Portable Document
-%D Association (now merged into a graphics association).
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {setupbodyfont, switchtobodyfont, setuplayout}
-%D
-%D At \PRAGMA\ we prefer using the Lucida Bright fonts, but
-%D one can of course load another typeface.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setuplayout
-  [style=smallbodyfont]
-
-%D \macros
-%D   {setuppapersize, setuplayout}
-%D
-%D The papersize suits the screen dimensions. The layout is
-%D rather simple. We use the whole width of the screen and only
-%D have navigational tools at the bottom of the screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [backspace=1cm,
-   topspace=1cm,
-   margin=0pt,
-   header=0pt,
-   footer=0pt,
-   bottomdistance=.875cm,
-   bottom=1cm,
-   width=fit,
-   height=fit]
-
-%D \macros
-%D   {setupwhitespace, setuptyping}
-%D
-%D We don't have much height, so we use a more cramped
-%D spacing. Verbatim text looks better when indented.
-%D
-
-\setupwhitespace
-  [medium]
-
-\setuptyping
-  [margin=standard]
-
-%D \macros
-%D   {definecolor, setupcolors}
-%D
-%D Of course we enable color. We define some logical colors,
-%D of which most default to the same green shade.
-
-\definecolor [BackgroundColor]  [r=.8, g=.8, b=.8]
-\definecolor [OrnamentColor]    [r= 0, g=.7, b=.4]
-
-\setupcolors
-  [state=start]
-
-%D \macros
-%D   {setupinteraction, setupinteractionscreen}
-%D
-%D We still have to enable interaction mode. We go full
-%D screen!
-
-\setupinteraction
-  [state=start,
-   color=OrnamentColor,
-   contrastcolor=OrnamentColor]
-
-\setupinteractionscreen
-  [option=max,
-   width=fit,
-   height=fit]
-
-%D \macros
-%D   {setupitemize}
-%D
-%D And why not bring some color in itemizations too?
-
-\setupitemize
-  [color=OrnamentColor]
-
-%D \macros
-%D   {defineoverlay, setupbackgrounds}
-%D
-%D The navigational elements and the backgrounds are
-%D provided by \METAPOST.
-%D
-%D When \METAPOST\ is used, it makes sense to generate the
-%D graphics at runtime. This is supported when one enables
-%D system calls in the local \type {texmf.cnf} file and add the
-%D switch \type {\runMPgraphicstrue} to the local file \type
-%D {cont-sys.tex}. When direct processing is disabled or not
-%D supported, \TEXEXEC\ will take care of graphic generation.
-
-\startuniqueMPgraphic{PageBackground}
-  fill unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    withcolor OverlayColor ;
-  draw unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    enlarged (-2*OverlayLineWidth)
-    withpen pencircle scaled OverlayLineWidth
-    withcolor OverlayLineColor ;
-\stopuniqueMPgraphic
-
-\defineoverlay
-  [PageBackground]
-  [\uniqueMPgraphic{PageBackground}]
-
-\setupbackgrounds
-  [page]
-  [background=PageBackground,
-   backgroundcolor=BackgroundColor,
-   rulethickness=.125cm,
-   framecolor=OrnamentColor]
-
-%D \macros
-%D   {setuptexttexts}
-%D
-%D By clicking on the text area, one goes to the next page.
-%D We hook this feature into the text backgrounds.
-
-\startuniqueMPgraphic{TextBackground}
-  draw unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    enlarged (4*OverlayLineWidth)
-    withpen pencircle scaled OverlayLineWidth
-    withcolor OverlayLineColor ;
-\stopuniqueMPgraphic
-
-\defineoverlay
-  [TextBackground]
-  [\uniqueMPgraphic{TextBackground}]
-
-\defineoverlay
-  [NextPage]
-  [\overlaybutton{nextpage}]
-
-\setupbackgrounds
-  [text]
-  [background={TextBackground,NextPage},
-   backgroundcolor=BackgroundColor,
-   rulethickness=.0625cm,
-   framecolor=OrnamentColor]
-
-%D \macros
-%D   {setupinteractionmenu,startinteractionmenu}
-%D
-%D At the bottom of the screen, we show three buttons. These
-%D direct us to the previous or next jump or exit the document.
-
-\setupMPvariables[RightArrow][height=\bottomheight]
-\setupMPvariables[LeftArrow] [height=\bottomheight]
-\setupMPvariables[Circle]    [height=\bottomheight]
-\setupMPvariables[UpArrow]   [height=\bottomheight]
-
-\startuniqueMPgraphic{RightArrow}{height}
-  z1=(0,0) ; z2=(\MPvar{height},.5y3) ; z3=(0,\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{LeftArrow}{height}
-  z1=(\MPvar{height},0) ; z2=(0,.5y3) ; z3=(\MPvar{height},\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{Circle}{height}
-  drawfill fullcircle scaled \MPvar{height}
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{UpArrow}{height}
-  z1=(0,0) ; z2=(\MPvar{height},0) ; z3=(.5x2,\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\setupinteractionmenu
-  [bottom]
-  [state=start,
-   frame=off,
-   width=.3\textwidth,
-   height=\bottomheight]
-
-\setupinteraction
-  [menu=on]
-
-\def\WhateverButton
-  {\doifreferencefoundelse{Whatever}
-     {\raw [Whatever] \uniqueMPgraphic{UpArrow} \\}
-     {}}
-
-\startinteractionmenu[bottom]
-  \but [Topics]                                     \\ % secret button
-  \hfill
-  \WhateverButton                                      % user specific
-  \kern2\bottomheight
-  \raw [previouspage]  \uniqueMPgraphic{LeftArrow}  \\
-  \kern.5\bottomheight
-  \raw [CloseDocument] \uniqueMPgraphic{Circle}     \\
-  \kern.5\bottomheight
-  \raw [nextpage]      \uniqueMPgraphic{RightArrow} \\
-  \kern.5\bottomheight
-\stopinteractionmenu
-
-%D \macros
-%D   {TitlePage, Topics, Topic, Subject}
-%D
-%D A presentation after loading this module looks like:
-%D
-%D \starttyping
-%D \TitlePage {About Whatever\\Topics}
-%D
-%D \Topics {Todays Talk}
-%D
-%D \Topic {Some topic}
-%D
-%D .....
-%D
-%D \Topic {Next Topic}
-%D
-%D .....
-%D \stoptyping
-
-%D \macros
-%D  {StartTitlePage, TitlePage}
-%D
-%D The titlepage is rather simple and can be typeset in two
-%D ways:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D text \\ text \\ text
-%D \StopTitlepage
-%D \stoptyping
-%D
-%D or as one||liner:
-%D
-%D \starttyping
-%D \TitlePage{text\\text\\text}
-%D \stoptyping
-%D
-%D The first alternative can be used for more complicated
-%D title pages.
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {definehead}
-%D
-%D The commands \type{\Topic} and \type{\Subject} are defined
-%D as copies of head. We use \type{\Nopic} for internal
-%D purposes.
-
-\definehead [Topic]   [chapter]
-\definehead [Subject] [section]
-
-\definehead [Nopic]   [title]
-
-%D \macros
-%D   {setuphead}
-%D
-%D We use our own command for typesetting the titles. We hide
-%D sectionnumbers from viewing. Each topic is followed by a
-%D list of subjects that belong to the topic.
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D \macros
-%D   {setuplist}
-%D
-%D When found, the subject list is automatically placed
-%D after the topic head.
-
-\setuplist
-  [Topic,Subject]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\setuplist
-  [Topic]
-  [criterium=all]
-
-\def\Topics#1%
-  {\determinelistcharacteristics[Topic]
-   \doifmode{*list}
-     {\Nopic[Topics]{#1}
-      \startcolumns
-      \placelist[Topic]
-      \stopcolumns}}
-
-\setuplist
-  [Subject]
-  [criterium=Topic]
-
-\def\Subjects%
-  {\determinelistcharacteristics[Subject]
-   \doifmode{*list}
-     {\placelist[Subject]}}
-
-\setuphead
-  [Topic]
-  [after={\blank[3*medium]\Subjects}]
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-green}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-03.tex b/tex/context/modules/common/s-pre-03.tex
deleted file mode 100644
index 19a11d24e..000000000
--- a/tex/context/modules/common/s-pre-03.tex
+++ /dev/null
@@ -1,257 +0,0 @@
-%D \module
-%D   [      file=s-pre-03,
-%D        version=1998.09.06,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 3,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This is the third environment for typesetting interactive
-%D presentations. I used this style for a talk on \TEX\ and
-%D \JAVASCRIPT\ at \TUG98, mainly because I didn't want to
-%D use the same style three times. Therefore this is a rather
-%D simple, silly style.
-
-\usemodule[pre-general]
-
-%D \macros
-%D  {setupbodyfont}
-%D
-%D We use a large bodyfont. Combined with the fancy
-%D background, this does not leave that much room for text, but
-%D presentations should use much text anyway.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D \macros
-%D   {setuppapersize,setuplayout,setupinteractionscreen}
-%D
-%D The page dimensions are set to size \type {S6}, being
-%D 600pt by 450pt. We use wide margins and discard headers
-%D and footers. We also launch the document full screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [width=middle,
-   height=middle,
-   topspace=75pt,
-   backspace=100pt,
-   header=0pt,
-   footer=0pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D Next, color support is turned on and a dark red color is
-%D defined. Other red shades will be derived from this one
-%D color.
-
-\setupcolors
-  [state=start]
-
-\definecolor [PageColor]       [black]
-\definecolor [BackgroundColor] [s=.85]
-\definecolor [OrnamentColor]   [r=.75]
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D We turn on interaction mode and use the same color for
-%D hyperlinks and redundant hyperlinks (the ones that point
-%D to the current page).
-
-\setupinteraction
-  [state=start,
-   contrastcolor=OrnamentColor,
-   color=OrnamentColor]
-
-%D \macros
-%D   {defineoverlay, setupbackgrounds}
-%D
-%D The joke in this presentation is the elliptical shape of
-%D which the bottom part includes a page indication.
-
-\defineoverlay
-  [PageShape][\useMPgraphic{PageShape}]
-
-% \startuseMPgraphic{PageShape}
-%   lin := 20pt ; off := .75lin ;
-%   wid := \overlaywidth ; hei := \overlayheight ;
-%   pos := \currentpage ; tot := \lastpage ;
-%   path bb; bb := unitsquare xscaled wid yscaled hei ;
-%   filldraw bb withcolor \MPcolor{PageColor} ;
-%   pickup pencircle xscaled .5lin yscaled lin rotated 45 ;
-%   pair r, t, l, b ;
-%   r := (wid-off,.5hei) ; t := (.5wid,hei-off) ;
-%   l := (off,.5hei) ; b := (.5wid,off) ;
-%   path p; p := superellipse(r,t,l,b,.8) ;
-%   fill p withcolor \MPcolor{Backgroundcolor} ;
-%   draw p withcolor \MPcolor{OrnamentColor} ;
-%   color contrastcolor ; contrastcolor = 2/3 * \MPcolor{OrnamentColor} ;
-%   if (pos>0) and (tot>0):
-%     pair pa ; pa := point 5 of p ;
-%     pair pb ; pb := point 7 of p ;
-%     draw pa withcolor contrastcolor ;
-%     draw pb withcolor contrastcolor ;
-%     len := 2/tot ;
-%     pair pa ; pa := point (5+len*pos) of p ;
-%     pair pb ; pb := point (5+len*(pos-1)) of p ;
-%     p := p cutafter pa ;
-%     p := p cutbefore pb ;
-%     draw p withcolor contrastcolor ;
-%   fi ;
-%   setbounds currentpicture to bb ;
-% \stopuseMPgraphic
-
-\startuseMPgraphic{PageShape}
-  StartPage ;
-    path p ; pair pa, pb ; numeric len ; color contrastcolor ;
-    fill Page withcolor \MPcolor {PageColor} ;
-    pickup pencircle rotated 45 xscaled 10pt yscaled 20pt ;
-    p := Page enlarged (-10pt,-15pt) superellipsed .8 ;
-    p := p shifted (-1.5pt,0) ; % looks better
-    fill p withcolor \MPcolor{BackgroundColor} ;
-    draw p withcolor \MPcolor{OrnamentColor} ;
-    contrastcolor = 2/3 * \MPcolor{OrnamentColor} ;
-    if (PageNumber>0) and (NOfPages>0):
-      draw point 5 of p withcolor contrastcolor ;
-      draw point 7 of p withcolor contrastcolor ;
-      len := 2/NOfPages ;
-      pa := point (5+len*PageNumber) of p ;
-      pb := point (5+len*(PageNumber-1)) of p ;
-      draw (p cutafter pa) cutbefore pb
-        withcolor contrastcolor ;
-    fi ;
-  StopPage ;
-\stopuseMPgraphic
-
-%D We use the viewer provided feature to go to the previous or
-%D next page.
-
-\defineoverlay[PrevButton][\overlaybutton{PreviousPage}]
-\defineoverlay[NextButton][\overlaybutton{NextPage}]
-
-\setupbackgrounds
-  [page]
-  [background={PageShape,PrevButton}]
-
-\setupbackgrounds
-  [text][text]
-  [background=NextButton]
-
-% or using hard coded next/prev pages:
-%
-% \defineoverlay[PrevButton][\overlaybutton{previouspage}]
-% \defineoverlay[NextButton][\overlaybutton{nextpage}]
-%
-% \setupbackgrounds[state=repeat]
-% \setupbackground[text][text][background=NextButton]
-%
-% or simply (using an repeated layer):
-%
-% \setupbackground[text][background=NextButton]
-
-%D \macros
-%D   {definehead, setuphead}
-%D
-%D Like the other presentation styles, we use \type {\Topic}
-%D instead of \type {\chapters}. This time we don't provide
-%D an additional sectioning. So we have:
-%D
-%D \starttyping
-%D \TitlePage{How nice}
-%D
-%D \Topics{This is about ...}
-%D
-%D \Topic{The first one}
-%D
-%D \Topic{Another one}
-%D \stoptyping
-
-\definehead [Topic] [chapter]
-\definehead [Nopic] [title]
-
-\setuphead
-  [Topic,Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuplist
-  [Topic]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\def\Subject
-  {\Topic}
-
-%D The tables of contents is associated with \type
-%D {\Topics}.
-
-\def\Topics#1%
-  {\Nopic[Topics]{#1}
-   \placelist[Topic][criterium=all]}
-
-\def\Subjects
-  {}
-
-%D Instead of \type {\TitlePage}, one can use the pair
-%D \type {\StartTitlePage} -- \type {\StopTitlePage}:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D A Self Made Title
-%D \StopTitlePage
-%D \stoptyping
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \def\\{\vfil\bfb\setupinterlinespace}}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-funny}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-04.tex b/tex/context/modules/common/s-pre-04.tex
deleted file mode 100644
index 088f4e510..000000000
--- a/tex/context/modules/common/s-pre-04.tex
+++ /dev/null
@@ -1,377 +0,0 @@
-%D \module
-%D   [      file=s-pre-04,
-%D        version=1998.09.06,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 4,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {setupbodyfont}
-%D
-%D This is just another environment for typesetting interactive
-%D presentations. I wrote this module on behalf of a course I
-%D gave for the United Kingdom \TeX\ users group.
-
-\setupbodyfont[ams,pos,14.4pt]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D I started using dark blue for the navigational elements. In
-%D that context, dark red is a logical choice for the contrast
-%D color. While playing around with the navigational elements
-%D I decided to use the not so dominant color yellow for the
-%D status bar.
-%D
-%D A few days before I wrote this style, the recent acquisition
-%D of Mondriaans last painting by the Dutch governement was a
-%D hot topic in the dutch news scenary. Therefore I decided to
-%D replace the rather dull title page by something more
-%D colorful, in mondriaan colors, but far more random than any
-%D of his paintings. For consistence we remap the already
-%D defined primary colors.
-
-\setupcolors [state=start]
-
-\definecolor [NoneColor] [s=.6]
-\definecolor [GotoColor] [b=.6]        \definecolor[blue]  [GotoColor]
-\definecolor [ExitColor] [r=.6]        \definecolor[red]   [ExitColor]
-\definecolor [JumpColor] [s=.6]
-\definecolor [UserColor] [g=.6]        \definecolor[green] [UserColor]
-\definecolor [StepColor] [r=.6,g=.6]   \definecolor[yellow][StepColor]
-
-\definecolor [PageColor] [s=.80]       \definecolor[gray]  [PageColor]
-\definecolor [TextColor] [s=.90]
-
-%D \macros
-%D   {setuppapersize}
-%D
-%D As usual, we take a screen oriented paper size:
-
-\setuppapersize
-  [S6][S6]
-
-%D \macros
-%D   {setuplayout,setupinteractionscreen}
-%D
-%D The layout definition fits into this $600\times450$ point
-%D area, but the dimensions are somewhat diffused by the text
-%D background offset.
-
-\setuplayout
-  [width=530pt,
-   height=400pt,
-   header=0pt,
-   footer=0pt,
-   backspace=15pt,
-   topspace=15pt,
-   bottomdistance=15pt,
-   bottom=10pt,
-   margin=0pt,
-   rightedgedistance=15pt,
-   rightedge=30pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupbackgrounds}
-%D
-%D Both the page and the text area have a gray background.
-%D The \type {[text,text]} area also has an offset. Later we
-%D will see that we have to compensate for that in the
-%D navigational areas.
-
-\setupbackgrounds
-  [page]
-  [background=color,
-   backgroundcolor=PageColor]
-
-\setupbackgrounds
-  [text][text]
-  [background=color,
-   backgroundcolor=TextColor,
-   backgroundoffset=5pt]
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D For convenient navigation, we turn on interaction.
-
-\setupinteraction
-  [state=start,
-   menu=on,
-   color=UserColor,
-   contrastcolor=NoneColor]
-
-%D \macros
-%D   {setupsubpagenumber}
-%D
-%D When navigating the document, we keep the title page out
-%D of sight, therefore we use sub page numbers.
-
-\setupsubpagenumber
-  [state=start,
-   way=bytext]
-
-%D \macros
-%D   {setupinteractionmenu}
-%D
-%D There is only one interaction menu, located in the right
-%D edge of the screen. Both offsets enlarge the edge by the
-%D same amount as the text background offset.
-
-\setupinteractionmenu
-  [right]
-  [state=start,
-   frame=off,
-   strut=no,
-   offset=0pt,
-   inbetween=,
-   bottomoffset=-5pt,
-   topoffset=-5pt]
-
-%D \macros
-%D   {startinteractionmenu}
-%D
-%D The menu itself is not that spectacular. We use the
-%D start||stop alternative for setting the content. The macro
-%D \type {\interactioncolor} expands into either the
-%D interaction color or the contrast color, the latter only
-%D when no jump is possible.
-
-\startinteractionmenu[right]
-  \setupinteraction[color=GotoColor]
-  \but [previoussubpage] \Triangle {90}\framedwidth\interactioncolor \\
-  \vskip10pt
-  \but [nextsubpage]     \Triangle{270}\framedwidth\interactioncolor \\
-  \vfill
-  \but [PreviousJump]    \Triangle{180}\framedwidth{NoneColor}       \\
-  \vskip-5pt
-  \but [NextJump]        \Triangle  {0}\framedwidth{NoneColor}       \\
-\stopinteractionmenu
-
-%D \macros
-%D   {setupinteractionbar}
-%D
-%D The interaction bar at the bottom is also larger than the
-%D normal width of the bottom area.
-
-\setupinteractionbar
-  [alternative=f,
-   width=\textwidth,
-   height=\bottomheight,
-   distance=10pt,
-   color=NoneColor,
-   contrastcolor=StepColor]
-
-%D \macros
-%D   {setupbottomtexts}
-%D
-%D The bar is centered in the middle.
-
-\setupbottomtexts
-  [\interactionbar]
-
-%D We can exit viewing with a close button, located on the
-%D rightmost bottom area.
-
-\def\CloseButton
-  {\button
-     [width=\rightedgewidth,height=\bottomheight,offset=overlay,
-      background=color,backgroundcolor=ExitColor,frame=off]
-     {}%
-     [CloseDocument]}
-
-\setupbottomtexts
-  [edge][][\CloseButton]
-
-%D \macros
-%D   {definesymbol,setupitemize}
-%D
-%D Because some prominent things are rectangular or triangular,
-%D we prefer some different symbols in itemizations:
-
-\definesymbol[1][$\blacktriangleright$]
-\definesymbol[2][$\blacktriangledown$]
-\definesymbol[3][$\blacktriangleright$]
-\definesymbol[4][$\blacktriangledown$]
-
-\setupitemize[each][color=NoneColor]
-
-%D \macros
-%D   {TitlePage,defineoverlay,button,setupalign,
-%D    setupbackgrounds,setupinteraction,setupinteractionbar,
-%D    startstandardmakeup,switchtobodyfont,setupinterlinespace}
-%D
-%D Now the main layout and navigational definitions are
-%D done, it makes sense to define and tune some structuring
-%D commands. First we build the titlepage.
-
-\defineoverlay [TitleGraphic] [\useMPgraphic{title}]
-\defineoverlay [NextPage]     [\overlaybutton{nextpage}]
-
-\def\StartTitlePage
-  {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}]
-   \setupbackgrounds[text][text][background=]
-   \setupinteraction[menu=off]
-   \setupinteractionbar[state=stop]
-   \startstandardmakeup
-   \switchtobodyfont[24pt]
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage
-  {\vfil\vfil\vfil
-   \stopstandardmakeup
-   \setupinteraction[menu=on]
-   \setupinteractionbar[state=start]
-   \setupbackgrounds[page][background=color]
-   \setupbackgrounds[text][text][background=color]
-   \setupsubpagenumber[reset]}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {Topic, Nopic, Subject,
-%D    definehead, setuphead}
-%D
-%D We use \type {\Topic} and \type {\Subject} instead of
-%D chapters and sections. The \type {\Nopic} alternative is
-%D meant for internal use.
-
-\definehead [Topic]   [chapter]
-\definehead [Nopic]   [title]
-\definehead [Subject] [section]
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D \macros
-%D   {Topics, Subjects,
-%D    setuplist, placelist, startcolumns}
-%D
-%D This style is meant for the more large presentations, and
-%D therefore provided for a list of topics as well as local
-%D lists of subjects. When many topics are introduces, the
-%D list is typeset in columns.
-
-\setuplist
-  [Topic,Subject]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\setuplist
-  [Topic]
-  [criterium=all]
-
-\def\Topics#1%
-  {\determinelistcharacteristics[Topic]
-   \ifnum\utilitylistlength>0
-     \Nopic[Topics]{#1}
-     \ifnum\utilitylistlength>12
-       \startcolumns
-       \placelist[Topic]
-       \stopcolumns
-     \else
-       \placelist[Topic]
-     \fi
-   \fi}
-
-\def\Subjects%
-  {\placelist[Subject]}
-
-%D Last we define the overlays. Look at the way colors are
-%D linked into the macros.
-
-\startMPinclusions
-  def triangle (expr wid, rot, col) =
-    x1 := x3 := y1 := 0 ; x2 := y3 := wid ; y2 := .5y3 ;
-    fill (z1--z2--z3--cycle) rotated rot withcolor col ;
-    currentpicture := currentpicture xysized (wid,wid) ;
-  enddef ;
-\stopMPinclusions
-
-\setupMPvariables
-  [triangle]
-  [width=1cm,
-   rotation=0,
-   color=black]
-
-\startuniqueMPgraphic{triangle}{width,rotation,color}
-  triangle(\MPvar{width},\MPvar{rotation},\MPvar{color}) ;
-\stopuniqueMPgraphic
-
-\def\Triangle#1#2#3%
-  {\uniqueMPgraphic{triangle}{rotation=#1,width=#2,color=#3}}
-
-\startuseMPgraphic{title} % can be simplified with "randomized"
-  color c ; path p ;
-  for i=1 upto 250 :
-    x0 := uniformdeviate \overlaywidth ;
-    y0 := uniformdeviate \overlayheight ;
-    sx := uniformdeviate 20 ;
-    sy := uniformdeviate 20 ;
-    cc := round(uniformdeviate 2) ;
-    if cc=0 : c := \MPcolor{GotoColor} fi ;
-    if cc=1 : c := \MPcolor{ExitColor} fi ;
-    if cc=2 : c := \MPcolor{StepColor} fi ;
-    qq := round(uniformdeviate 1) ;
-    if qq=0 :
-      p := unitsquare xscaled sx yscaled sy ;
-    else :
-      rr := round(uniformdeviate 3) * 90 ;
-      x1 := x3 := y1 := 0 ; x2 := y3 := sx; y2 := .5y3 ;
-      p := (z1--z2--z3--cycle) rotated rr ;
-    fi ;
-    fill p shifted z0 withcolor c ;
-  endfor ;
-\stopuseMPgraphic
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-colorfull}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-05.tex b/tex/context/modules/common/s-pre-05.tex
deleted file mode 100644
index ccffd1f4d..000000000
--- a/tex/context/modules/common/s-pre-05.tex
+++ /dev/null
@@ -1,240 +0,0 @@
-%D \module
-%D   [      file=s-pre-05,
-%D        version=1998.12.12,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 5,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\usemodule[pre-general]
-
-%D As all styles sofar, this one has the same structuring
-%D commands.
-
-\startmode[asintended] \setupbodyfont[ludicaot] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setupcolors [state=start]
-
-\definecolor [BackgroundColor] [s=.95]
-\definecolor [OrnamentColor]   [r=.6,g=.7,b=.8]
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [width=430pt,
-   height=400pt,
-   header=0pt,
-   footer=0pt,
-   margin=0pt,
-   backspace=25pt,
-   topspace=25pt,
-   rightedgedistance=20pt,
-   rightedge=110pt]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupbackgrounds
-  [state=repeat]
-
-\setupbackgrounds
-  [page]
-  [backgroundcolor=white]
-
-\setupbackgrounds
-  [text][text]
-  [background={HashFrameA,NextPage},
-   backgroundoffset=20pt]
-
-\defineoverlay
-  [HashFrameA]
-  [\useMPgraphic{HashFrameA}]
-
-\defineoverlay
-  [HashFrameB]
-  [\useMPgraphic{HashFrameB}]
-
-\setupinteraction
-  [state=start,
-   menu=on,
-   color=OrnamentColor,
-   contrastcolor=OrnamentColor]
-
-%D Watch how we use a list alternative that matches the
-%D menu.
-
-\setupinteractionmenu
-  [right]
-  [background=HashFrameB,
-   style=smallbold,
-   frame=off,
-   offset=10pt,
-   height=35pt,
-   before=,
-   after=,
-   inbetween=\endgraf,
-   width=\rightedgewidth]
-
-\startinteractionmenu[right]
-  \placelist
-    [Topic]
-    [criterium=all,
-     alternative=right,
-     maxwidth=.8\rightedgewidth,
-     interaction=all,
-     before=,
-     after=]
-  \vfill
-  \setupinteractionmenu
-    [right]
-    [height=30pt]
-  \but [CloseDocument] Close \\
-\stopinteractionmenu
-
-\setupwhitespace
-  [big]
-
-\setupblank
-  [big]
-
-%D \macros
-%D   {TitlePage}
-%D
-%D Now the main layout and navigational definitions are
-%D done, it makes sense to define and tune some structuring
-%D commands. First we build the titlepage.
-
-\defineoverlay [TitleGraphic] [\useMPgraphic{TitleGraphic}]
-\defineoverlay [NextPage]     [\overlaybutton{forward}]
-
-\unexpanded\def\StartTitlePage
-  {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}]
-   \setupbackgrounds[text][text][background=]
-   \setupinteraction[menu=off]
-   \setupinteractionbar[state=stop]
-   \setuplayout[width=550pt,rightedge=0pt]
-   \startstandardmakeup
-   \switchtobodyfont[24pt]
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\unexpanded\def\StopTitlePage
-  {\vfil\vfil\vfil
-   \stopstandardmakeup
-   \setuplayout[width=430pt,rightedge=110pt]
-   \setupinteraction[menu=on]
-   \setupinteractionbar[state=start]
-   \setupbackgrounds[page][background=color]
-   \setupbackgrounds[text][text][background={HashFrameA,NextPage}]}
-
-\unexpanded\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {Topics,Subjects}
-%D
-%D Since the lists are in the menu, we don't honor list
-%D placement macros.
-
-\unexpanded\def\Topics#1{}
-\unexpanded\def\Subjects{}
-
-%D \macros
-%D   {Topic, Nopic, Subject}
-%D
-%D Since t his style is meant for rather flat structured
-%D documents, only \type {\Topic} makes sense.
-
-\definehead [Topic]   [chapter]
-\definehead [Nopic]   [title]
-\definehead [Subject] [section]
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D We use only one kind of base graphic, which is sligthly
-%D tuned for the different usage.
-
-\startMPinclusions
-  def random_hash_frame (expr width, height, offset, linewidth ) =
-
-    def delta = ((uniformdeviate .5offset) + .25offset) enddef ;
-    x1 := offset ; y1 := offset ; x2 := width-offset ; y2 := height-offset ;
-
-    drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{BackgroundColor}) ;
-    fill z1--(x2,y1)--z2--(x1,y2)--cycle ;
-
-    drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{OrnamentColor}) ;
-    draw (x1-delta,y1)--(x2+delta,y1) ;
-    draw (x2,y1-delta)--(x2,y2+delta) ;
-    draw (x2+delta,y2)--(x1-delta,y2) ;
-    draw (x1,y2+delta)--(x1,y1-delta) ;
-
-    drawoptions();
-    setbounds currentpicture to unitsquare xscaled width yscaled height ;
-  enddef ;
-\stopMPinclusions
-
-\startuseMPgraphic{HashFrameA}
-  random_hash_frame(OverlayWidth,OverlayHeight,15pt,2pt) ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{HashFrameB}
-  random_hash_frame(OverlayWidth,OverlayHeight, 5pt,2pt) ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{TitleGraphic}
-  for i=1 upto 300 :
-    offset := uniformdeviate 10pt ;
-    width  := 2*offset + 30pt + uniformdeviate 30pt ;
-    height := 2*offset + 10pt + uniformdeviate 10pt ;
-    addto currentpicture also
-      image(random_hash_frame(width,height,offset,1pt)) shifted
-      (uniformdeviate OverlayWidth, uniformdeviate OverlayHeight) ;
-  endfor ;
-\stopuseMPgraphic
-
-\continueifinputfile{s-pre-05.tex}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-fuzzy}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-09.tex b/tex/context/modules/common/s-pre-09.tex
deleted file mode 100644
index a20b9f31a..000000000
--- a/tex/context/modules/common/s-pre-09.tex
+++ /dev/null
@@ -1,380 +0,0 @@
-%D \module
-%D   [      file=s-pre-09,
-%D        version=unknown,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 9,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D I made this style when I had to give a presentation on
-%D the \MAPS\ bibliography production for several user group
-%D meetings. This style is rather tuned for combinations of
-%D examples and explanations. The colors match the \MAPS\
-%D bibliography colors.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D A couple of years later, in 2001 this style was documented
-%D and made public. While documenting, I also changed box
-%D building on top of overlays into the now available layer
-%D positioning. So, this styles demonstrates quite some
-%D tricks.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=0cm,
-   backspace=0cm,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-%D Local environments can be set by using the setups commands.
-%D For downward compatibility, we keep supporting the \type
-%D {\...Settings} hooks. Using local environments is seldom
-%D needed.
-
-\let\TextSettings  \empty
-\let\SampleSettings\empty
-
-\startsetups [text]   \TextSettings   \stopsetups
-\startsetups [sample] \SampleSettings \stopsetups
-
-%D The dimensions are kind of fixed.
-
-\def\FrameWidth  {448pt}
-\def\FrameHeight {348pt}
-\def\FrameOffset {24pt}
-\def\FrameSkip   {12pt}
-
-%D But they {\em can} and {\em will} be changed.
-
-\def\FrameWidth  {408pt}
-\def\FrameHeight {318pt}
-
-%D The funny values come from the $3:4$ display aspect
-%D ratio.
-
-\setupcolors
-  [state=start]
-
-\definecolor[PageColor]       [s=.40]
-\definecolor[TextColor]       [s=.90]
-\definecolor[InteractionColor][r=.40]
-\definecolor[LineColor]       [r=.60,g=.60]
-
-%D Of course we go interactive and since we will probably
-%D open other documents, we make sure that the viewer opens a
-%D new window.
-
-\setupinteraction
-  [color=InteractionColor,
-   contrastcolor=LineColor,
-   display=new,
-   state=start]
-
-\setupinteractionscreen
-  [option=max]
-
-%D Before we come to the real macros, we do a little bit of
-%D tuning.
-
-\setupitemize
-  [1][packed]
-
-\setuptyping
-  [blank=medium]
-
-%D Apart from the titlepage, the page gets a simple colored
-%D background. Later we will activate the background.
-
-\setupbackgrounds
-  [page]
-  [backgroundcolor=PageColor]
-
-%D Everything gets frames by a nice \METAPOST\ frame.
-
-\defineoverlay [background] [\uniqueMPgraphic{background}]
-
-\startuniqueMPgraphic{background}
-  path p ; color c, w, d ;
-  c := \MPcolor{PageColor} ;
-  w := \MPcolor{TextColor} ;
-  d := \MPcolor{LineColor} ;
-  p := unitsquare xscaled OverlayWidth yscaled OverlayHeight ;
-  pickup pencircle scaled (1.5*\FrameSkip) ;
-  draw p withcolor c ;
-  pickup pencircle scaled \FrameSkip ;
-  fill p withcolor w ;
-  draw p withcolor d ;
-\stopuniqueMPgraphic
-
-%D We will present samples and explanation pair||wise, so
-%D we need a hyperlink that skips a page.
-
-\defineoverlay [nextpage]     [\overlaybutton{nextpage}]
-\defineoverlay [previouspage] [\overlaybutton{previouspage}]
-\defineoverlay [skippage]     [\overlaybutton{page(+2)}]
-
-%D Layers are normally used to position multiple content on
-%D a specific overlay. Here we will use them to position
-%D only and since the samples and text will swap place, we
-%D will use quite a few layers.
-
-\defineoverlay [text]   [\composedlayer{text}]
-\defineoverlay [sample] [\composedlayer{sample}]
-\defineoverlay [common] [\composedlayer{common}]
-
-%D There are three positions. When combined, the sample and
-%D text windows overlap, otherwise the lone window is
-%D centered. We could have used one layer and reversed the
-%D order by setting the \type {direction} parameter, but
-%D this approach is more readable.
-
-\definelayer
-  [text]
-  [x=\makeupwidth,y=\makeupheight,location=lt,
-   hoffset=-\FrameSkip,voffset=-\FrameSkip]
-
-\definelayer
-  [sample]
-  [hoffset=\FrameSkip,voffset=\FrameSkip]
-
-\definelayer
-  [common]
-  [x=.5\makeupwidth,y=.5\makeupheight,location=c]
-
-%D The topic is put in the lower right corner of the text
-%D window.
-
-\defineoverlay [topic] [\composedlayer{topic}]
-
-\definelayer
-  [topic]
-  [x=\FrameWidth,y=\FrameHeight,location=lt,
-   hoffset=-\FrameOffset,voffset=-\FrameSkip]
-
-%D The topic is put in a framed box. That way we can make
-%D sure that it gets a background, which looks better when
-%D it covers something else. Otherwise we could have stuct
-%D to:
-%D
-%D \starttyping
-%D \def\Topic#1%
-%D   {\setlayer[topic]{\color[PageColor]{\bfb\setstrut#1}}}
-%D \stoptyping
-%D
-%D But, we go for the nice alternative:
-
-\def\Topic#1%
-  {\doifsomething{#1}
-     {\setlayer [topic]
-        {\bfb\setstrut
-         \inframed
-           [frame=off,foregroundcolor=PageColor,offset=0pt,
-            background=color,backgroundcolor=TextColor]
-           {#1}}}}
-
-%D The sample as well as the explanation will be collected in
-%D a buffer. That way we can reuse the content. We could
-%D have used a box instead, but can we be sure that the content
-%D is not adapting itself? So, buffers we use.
-
-\resetbuffer[sample]
-\resetbuffer[text]
-
-%D Both the sample and explanation are kind of windowed.
-
-\defineframedtext
-  [SampleText]
-  [width=\FrameWidth,height=\FrameHeight,offset=\FrameOffset,
-   frame=off,align=normal,strut=no,before=,after=,
-   background={background,nextpage}]
-
-%D We safe some keying in by combining things in one macro.
-
-\def\DoSampleText#1#2#3% kind layer overlays
-  {\setupframedtexts[SampleText][background={background,#3}]
-   \setlayer[#2]
-     {\startSampleText[none]
-        \setups[#1]
-        \getbuffer[#1]
-      \stopSampleText}}
-
-\def\StartSample{\dostartbuffer[sample][StartSample][StopSample]}
-\def\StartText  {\dostartbuffer[text]  [StartText]  [StopText]}
-
-%D The following definitions apply at the outer level.
-
-\def\StopSample
-  {\startstandardmakeup
-     \DoSampleText{sample}{common}{nextpage}
-   \stopstandardmakeup
-   \resetbuffer[sample]}
-
-\def\StopText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{topic,nextpage}
-   \stopstandardmakeup
-   \resetbuffer[text]}
-
-\setupbackgrounds[page][background={color,nextpage}]
-\setupbackgrounds[text][background=common]
-
-%D When we combine sample and text, we get slightly
-%D different definitions. As you can see we generate two
-%D pages. Watch how we manipulate the order of the
-%D overlays and teh nature of the buttons. Here data
-%D abstraction really pays off.
-
-\def\StartIdea
-  {\bgroup
-   \let\StopSample\relax
-   \let\StopText  \relax}
-
-\def\StopIdea%
-  {\setupbackgrounds[page][background={color,skippage}]
-   \setupbackgrounds[text][background={text,sample}]
-   \startstandardmakeup
-     \DoSampleText{sample}{sample}{previouspage}
-     \DoSampleText{text}  {text}  {topic,nextpage}
-   \stopstandardmakeup
-   \setupbackgrounds[page][background={color,nextpage}]
-   \setupbackgrounds[text][background={sample,text}]
-   \startstandardmakeup
-     \DoSampleText{sample}{sample}{previouspage}
-     \DoSampleText{text}  {text}  {topic,nextpage}
-   \stopstandardmakeup
-   \egroup}
-
-%D The rest of the definitions takes care of the title page.
-%D Please don't steal this one for your own documents.
-
-\defineoverlay[joke] [\useMPgraphic{joke}{n=0}] % not to be changed!
-
-\startuseMPgraphic{joke}{n}
-  StartPage ;
-  path p, q ; numeric w ; pair xy ;
-  set_grid(OverlayWidth,OverlayHeight,OverlayWidth/8,OverlayHeight/8) ;
-  if \MPvar{n}=1 :
-    p := fulldiamond ; fill Page withcolor \MPcolor{TextColor} ;
-  else :
-    p := fullsquare  ; fill Page withcolor \MPcolor{PageColor} ;
-  fi ;
-  forever :
-    xy := center Page randomized (OverlayWidth,OverlayHeight) ;
-    if new_on_grid(xpart xy, ypart xy) :
-      q := (p xyscaled (OverlayWidth/5,OverlayHeight/5))
-           randomized (\FrameSkip,\FrameSkip)
-           shifted xy ;
-      w := (\FrameSkip) randomized (\FrameSkip/2) ;
-      draw q withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ;
-      fill q withcolor \MPcolor{TextColor} ;
-      draw q withcolor \MPcolor{LineColor} withpen pencircle scaled (   w) ;
-    fi ;
-    exitif grid_full ;
-  endfor ;
-  StopPage ;
-\stopuseMPgraphic
-
-\defineoverlay[fuzzy][\useMPgraphic{fuzzy}]
-
-\startuseMPgraphic{fuzzy}
-  path p ; numeric w ;
-  p := (fullsquare xyscaled (OverlayWidth,OverlayHeight))
-       randomized (\FrameSkip,\FrameSkip) ;
-  w := (\FrameSkip) randomized (\FrameSkip/2) ;
-  draw p withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ;
-  fill p withcolor \MPcolor{TextColor} ;
-  draw p withcolor \MPcolor{LineColor} withpen pencircle scaled (   w) ;
-\stopuseMPgraphic
-
-%D This time we use a fit window, but with a slightly randomized
-%D frame, our trademark so to say.
-
-\def\StartTitlePage
-  {\bgroup
-   \setupbackgrounds[page][background={joke,nextpage}]
-   \startstandardmakeup
-   \switchtobodyfont[big]
-   \setupframedtexts
-     [SampleText]
-     [background=fuzzy,
-      foregroundcolor=PageColor,
-      width=fit,
-      height=fit,
-      align=middle]
-   \startSampleText[middle]
-   \bfd\setupinterlinespace
-   \def\\{\bfb\setupinterlinespace\vfil\def\\{\vfil}}}
-
-\def\StopTitlePage
-  {\stopSampleText
-   \stopstandardmakeup
-   \egroup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D Let's nill some error prone presentation macros.
-
-\let\Subject  \Topic
-\let\Topics   \gobbleoneargument
-\let\Subjects \relax
-
-%D We will avoid \quote {overfull} messages.
-
-\dontcomplain
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\setupbodyfont[12pt]
-
-\TitlePage{Quotes, Quotes\\and more quotes}
-
-\StartIdea
-  \StartSample
-    \input knuth \par
-  \StopSample
-  \StartText
-    \Topic{Tufte}
-    \input tufte \par
-  \StopText
- \StopIdea
-
-\StartIdea
-  \StartSample
-    \input materie \par
-  \StopSample
-  \StartText
-    \input reich   \par
-  \StopText
-\StopIdea
-
-\StartText
-  \input tufte \par
-\StopText
-
-\StartIdea
-  \StartSample
-    \input knuth \par
-  \StopSample
-  \StartText
-    \input tufte \par
-  \StopText
-\StopIdea
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-10.tex b/tex/context/modules/common/s-pre-10.tex
deleted file mode 100644
index a92e5af01..000000000
--- a/tex/context/modules/common/s-pre-10.tex
+++ /dev/null
@@ -1,308 +0,0 @@
-%D \module
-%D   [      file=s-pre-10,
-%D        version=unknown,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 10,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This style is derived from the ninth style, which was
-%D used first at \EUROTEX\ 99 and later at \TUG\ 2000. This
-%D alternative build up a page.
-
-\startmode [demo]
-  \disablemode[demo] \usemodule[pre-09] \enablemode[demo]
-\stopmode
-
-\startnotmode [demo]
-  \usemodule[pre-09]
-\stopnotmode
-
-%D We use blue colors instead of yellow ones. Since we have
-%D used symbolic names, we can easily overload the existing
-%D scheme.
-
-\definecolor[LineColor][r=.40,g=.40,b=1.00]
-
-%D Here we don't use fixed dimensions, but fit the sample
-%D windows and derive the text windows's width from this one.
-
-\setupframedtexts
-  [SampleText]
-  [width=fit,height=fit,
-   background={background,nextpage}]
-
-%D The topic goes to the top right corner of the screen which
-%D means that it is positioned left down to the reference
-%D point. Watch how we make data on this layer (here only
-%D the topic but it can be more) persistent.
-
-\setuplayer
-  [topic]
-  [y=0pt,x=\makeupwidth,location=lb,state=repeat,
-   hoffset=-\FrameSkip,voffset=\FrameSkip]
-
-%D Clicking on the page brings us back.
-
-\setupbackgrounds
-  [page]
-  [background={previouspage,color,topic}]
-
-%D All layers end up on the text area. This could have been
-%D the page area too since these have the same dimensions.
-
-\setupbackgrounds
-  [text]
-  [background={common,sample,text}]
-
-%D Because we build up the text window step by step, we will
-%D separate the entries by white space.
-
-\startsetups [always]
-  \setupwhitespace[big]
-  \setupblank[big]
-\stopsetups
-
-%D The \type {\Topic} commands can be simplified to:
-
-\def\Topic#1%
-  {\resetlayer[topic]
-   \setlayer[topic]{\bfb\setstrut\color[TextColor]{#1}}}
-
-%D We also provide a way to erase the topic.
-
-\def\NoTopic
-  {\resetlayer[topic]}
-
-%D We have to redefine the structuring commands to support
-%D the resetting of buffer counters.
-
-\newcounter\TextN
-
-\def\StartSample
-  {\doglobal\newcounter\TextN
-   \dostartbuffer[sample][StartSample][StopSample]}
-
-\def\StartText
-  {\doglobal\newcounter\TextN
-   \dostartbuffer[text][StartText][StopText]}
-
-\def\StartSubText
-  {\doglobal\increment\TextN
-   \dostartbuffer[text-\TextN][StartSubText][StopSubText]}
-
-\def\StopText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{nextpage}
-   \stopstandardmakeup}
-
-\def\StopSubText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{nextpage}
-   \stopstandardmakeup}
-
-%D The \type {\DoSampleText} command is adapted to support
-%D addition of subtexts (each subtext goes into its own
-%D buffer).
-
-\def\DoSampleText#1#2#3%
-  {\setupframedtexts[SampleText][background={background,#3}]
-   \bgroup
-   \setups[#1]%
-   \setups[always]%
-   \setbox\nextbox=\hbox
-     {\startSampleText[none]
-        \getbuffer[#1]\par
-        \doif{#1}{text}
-          {\dorecurse{\TextN}{\getbuffer[text-\recurselevel]\par}}
-      \stopSampleText}
-   \xdef\SampleTextWidth{\the\wd\nextbox}
-   \setlayer[#2]{\box\nextbox}%
-   \egroup}
-
-%D Since we are no longer swapping windows, we end up with a
-%D much simplier \type {\Stopidea} macro. We don't reset
-%D samples at the inner level.
-
-\def\StartIdea%
-  {\bgroup
-   \let\StopSample \relax
-   \let\StopText   \relax
-   \let\StopSubText\relax
-   \def\StartSample{\dostartbuffer[sample][StartSample][StopSample]}}
-
-\def\StopIdea%
-  {\startstandardmakeup
-     \DoSampleText{sample}{sample}{nextpage}
-     \SetTextWidth
-     \DoSampleText{text}  {text}  {nextpage}
-   \stopstandardmakeup
-   \egroup}
-
-%D Here we determine the width of the text window. It is
-%D derived from the width of the sample and stays the same
-%D within a sequence.
-
-\def\SetTextWidth
-  {\ifnum\TextN<1 % yes or no, may change
-     \scratchdimen=\makeupwidth
-     \advance\scratchdimen by -\SampleTextWidth
-     \advance\scratchdimen by  \FrameSkip
-     \xdef\SampleWidth{\the\scratchdimen}%
-   \fi
-   \setupframedtexts
-     [SampleText]
-     [width=\SampleWidth]}
-
-%D We use the (already implemented) second alternative of
-%D the titlepage graphic. Please don't change this.
-
-\defineoverlay[joke] [\useMPgraphic{joke}{n=1}] % not to be changed !
-
-\doifnotmode{demo}{\endinput}
-
-%D The demo section. The original presentation uses proper
-%D graphics and has better spacing.
-
-\def\SomeSymbol#1#2{\definedfont[ContextNavigation at #1]\char#2}
-
-\setupcombinations[distance=\FrameOffset,inbetween=\vskip\FrameOffset]
-
-\starttext
-
-\TitlePage{Some Famous Symbols}
-
-\Topic{Symbols}
-
-\StartSample
-  \startcombination[2*2]
-    {\SomeSymbol{5cm}{1}} {}
-    {\SomeSymbol{5cm}{3}} {}
-    {\SomeSymbol{5cm}{2}} {}
-    {\SomeSymbol{5cm}{4}} {}
-  \stopcombination
-\StopSample
-
-\Topic{Previous}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{7cm}{1}
-  \StopSample
-  \StartText
-    This symbol can be used to indicate a hyperlink to a
-    previous page.
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    As one can expect there is also a symbol for going to
-    the next page.
-  \StopSubText
-\StopIdea
-
-\Topic{Previous}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{9cm}{2}
-  \StopSample
-  \StartText
-     This symbol is actually just a mirrored version of the
-     first symbol we showed.
-  \StopText
-\StopIdea
-
-\NoTopic
-
-\StartText
-  Is this nice or not?
-\StopText
-
-\Topic{First and Last}
-
-\StartSample
-  \SomeSymbol{11cm}{3}
-\StopSample
-
-\StartSample
-  \SomeSymbol{11cm}{4}
-\StopSample
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{5cm}{3}
-  \StopSample
-  \StartText
-    A few screens back, we saw this symbol.
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    This symbol represents the beginning of something.
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{5cm}{4}
-  \StopSample
-  \StartSubText
-    Just like this one represents an end.
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    They look just like the symbols found on audio and
-    video players.
-  \StopSubText
-\StopIdea
-
-\Topic{Summary}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{1}
-  \StopSample
-  \StartText
-    So we have a symbol for previous \unknown
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{2}
-  \StopSample
-  \StartSubText
-    \unknown\ and one for next \unknown
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{3}
-  \StopSample
-  \StartSubText
-    \unknown\ and yet another for first \unknown
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{4}
-  \StopSample
-  \StartSubText
-    \unknown\ and of course for last.
-  \StopSubText
-\StopIdea
-
-\stoptext
-
diff --git a/tex/context/modules/common/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex
deleted file mode 100644
index 551c5ebbc..000000000
--- a/tex/context/modules/common/s-pre-11.tex
+++ /dev/null
@@ -1,220 +0,0 @@
-%D \module
-%D   [      file=s-pre-11,
-%D        version=1999.08.20,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 11,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=0cm,
-   backspace=0cm,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-\setupbodyfont
-  [14.4pt,lbr]
-
-\setupcolors
-  [state=start]
-
-\setupinteraction
-  [click=no,
-   display=new,
-   state=start]
-
-\setupinteractionscreen
-  [option=max]
-
-\def\SomeShape%
-  {\resetMPdrawing
-   \startMPdrawing
-     path p[], q[] ; pair a, b ;
-     StartPage ;
-   \stopMPdrawing
-   \dorecurse{\CurrentTopic}
-     {\startMPdrawing
-        initialize_box(\MPpos{topic-\realfolio-\recurselevel}) ;
-        p[\recurselevel] := tensecircle (wxy,hxy,.25cm) shifted cxy ;
-        fill p[\recurselevel] withcolor .9white  ;
-        pickup pencircle scaled .25cm ;
-        \ifnum\recurselevel=\CurrentTopic\space
-          draw p[\recurselevel] withcolor \MPcolor{ShowColor} ;
-        \else
-          draw p[\recurselevel] withcolor \MPcolor{DoneColor} ;
-        \fi
-      \stopMPdrawing}%
-   \dorecurse{\CurrentMaxItem}
-     {\startMPdrawing
-        initialize_box(\MPpos{item-\realfolio-\recurselevel}) ;
-        linewidth := .25cm ; 
-        q[\recurselevel] := tensecircle (wxy,hxy,linewidth) shifted cxy ;
-        fill q[\recurselevel] withcolor .9white  ;
-        pickup pencircle scaled linewidth ;
-        \ifnum\recurselevel=\CurrentMaxItem\space
-          draw q[\recurselevel] withcolor \MPcolor{ShowColor} ;
-        \else
-          draw q[\recurselevel] withcolor \MPcolor{DoneColor} ;
-        \fi
-      \stopMPdrawing}%
-   \dostepwiserecurse{2}{\CurrentTopic}{1}
-     {\startMPdrawing
-        draw 
-          rt  point 3 of p[\recurselevel-1] -- 
-          lft point 7 of p[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
-      \stopMPdrawing}%
-   \dostepwiserecurse{2}{\CurrentMaxItem}{1}
-     {\startMPdrawing
-        draw 
-          bot point 9 of q[\recurselevel-1] -- 
-          top point 5 of q[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
-      \stopMPdrawing}%
-   \startMPdrawing
-     draw Page 
-       withpen pencircle scaled .5cm
-       withcolor \MPcolor{EdgeColor} ;
-     StopPage ;
-   \stopMPdrawing
-   \MPdrawingdonetrue
-   \getMPdrawing}
-
-\def\TitlePage#1%
-  {\startstandardmakeup
-     \setupalign[middle]
-     \def\\{\vfil\bfb\setupinterlinespace}
-     \bfd\setupinterlinespace
-     \vfil#1\vfil\vfil
-   \stopstandardmakeup}
-
-\definecolor[PageColor][r=.5,g=.4,b=.3]
-\definecolor[LineColor][r=.7,g=.6,b=.5]
-
-\definecolor[PageColor]  [s=.60]
-\definecolor[ShowColor]  [r=.40]
-\definecolor[EdgeColor]  [g=.40]
-\definecolor[DoneColor]  [r=.40,g=.40]
-\definecolor[ArrowColor] [b=.40]
-\definecolor[LineColor]  [r=.60,g=.60]
-\definecolor[GotoColor]  [ArrowColor]
-
-\setupinteraction[color=GotoColor,contrastcolor=GotoColor]
-
-\defineoverlay [shape] [\SomeShape]
-\defineoverlay [next]  [\overlaybutton{forward}] % [{nextpage}]
-
-\setupbackgrounds
-  [page]
-  [background={color,next,shape},
-   backgroundcolor=PageColor]
-
-\doglobal\newcounter\CurrentMaxItem
-\doglobal\newcounter\CurrentItem
-\doglobal\newcounter\CurrentTopic
-
-\def\StartIdea%
-  {\doglobal\newcounter\CurrentItem}
-
-\def\StartTopic%
-  {\doglobal\increment\CurrentTopic
-   \dostartbuffer[topic-\CurrentTopic][StartTopic][StopTopic]}
-
-\def\StopIdea%
-  {\dorecurse{\CurrentItem}
-     {\let\CurrentMaxItem\recurselevel
-      \doStopIdea}}
-
-\def\doStopIdea%
-  {\startstandardmakeup
-   \dontcomplain
-   \vskip.875cm
-   \hbox to \makeupwidth 
-     {\hfill
-      \dorecurse{\CurrentTopic}
-        {\edef\Topic{topic-\realfolio-\recurselevel}%
-         \hpos
-           {\Topic}
-           {\framed
-              [frame=off,align=middle,offset=.25cm]
-              {\getbuffer[topic-\recurselevel]}}%
-         \ifnum\recurselevel<\CurrentTopic
-           \hskip.875cm
-         \fi}%
-      \hfill}
-   \vskip.875cm
-   \vfilll
-   \dorecurse{\CurrentMaxItem}
-     {\edef\Item{item-\realfolio-\recurselevel}
-      \hbox to \makeupwidth 
-        {\hfill
-         \hpos
-           {\Item}
-           {\framed
-              [width=.75\makeupwidth,
-               frame=off,
-               align=middle,offset=.125cm]
-              {\getbuffer[item-\recurselevel]}}%
-          \hfill}
-      \vskip.875cm}
-   \vfilll
-   \stopstandardmakeup}
-
-\def\StartItem%
-  {\doglobal\increment\CurrentItem
-   \dostartbuffer[item-\CurrentItem][StartItem][StopItem]}
-
-\lefthyphenmin =\maxdimen
-\righthyphenmin=\maxdimen
-
-\doifnotmode{demo}{\endinput}
-
-\starttext 
-
-\StartIdea 
-  \StartTopic
-     A Nice Idea
-  \StopTopic
-  \StartItem 
-    \input reich \relax
-  \StopItem 
-  \StartItem 
-    \input reich \relax
-  \StopItem 
-  \StartItem 
-    \input reich \relax
-  \StopItem 
-\StopIdea
-
-\StartIdea 
-  \StartTopic
-     One More Nice Idea
-  \StopTopic
-  \StartItem 
-    \input reich \relax
-  \StopItem 
-  \StartItem 
-    \input reich \relax
-  \StopItem 
-\StopIdea
-
-\StartIdea 
-  \StartTopic
-     The Last Idea
-  \StopTopic
-  \StartItem 
-    \input tufte \relax
-  \StopItem 
-\StopIdea
-
-\stoptext 
diff --git a/tex/context/modules/common/s-pre-14.tex b/tex/context/modules/common/s-pre-14.tex
deleted file mode 100644
index 4dae6c009..000000000
--- a/tex/context/modules/common/s-pre-14.tex
+++ /dev/null
@@ -1,263 +0,0 @@
-%D \module
-%D   [      file=s-pre-14,
-%D        version=1999.08.20,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 14,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D In the process of making a couple of simple styles for
-%D \EUROTEX\ 99, I came to this one. The joke is in the
-%D pagenumber. This style can be used for short presentations
-%D with much text.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D Since we expect text, we can best be very tolerant.
-
-\setuptolerance
-  [verytolerant,stretch]
-
-%D As most styles we choose a large screen page size.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [width=fit,
-   rightedge=3cm,
-   margin=0pt,
-   rightedgedistance=2cm,
-   height=middle,
-   header=0pt,
-   footer=0pt,
-   topspace=1cm,
-   backspace=1cm]
-
-%D We only use two colors, named \type {One} and \type
-%D {Two}:
-
-\setupcolors
-  [state=start]
-
-\definecolor [One] [r=.6,g=.4,b=.4]
-\definecolor [Two] [r=.4,g=.6,b=.6]
-
-%D If you've looked at the demo file, you will have noticed
-%D that the background consists of four pieces: two filled
-%D rectangles and two half numbers. These are put on th epage
-%D using four overlays:
-
-\setupbackgrounds
-  [page]
-  [background={one,two,three,four}]
-
-%D When we code this in \TEX, we get the following
-%D definitions. As an alternative we coudl have used layers
-%D but I'm afraid that it would not have led to less code.
-
-\defineoverlay
-  [one]
-  [{\framed
-     [frame=off,background=color,backgroundcolor=Two,
-      width=\overlaywidth,height=\overlayheight]
-     {}}]
-
-\defineoverlay
-  [three]
-  [{\hbox to \overlaywidth
-      {\hfill\SetOverlayWidth
-       \framed
-         [frame=off,background=color,backgroundcolor=One,
-          width=\overlaywidth,height=\overlayheight]
-         {}}}]
-
-%D We could have used the main backgroundcolor instead of
-%D overlay \type {one}.
-
-\definefont[NumberFont][RegularBold at 3cm]
-
-\defineoverlay
-  [two]
-  [{\framed
-     [frame=off,width=\overlaywidth,height=\overlayheight,
-      offset=overlay]
-     {\vfill
-      \NumberFont\setstrut\SetOverlayWidth
-      \hbox to \hsize
-         {\hfill
-          \setupinteraction[style=,color=]%
-          \setbox0=\hbox{\strut\One\pagenumber}%
-          \hbox to 0pt{\hss\gotobox{\box0}[previouspage]\hss}%
-          \hskip\overlaywidth}}}]
-
-\defineoverlay
-  [four]
-  [{\framed
-     [frame=off,width=\overlaywidth,height=\overlayheight,offset=overlay]
-     {\vfill
-      \hbox to \hsize
-        {\hfill
-         \SetOverlayWidth
-         \framed
-           [frame=off,width=\overlaywidth,height=\overlayheight,offset=overlay]
-           {\vfill\NumberFont\setstrut
-            \setbox0=\hbox{\strut\Two\pagenumber}%
-            \setbox2=\hbox{\clip[nx=2,ny=1,x=2,y=1]{\copy0}}%
-            \dp2=\dp0
-            \hbox to \hsize{\hbox to 0pt{\hss\hskip.5\wd0\box2\hss}\hfill}}}}}]
-
-\def\SetOverlayWidth%
-  {\scratchdimen         =  \rightedgedistance
-   \divide\scratchdimen  by 2
-   \advance\scratchdimen by \rightedgewidth
-   \advance\scratchdimen by \backspace
-   \edef\overlaywidth{\the\scratchdimen}}
-
-%D A much cleaner implementation is the following. If you hate
-%D \METAPOST, you can run this style in the specified mode:
-
-\startnotmode[no-metapost]
-
-\setupbackgrounds
-  [page]
-  [background={number}]
-
-\defineoverlay[number][\useMPgraphic{number}]
-
-\startuseMPgraphic{number}
-  StartPage ;
-    path Vage ; picture Left, Right ;
-    x1 = x2 = xpart (llcorner Field[Text][RightEdge] shifted (-RightEdgeDistance/2,0)) ;
-    y1 = ypart llcorner Page ;
-    y2 = ypart ulcorner Page ;
-    Vage := llcorner Page -- z1 -- z2 -- ulcorner Page -- cycle ;
-    fill Page withcolor \MPcolor {One} ;
-    fill Vage withcolor \MPcolor {Two} ;
-    if PageNumber>0 :
-      defaultfont  := "\truefontname{RegularBold}" ;
-      Left := Right := thelabel("\folio",origin) ysized 3cm ;
-      clip Right to boundingbox Right shifted (bbwidth(Right)/2,0) ;
-      draw Left  shifted z1 shifted (0,2.25cm) withcolor \MPcolor {One} ;
-      draw Right shifted z1 shifted (0,2.25cm) withcolor \MPcolor {Two} ;
-    fi ;
-  StopPage ;
-\stopuseMPgraphic
-
-\stopnotmode
-
-%D We use the simple label typesetting present in \METAPOST\
-%D because digits are seldom kerned so real \TEX ing is not
-%D needed. As in the previous method, we let the graphics
-%D overlap so that we don't get white lines due to rounding
-%D problems in viewers.
-%D
-%D We put a  button behind the text (this overlay is calculated
-%D each page).
-
-\defineoverlay
-  [nextpage]
-  [\overlaybutton{nextpage}]
-
-\setupbackgrounds
-  [text]
-  [backgroundoffset=.5cm,
-   background=nextpage]
-
-%D We still have to turn on interaction mode.
-
-\setupinteraction
-  [state=start,
-   display=new,
-   menu=on]
-
-\setupinteraction
-  [color=,
-   contrastcolor=]
-
-%D Next we define structuring commands.
-
-\definehead[Topic]  [chapter] \setuphead[Topic]  [style=\bfc]
-\definehead[Subject][section] \setuphead[Subject][style=\bfa]
-
-\setuphead
-  [Topic, Subject]
-  [number=no,
-   after={\blank[big]}]
-
-%D Because we will provide a menu, we don't offer lists.
-
-\let\Topics  \gobbleoneargument
-\let\Subjects\relax
-
-%D The table of contents goes to the right edge.
-
-\startinteractionmenu[right]
-  \setupinteraction
-    [color=black,
-     contrastcolor=Two]
-  \placelist
-    [Topic]
-    [alternative=e,
-     frame=off,
-     criterium=all]
-  \vfill
-\stopinteractionmenu
-
-\setuplist
-  [Topic]
-  [width=\rightedgewidth,
-   maxwidth=\rightedgewidth,
-   style=\bfa]
-
-%D We safe some space:
-
-\setupwhitespace
-  [medium]
-
-\setupblank
-  [medium]
-
-%D In the titlepage, we still use the \TEX\ overlays,
-%D so that we don't have to define a second graphic.
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-\def\StartTitlePage%
-  {\bgroup
-   \setupbackgrounds[page][background={one,three}]
-   \startstandardmakeup
-     \setupalign[middle]
-     \def\\{\vfil\bfb\setupinterlinespace}
-     \bfd\setupinterlinespace
-     \vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup
-   \egroup}
-
-%D This is it.
-
-\doifnotmode{demo}{\endinput}
-
-\starttext
-
-\TitlePage{Some Quotes\\(that you probably know by now)}
-
-\Topic{Tufte}   \input tufte
-\Topic{Knuth}   \input knuth
-\Topic{Reich}   \input reich
-\Topic{Zapf}    \input zapf
-\Topic{Materie} \input materie
-%Topic{Stork}   \input stork
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-15.tex b/tex/context/modules/common/s-pre-15.tex
deleted file mode 100644
index 25fb35783..000000000
--- a/tex/context/modules/common/s-pre-15.tex
+++ /dev/null
@@ -1,186 +0,0 @@
-%D \module
-%D   [      file=s-pre-15,
-%D        version=1999.09.01, 
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 15,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This is one of the styles I made for the presentation on 
-%D the \NTS\ project at Euro\TeX\ 1998. You need balls to let
-%D \TEX\ typeset graphics, but this style demonstrates that it 
-%D can be done. 
-%D 
-%D This presentation is meant for presentations that build up
-%D an idea stepwise. 
-%D 
-%D \starttyping
-%D \TitlePage{Do you know \TEX ?}
-%D 
-%D \StartIdea
-%D   \StartItem We use \TEX\ for typesetting       \unknown \StopItem
-%D   \StartItem mathematical text                  \unknown \StopItem
-%D   \StartItem but also for text that has no math \unknown \StopItem
-%D   \StartItem or presentations like this         \unknown \StopItem
-%D   \StartItem and whatever you can come up with!          \StopItem
-%D \StopIdea
-%D \stoptyping 
-
-%D The basic layout is rather simple and used as much of the 
-%D screen as possible. 
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [backspace=25pt,
-   topspace=25pt,
-   width=middle,
-   height=middle,
-   header=0pt,
-   footer=0pt]
-
-\setupinteraction
-  [state=start,
-   display=new,
-   color=LineColor, 
-   contrastcolor=LineColor,
-   click=no]
-  
-\setupinteractionscreen
-  [option=max]
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D We use a lot of color. You can remap them if you want 
-%D differend ones. The ideas circulate over the colors. 
-
-\setupcolors
-  [state=start]
-
-\definecolor[TextColor][s=.8]
-\definecolor[PageColor][s=.6]
-\definecolor[LineColor][s=.4]
-
-\definecolor[red]  [r=.4]        \definecolor[cyan]   [g=.4,b=.4]
-\definecolor[green][g=.4]        \definecolor[magenta][r=.4,b=.4]
-\definecolor[blue] [b=.4]        \definecolor[yellow] [r=.4,g=.4]
-
-\definecolor[linecolor 1][red]   \definecolor[linecolor 5][cyan]    
-\definecolor[linecolor 2][green] \definecolor[linecolor 6][magenta] 
-\definecolor[linecolor 3][blue]  \definecolor[linecolor 4][yellow]  
-
-%D We use variables to make sure that the graphics are reused 
-%D but unique.  
-
-\setupMPvariables[pageframe][pagecolor=PageColor,linecolor=LineColor]
-\setupMPvariables[textframe][textcolor=TextColor,linecolor=LineColor]
-
-\setupbackgrounds
-  [page]
-  [background={pageframe,nextpage}]
-
-\defineoverlay [pageframe] [\uniqueMPgraphic{pageframe}]
-\defineoverlay [textframe] [\uniqueMPgraphic{textframe}]
-\defineoverlay [nextpage]  [\overlaybutton{forward}]
-
-\startuniqueMPgraphic{pageframe}{pagecolor,linecolor}
-  path p ; p := fullsquare xyscaled (\overlaywidth,\overlayheight) ;
-  pickup pencircle scaled 10pt ; 
-  fill p withcolor \MPvar{pagecolor} ; 
-  draw p withcolor \MPvar{linecolor} ; 
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{textframe}{textcolor,linecolor}
-  path p ; p := fullcircle xyscaled (\overlaywidth,\overlayheight) ;
-  pickup pencircle scaled 10pt ; 
-  fill p withcolor \MPvar{textcolor} ; 
-  draw p withcolor \MPvar{linecolor} ; 
-\stopuniqueMPgraphic
-
-%D The rest of the file implements the nasty part: typesetting
-%D text embedded in a graphic. The text is collected in a box
-%D so that we can reuse it. 
-
-\newbox\CollectedIdeas
-\newcounter\CurrentTopic
-
-\def\StartItem% 
-  {\setbox\CollectedIdeas=\hbox\bgroup
-     \ifdim\wd\CollectedIdeas>0pt \unhbox\CollectedIdeas\hskip25pt \fi
-     \setbox\scratchbox=\hbox\bgroup
-       \framed      
-         [width=160pt,height=160pt,align=middle,frame=off,
-          background=textframe,offset=15pt,top=\vfill,bottom=\vfill]
-        \bgroup}
-
-\def\StopItem% 
-  {\egroup
-   \egroup
-   \setbox\scratchbox=\hbox{\lower.5\ht\scratchbox\box\scratchbox}%
-   \ht\scratchbox=.5\ht\scratchbox
-   \dp\scratchbox=  \ht\scratchbox
-   \box\scratchbox
-   \egroup
-   \startstandardmakeup
-     \dontcomplain
-     \leftskip       0pt plus 50pt
-     \rightskip      0pt plus 50pt
-     \parfillskip    0pt
-     \baselineskip 100pt 
-     \unhcopy\CollectedIdeas
-   \stopstandardmakeup}
-
-\def\StartIdea%
-  {\ifnum\CurrentTopic=6 \doglobal\newcounter\CurrentTopic \fi 
-   \doglobal\increment\CurrentTopic
-   \definecolor[LineColor][linecolor \CurrentTopic]
-   \setbox\CollectedIdeas=\null}
-
-\def\StopIdea%
-  {}
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \setupalign[middle]
-   \def\\{\vfil\bfb\setupinterlinespace}
-   \bfd\setupinterlinespace
-   \vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-\doifnotmode{demo}{\endinput}
-
-%D A simple test on functionality. 
-
-\setupoutput[pdftex]
-
-\starttext 
-
-\TitlePage{Do you know \TEX ?}
-
-\startbuffer 
-\StartIdea
-  \StartItem We use \TEX\ for typesetting       \unknown \StopItem
-  \StartItem mathematical text                  \unknown \StopItem
-  \StartItem but also for text that has no math \unknown \StopItem
-  \StartItem or presentations like this         \unknown \StopItem
-  \StartItem and whatever you can come up with!          \StopItem
-\StopIdea
-\stopbuffer
-
-\dorecurse{6}{\getbuffer}
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-19.tex b/tex/context/modules/common/s-pre-19.tex
deleted file mode 100644
index 991d311ce..000000000
--- a/tex/context/modules/common/s-pre-19.tex
+++ /dev/null
@@ -1,347 +0,0 @@
-%D \module
-%D   [      file=s-pre-19,
-%D        version=2000.07.31,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 19,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This style is made in the process or writing the \METAFUN\
-%D manual. It exploits a few tricks, like graphics calculated
-%D using positional information. It also uses the (at that
-%D moment) new menu list placement alternative. If you forget
-%D about the definition of the button shapes, which is
-%D complicated in any system, this style is not even that hard
-%D to follow. Watch how the left side of the buttons follow
-%D the right side of the text graphic.
-%D
-%D While playing bit with this style, the random alternative
-%D made me think of those organic building with non equal
-%D windows (we have a few in The Netherlands), so I decided to
-%D label this style as \type {pre-organic}.
-%D
-%D At the end of this file, there is a small test file, so
-%D when you process this file with \TEXEXEC\ and the options
-%D \type {--mode=demo} and \type {--pdf}, you will get a demo
-%D document.
-
-%D We use one of the standard screen \quote {paper} sizes, and
-%D map it onto the same size, so that we get a nicely cropped
-%D page.
-
-\setuppapersize
-  [S6][S6]
-
-%D Like in the \METAFUN\ manual, we use the Palatino as main
-%D bodyfont. This font is quite readable on even low
-%D resolution screens, although I admit that this style is
-%D developed using an $1400\times1050$ pixel LCD screen, so I
-%D may be biased.
-
-%\startmode[asintended] \setupbodyfont[ppl] \stopmode
-
-%D The layout specification sets up a text area and a right
-%D edge area where the menus will go. Watch the rather large
-%D edge distance. By setting the header and footer dimensions
-%D to zero, we automatically get rid of page body ornaments,
-%D like the pagenumber.
-
-\setuplayout
-  [topspace=48pt,
-   backspace=48pt,
-   cutspace=12pt,
-   width=400pt,
-   margin=0cm,
-   rightedge=88pt,
-   rightedgedistance=48pt,
-   header=0cm,
-   footer=0cm,
-   height=middle]
-
-%D We use a moderate, about a line height, interparagraph
-%D white space.
-
-\setupwhitespace
-  [big]
-
-%D Of course we use colors, since on computer displays they
-%D come for free.
-
-\setupcolors
-  [state=start]
-
-\definecolor [red]    [r=.75]
-\definecolor [yellow] [r=.75,g=.75]
-\definecolor [gray]   [s=.50]
-\definecolor [white]  [s=.85]
-
-\definecolor [PageColor]        [yellow]
-\definecolor [TextColor]        [white]
-\definecolor [OrnamentColor]    [red]
-\definecolor [InteractionColor] [red]
-\definecolor [ContrastColor]    [gray]
-
-%D This is an interactive document, so we enable interaction.
-%D In this style, we disable the viewer's \quote {highlight a
-%D hyperlink when it's clicked on} feature. We will use a
-%D menu, so we enable menus. Later we will see the contract
-%D color |<|hyperlinks gets that color when we are already on
-%D the location|>| in action.
-
-\setupinteraction
-  [state=start,
-   click=off,
-   color=InteractionColor,
-   contrastcolor=ContrastColor,
-   menu=on]
-
-%D The menu itself is set up as follows. Because we will
-%D calculate menubuttons based on their position on the page,
-%D we have to keep track of the positions. Therefore, we set
-%D the \type {position} variable to \type {yes}.
-
-\setupinteractionmenu
-  [right]
-  [frame=off,
-   position=yes,
-   align=middle,
-   topoffset=-.75cm,
-   bottomoffset=-.75cm,
-   color=gray,
-   contrastcolor=gray,
-   style=bold,
-   before=,
-   after=]
-
-%D The menu content is rather sober: a list of topics (later
-%D we will define the command that generates topic entries),
-%D and a close button.
-
-\startinteractionmenu[right]
-  \placelist[Topic][alternative=right]
-  \vfill
-  \but [CloseDocument] close \\
-\stopinteractionmenu
-
-%D We have now arived at the more interesting part of the style
-%D definition: the graphic that goes in the page background.
-%D Because this graphic will change, we define a usable
-%D \METAPOST\ graphic. Page backgrounds are recalculated each
-%D page, opposite to the other backgrounds that are calculated
-%D when a new background is defined, or when repetitive
-%D calculation is turned on.
-
-\setupbackgrounds
-  [page]
-  [background=page]
-
-\defineoverlay
-  [page]
-  [\useMPgraphic{page}]
-
-\setupMPvariables
-  [page]
-  [alternative=3]
-
-\startuseMPgraphic{page}
-
-  \includeMPgraphic{rightsuperbutton}
-
-  StartPage ;
-
-    path p, q ; pickup pencircle scaled 3pt ;
-
-    p := Field[Text][Text] enlarged 36pt superellipsed .90 ;
-
-    fill Page withcolor \MPcolor{PageColor} ;
-    fill p    withcolor \MPcolor{TextColor} ;
-    draw p    withcolor \MPcolor{OrnamentColor} ;
-
-    p := Field[Text][Text] enlarged 48pt superellipsed .90 ;
-
-    def right_menu_button (expr nn, rr, pp, xx, yy, ww, hh, dd) =
-      if (pp>0) and (rr>0) :
-        q := rightsuperbutton(p,xx,yy,RightEdgeWidth,hh) ;
-        fill q withcolor \MPcolor{TextColor} ;
-        draw q withcolor if rr=2 : \MPcolor{ContrastColor}
-                            else : \MPcolor{InteractionColor} fi ;
-      fi ;
-    enddef ;
-
-    \MPmenubuttons{right}
-
-  StopPage ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{page}
-
-  \includeMPgraphic{rightsuperbutton}
-
-  StartPage ;
-
-    numeric alternative, seed, superness, squeezeness, randomness ;
-    path p, q ; transform t ;
-
-    alternative := \MPvar{alternative} ;
-    seed        := uniformdeviate 100 ;
-
-    if alternative > 10 :
-      superness   := .85  + ((\realfolio-1)/\lastpage) * .15 ;
-      squeezeness := 12pt - ((\realfolio-1)/\lastpage) * 10pt ;
-    else :
-      superness   := .90 ;
-      squeezeness := 12pt ;
-    fi ;
-
-    randomness := squeezeness ;
-
-    alternative := alternative mod 10 ;
-
-    t := identity if alternative=3: shifted (9pt,-9pt) fi ;
-
-    % first we draw the shape that surrounds the text
-
-    randomseed := seed ;
-
-    p := Field[Text][Text] enlarged if
-      alternative = 1 : 36pt superellipsed superness   elseif
-      alternative = 2 : 36pt squeezed      squeezeness elseif
-      alternative = 3 : 36pt randomized    randomness  else
-                      : 36pt                           fi ;
-    pickup pencircle scaled 3pt ;
-
-    fill Page withcolor \MPcolor{PageColor} ;
-    fill p    withcolor \MPcolor{TextColor} ;
-    draw p    withcolor \MPcolor{OrnamentColor} ;
-
-    % we set p to the wider shape from which we will chip off pieces
-
-    randomseed := seed ;
-
-    p := ( Field[Text][Text] enlarged if
-      alternative = 1 : 48pt superellipsed superness   elseif
-      alternative = 2 : 48pt squeezed      squeezeness elseif
-      alternative = 3 : 36pt randomized    randomness  else
-                      : 48pt                           fi ) transformed t ;
-
-    % calls to *_menu_button are generated automatically ...
-
-    vardef right_menu_button (expr nn, rr, pp, xx, yy, ww, hh, dd) =
-      save q ; path q ;
-      if (pp>0) and (rr>0) :
-        q := rightsuperbutton(p,xx,yy,RightEdgeWidth,hh) ; % \MPw{menu:right:\realfolio}
-        fill q withcolor \MPcolor{TextColor} ;
-        draw q withcolor if rr=2 : \MPcolor{ContrastColor}
-                            else : \MPcolor{InteractionColor} fi ;
-      fi ;
-    enddef ;
-
-    % ... and inserted when the graphic data is flushed here ...
-
-    \MPmenubuttons{right}
-
-  StopPage ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{rightsuperbutton}
-
-vardef rightsuperbutton (expr pat, xpos, ypos, wid, hei) =
-
-  save p, ptop, pbot, t, b, edge, shift, width, height ;
-  path p, ptop, pbot ; pair t, b ; numeric edge, shift, width, height ;
-
-  edge  := xpos + wid ; shift := ypos + hei ;
-
-  p := rightpath pat ;
-
-  ptop := ((-infinity,shift)--(edge,shift)) ;
-  pbot := ((-infinity,shift-hei)--(edge,shift-hei)) ;
-
-  t := p intersection_point ptop ;
-  b := p intersection_point pbot ;
-
-  p := subpath(0,xpart (p intersectiontimes ptop)) of p ;
-  p := subpath(xpart (p intersectiontimes pbot),length(p)) of p ;
-
-  (p --               t -- point 1 of ptop &
-        point 1 of ptop -- point 1 of pbot &
-        point 1 of pbot -- b
-     -- cycle)
-
-enddef ;
-
-\stopuseMPgraphic
-
-%D Topics are identified with \type {\Topic}, which is an
-%D instance of chapter headings. The number is made invisible.
-%D Since it still is a numbered section header, \CONTEXT\ will
-%D write the header to the table of contents.
-
-\definehead
-  [Topic]
-  [chapter]
-
-\setuphead
-  [Topic]
-  [number=no]
-
-%D We will use a bold font in the table of contents. We also
-%D force a complete list.
-
-\setuplist
-  [Topic]
-  [criterium=all,
-   style=bold,
-   before=,
-   after=]
-
-%D The \type {\TitlePage} macro looks horrible, because we
-%D want to keep the interface simple: a list of small
-%D sentences, separated by \type {\\}.
-
-\def\StartTitlePage
-  {\startstandardmakeup
-     \switchtobodyfont[big]
-     \def\\{\vfill\bfb\let\\=\par}
-     \bfd\setupinterlinespace\gray
-     \vskip.5cm}
-
-\def\StopTitlePage
-  {\\\vskip.5cm  % the \\ is really needed
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D A couple of goodies:
-
-\def\Subject   {\Topic}
-\def\Topics  #1{}
-\def\Subjects  {}
-
-%D For those who want to test:
-
-\doifnotmode{demo}{\endinput}
-
-\starttext
-
-\setupMPvariables[page][alternative=3]
-
-\TitlePage
-  {A Few Nice Quotes\\
-   A Simple Style Demo\\
-   Hans Hagen, August 2000}
-
-
-\Topic {Douglas R. Hofstadter} \input douglas \page
-\Topic {Donald  E. Knuth}      \input knuth   \page
-\Topic {Edward  R. Tufte}      \input tufte   \page
-\Topic {Hermann    Zapf}       \input zapf    \page
-%Topic {David   F. Stork}      \input stork   \page
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-61.tex b/tex/context/modules/common/s-pre-61.tex
deleted file mode 100644
index 48b9d09a0..000000000
--- a/tex/context/modules/common/s-pre-61.tex
+++ /dev/null
@@ -1,275 +0,0 @@
-%D \module
-%D   [      file=s-pre-61,
-%D        version=2004.03.15,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 61,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Optima
-
-\usemodule[pre-60]
-
-\doifmodeelse {mkiv} {
-    \usetypescriptfile[ghz]
-    \definetypeface[mainface][ss][sans][optima-nova][default]
-} {
-    \usetypescriptfile[type-ghz]
-    \definetypeface[mainface][ss][sans][optima-nova][default][encoding=\defaultencoding]
-}
-
-\setupbodyfont[mainface,ss,18pt]
-\setupinterlinespace[line=3.25ex]
-
-\setuppapersize
-  [S6][S6]
-
-% \setuppapersize
-%   [SW][SW]
-
-\setuplayout
-  [topspace=10pt,
-   header=30pt,
-   headerdistance=20pt,
-   height=middle,
-   footerdistance=20pt,
-   footer=0pt,
-   bottomdistance=20pt,
-   bottom=20pt,
-   bottomspace=50pt,
-   backspace=30pt,
-   width=middle]
-
-\setupinteraction
-  [state=start,
-   click=off,
-   menu=on,
-   style=,
-   color=interactioncolor,
-   contrastcolor=interactioncolor]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupinteractionmenu
-  [bottom]
-  [color=maincolor,
-   contrastcolor=maincolor,
-   style=\tfa, % acceptable
-   left=\hfill,
-   middle=,
-   right=,
-   height=\bottomheight,
-   width=2\bottomheight,
-   offset=overlay,
-   frame=off]
-
-\startinteractionmenu[bottom]
-  \but [firstpage]               \symbol[firstpage]      \\
-  \but [previouspage]            \symbol[previouspage]   \\
-  \but [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \\
-  \but [nextpage]                \symbol[nextpage]       \\
-  \but [lastpage]                \symbol[lastpage]       \\
-  \but [CloseDocument]           \symbol[CloseDocument]  \\
-\stopinteractionmenu
-
-% maybe in colo-sjk : \setupcolor[sjk]
-
-\definecolor [dark]   [s=.4]
-\definecolor [bright] [s=.9]
-
-\definecolor [red]    [r=.4,g=.2,b=.2]
-\definecolor [green]  [r=.2,g=.4,b=.2]
-\definecolor [blue]   [r=.2,g=.2,b=.4]
-
-\definecolor [cyan]   [r=.2,g=.4,b=.4]
-\definecolor [magenta][r=.4,g=.2,b=.4]
-\definecolor [yellow] [r=.4,g=.4,b=.2]
-
-\definecolor [pagecolor] [dark]
-\definecolor [maincolor] [bright]
-\definecolor [textcolor] [red]
-
-\definecolor [interactioncolor] [r=.8,g=.8,b=.6]
-
-\setupcolors
-  [state=start,
-   textcolor=maincolor]
-
-\setupbackgrounds
-  [page]
-  [background=page,
-   backgroundcolor=textcolor]
-
-\setupbackgrounds
-  [text]% [text]
-  [background={comments,text,invoke}]
-
-\definelayer
-  [text]
-  [width=\textwidth,
-   height=\textheight]
-
-\defineoverlay
-  [comments]
-  [{\setlayer[text][preset=middle]{\placecomments}}]
-
-\defineoverlay[page][\uniqueMPgraphic{page-\ifcase\realpageno\or one\else plus\fi}]
-
-\startuniqueMPgraphic{page-one}
-  StartPage ;
-    fill Page
-      enlarged 4pt
-      withcolor \MPcolor{pagecolor} ;
-    fill Field[Text][Text]
-      enlarged 10pt
-%       topenlarged   (HeaderHeight+HeaderDistance)
-      leftenlarged  (BackSpace+4pt)
-      rightenlarged (CutSpace +4pt)
-      withcolor OverlayColor ;
-  StopPage ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{page-plus}
-  StartPage ;
-    fill Page
-      enlarged 4pt
-      withcolor \MPcolor{pagecolor} ;
-    fill Field[Text][Text]
-      enlarged 10pt
-      leftenlarged  (BackSpace+4pt)
-      rightenlarged (CutSpace+4pt)
-      withcolor OverlayColor ;
-  StopPage ;
-\stopuniqueMPgraphic
-
-% this needs to be sorted out !
-
-\appendtoks
-    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
-    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
-    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-\to \everystarttext
-
-\appendtoks
-    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
-    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
-    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-\to \everystoptext
-
-\setuphead
-  [chapter]
-  [placehead=empty,
-   after={\blank[medium]},
-   color=maincolor,
-   placenumber=no,
-   style=\HeadFont]
-
-\setupheadertexts
-  [\doiftextelse{\currentheadnumber}{\placeheadtext[Topic]}{\placeheadtext[Nopic]}]
-  []
-
-\setuppagenumbering
-  [location=]
-
-\definesymbol
-  [emdash]
-  [\emdash]
-
-\setupitemize
-  [each]
-  [loose,serried,joinedup,broad]
-  [symbol=emdash]
-
-\setupalign
-  [broad,right]
-
-\def\doTitlePage#1#2#3%
-  {\startstandardmakeup[headerstate=high]
-     \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
-     #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage   {\doTitlePage\TitleFont\relax}
-\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont}
-
-\definehead[Topic][chapter]
-\definehead[Nopic][title]
-
-\def\Topics#1%
-  {\Nopic[topics]{#1}
-   \startcolumns
-     \placelist[Topic]
-   \stopcolumns}
-
-\setuplist
-  [Topic]
-  [alternative=f,
-   color=maincolor,
-   contrastcolor=maincolor,
-   criterium=all]
-
-\defineoverlay[topics][\overlaybutton{topics}]
-
-\setupbackgrounds
-  [bottom] [text]
-  [background=topics]
-
-\continueifinputfile{s-pre-61.tex}
-
-\starttext
-
-\TitlePage{Stepwise\\Refinement}
-
-\Topics{Topics}
-
-\Topic{Female Artists}
-
-\StartSteps
-
-\startitemize
-\item Fiona Apple \FlushStep
-\item Tori Amos \FlushStep
-\item Kate Bush \FlushStep
-\item Heather Nova \FlushStep
-\item Alanis Morissette \FlushStep
-\item Suzanne Vega \FlushStep
-\stopitemize
-
-\StopSteps
-
-\Topic{Male Composers}
-
-\StartSteps
-
-\startitemize
-\item John Adams \FlushStep
-\item Steve Reich \FlushStep
-\item Louis Andriessen \FlushStep
-\item Olivier Messiaen \FlushStep
-\stopitemize
-
-\StopSteps
-
-\Topic{And Some More}
-
-\StartSteps
-
-\startitemize
-\item Mark Hollis   \FlushStep
-\item Roger Waters  \FlushStep
-\item David Gilmore \FlushStep
-\item Peter Gabriel \FlushStep
-\item Randy Newman  \FlushStep
-\stopitemize
-
-\StopSteps
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-62.tex b/tex/context/modules/common/s-pre-62.tex
deleted file mode 100644
index a1a405c23..000000000
--- a/tex/context/modules/common/s-pre-62.tex
+++ /dev/null
@@ -1,224 +0,0 @@
-%D \module
-%D   [      file=s-pre-62,
-%D        version=2005.03.04,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 62,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Melior
-
-\usemodule[pre-60]
-
-\usetypescriptfile
-  [type-ghz]
-
-\doifmodeelse {mkiv} {
-
-    \definetypeface[mainface][rm][serif][melior]  [default]
-    \definetypeface[mainface][tt][mono] [modern]  [default][rscale=1.05]
-    \definetypeface[mainface][ss][serif][melior]  [default]
-    \definetypeface[mainface][mm][math] [palatino][default][rscale=0.95]
-
-} {
-
-    \definetypeface[mainface][rm][serif][melior]  [default][encoding=texnansi]
-    \definetypeface[mainface][tt][mono] [modern]  [default][encoding=texnansi,rscale=1.05]
-    \definetypeface[mainface][ss][serif][melior]  [default][encoding=texnansi]
-    \definetypeface[mainface][mm][math] [palatino][default][encoding=texnansi,rscale=0.95]
-
-}
-
-\setupbodyfont
-  [mainface,14.4pt]
-
-\setuppapersize
-  [S6][S6]
-
-\setvariables[layout][dx=0,dy=1,nx=2,ny=2,step=64]
-
-\definemeasure[layoutwd][\dimexpr\paperwidth /\getvariable{layout}{step}\relax]
-\definemeasure[layoutht][\dimexpr\paperheight/\getvariable{layout}{step}\relax]
-
-\setuplayout
-  [      width=middle,
-        height=middle,
-        header=0pt,
-        footer=0pt,
-        margin=0pt,
-     backspace=5\measure{layoutwd},
-      topspace=5\measure{layoutht}]
-
-\definelayout
-  [step]
-  [  backspace=\numexpr2+                         \getvariable{layout}{dx}\relax\measure{layoutwd},
-      cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measure{layoutwd},
-      topspace=\numexpr2+                         \getvariable{layout}{dy}\relax\measure{layoutht},
-   bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measure{layoutht}]
-
-\definecolor[layout:left]  [t=.5,a=1,b=1]
-\definecolor[layout:right] [t=.5,a=1,r=1]
-\definecolor[layout:top]   [t=.5,a=1,g=1]
-\definecolor[layout:bottom][t=.5,a=1,y=1]
-\definecolor[layout:page]  [s=.75]
-
-\definehspace[menu][\measure{layoutwd}]
-
-\setupinteraction
-  [state=start,
-   click=off,
-   style=,
-   color=interactioncolor,
-   contrastcolor=interactioncolor]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupbuttons
-  [color=maincolor,
-   contrastcolor=maincolor,
-   style=\tf, % acceptable
-   height=2\measure{layoutht},
-   width=2\measure{layoutwd},
-   offset=overlay,
-   frame=off]
-
-\definecolor[interactioncolor][darkgray]
-\definecolor[maincolor]       [lightgray]
-
-\setuptexttexts
-  []
-  [\vbox to \textheight{\vfill\hfill\setups{menu:content}}]
-
-\startsetups menu:content
-
-  \button{\symbol[firstpage]}[firstpage]
-  \hspace[menu]
-  \button{\symbol[previouspage]}[previouspage]
-  \hspace[menu]
-  \button{\StartBusy\symbol[PauseRendering]\StopBusy}[InvokeStepper]
-  \hspace[menu]
-  \button{\symbol[nextpage]}[nextpage]
-  \hspace[menu]
-  \button{\symbol[lastpage]}[lastpage]
-  \hspace[menu]
-  \button{\symbol[CloseDocument]}[CloseDocument]
-
-\stopsetups
-
-\startuseMPgraphic{page}{step}
-  StartPage ;
-    numeric dx, dy ; dx := PaperWidth/\MPvar{step} ; dy := PaperHeight/\MPvar{step} ;
-    fill Page withcolor .5white ;
-    fill
-      ulcorner Page -- urcorner Page --
-      urcorner Page shifted (0,-TopSpace+dy) -- ulcorner Page shifted (0,-TopSpace+dy) -- cycle
-      withcolor \MPcolor{layout:top} ;
-    fill
-      llcorner Page -- lrcorner Page --
-      lrcorner Page shifted (0,BottomSpace-dy) -- llcorner Page shifted (0,BottomSpace-dy) -- cycle
-      withcolor \MPcolor{layout:bottom} ;
-    fill
-      ulcorner Page -- llcorner Page --
-      llcorner Page shifted (BackSpace-dx,0) -- ulcorner Page shifted (BackSpace-dx,0) -- cycle
-      withcolor \MPcolor{layout:left} ;
-    fill
-      urcorner Page -- lrcorner Page --
-      lrcorner Page shifted (-CutSpace+dx,0) -- urcorner Page shifted (-CutSpace+dx,0) -- cycle
-      withcolor \MPcolor{layout:right} ;
-    fill Field[Text][Text] enlarged (dx,dy) withcolor white ;
-    fill Field[Text][Text] enlarged (dx,dy) withcolor \MPcolor{layout:page} ;
-  StopPage ;
-\stopuseMPgraphic
-
-\defineoverlay[page][\useMPgraphic{page}{step=\getvariable{layout}{step}}]
-
-\setupbackgrounds
-  [page]
-  [background=page]
-
-\setupcolors
-  [state=start]
-
-\startsetups nextstep
-  % pagebreak handlers are grouped, so we need to set global
-  \ifnum\getvariable{layout}{dx}=\getvariable{layout}{nx}\relax
-    \ifnum\getvariable{layout}{dy}=\getvariable{layout}{ny}\relax
-      \setxvariables[layout][dy=1]
-    \else
-      \setxvariables[layout][dy=\the\numexpr\getvariable{layout}{dy}+1\relax]
-    \fi
-    \setxvariables[layout][dx=1]
-  \else
-    \setxvariables[layout][dx=\the\numexpr\getvariable{layout}{dx}+1\relax]
-  \fi
-  % global anyway
-  \setuplayout[step]
-\stopsetups
-
-\definefontsynonym[MainTitleFont][SerifBold]
-
-\definefont[ChapterTitleFont][MainTitleFont sa 2]
-
-\appendtoks
-  \NormalizeFontHeight \TitleFont         {\setstrut\strut\quad} {4\lineheight} {MainTitleFont}
-  \NormalizeFontHeight \SubTitleFont      {\setstrut\strut\quad} {3\lineheight} {MainTitleFont}
-  \NormalizeFontHeight \ChapterNumberFont {XVI}                  {4\lineheight} {MainTitleFont}
-\to \everystarttext
-
-\setupsection
-  [section-2]
-  [bodypartconversion=Romannumerals]
-
-\installpagebreakhandler {step} {\setups{nextstep}}
-
-\definepagebreak[chapter][yes,step]
-
-\setuphead
-  [chapter]
-  [page=chapter,
-   command=\MyChapterCommand]
-
-\definehead[Topic][chapter]
-\definehead[Nopic][title]
-
-\setuphead[chapter,Topic,Nopic]
-  [numberstyle=\ChapterNumberFont,
-   textstyle=\ChapterTitleFont,
-   numbercolor=lightgray,
-   textcolor=darkgray]
-
-\def\MyChapterCommand#1#2%
-  {\hbox \bgroup % we need to nil the strut added by the headplacement
-     \setupframed[frame=off,lines=4,offset=overlay]%
-     \rlap{\hskip2\lineheight\framed{\setnostrut#1}}\framed{#2}%
-   \egroup}
-
-\setupitemize
-  [each]
-  [R,broad]
-  [stopper=,
-   color=lightgray]
-
-\def\doTitlePage#1#2#3%
-  {\startstandardmakeup[headerstate=high,textstate=stop]
-     \setupalign[middle]
-     \def\\{\def\\{\endgraf}\endgraf\vfil\ignorespaces#2}%
-     \startcolor[darkgray]
-     #1\setstrut\setupinterlinespace\vfil#3\vfil
-     \stopcolor
-   \stopstandardmakeup}
-
-\def\TitlePage   {\doTitlePage\TitleFont\relax}
-\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont}
-
-\long\def\StartTitlePage   #1\StopTitlePage   {\TitlePage   {#1}}
-\long\def\StartSubTitlePage#1\StopSubTitlePage{\SubTitlePage{#1}}
-
-\endinput
-
diff --git a/tex/context/modules/common/s-pre-63.tex b/tex/context/modules/common/s-pre-63.tex
deleted file mode 100644
index 974c67a5f..000000000
--- a/tex/context/modules/common/s-pre-63.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-%D \module
-%D   [      file=s-pre-63,
-%D        version=2006.05.11,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 63,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-this module is under reconstruction
-
-\endinput
-
-\usemodule[pre-61,streams]
-
-\definemeasure[textgap]  [\dimexpr24pt\relax]
-
-\definemeasure[leftwidth] [\dimexpr.25\textwidth-.5\measure{textgap}\relax]
-\definemeasure[rightwidth][\dimexpr.75\textwidth-.5\measure{textgap}\relax]
-
-\definestreamlayer[left] [width=\measure{leftwidth}]
-\definestreamlayer[right][width=\measure{rightwidth}]
-
-\setupbodyfont[12pt]
-
-\definefont[LeftFont][Normal sa 3]
-
-\setupheader[style=\tfc,before=\vss,after=\vss]
-
-\startsetups streamlayer:left:settings
-    \hsize\measure{leftwidth}
-    \LeftFont
-    \setupinterlinespace
-\stopsetups
-
-\startsetups streamlayer:right:settings
-    \hsize\measure{rightwidth}
-\stopsetups
-
-\definecombination[both][distance=\measure{textgap},location=top]
-
-\startsetups place:both
-    \startcombination[both]
-        {\StartLocalStep\placestreamlayer[left]\StopLocalStep}  {}
-        {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {}
-    \stopcombination
-\stopsetups
-
-\def\StartPage {\page \StartLocalSteps}
-\def\StopPage  {\StopLocalSteps \page}
-
-\def\StartLeft {\startstreamlayer[left]}
-\def\StartRight{\startstreamlayer[right]}
-
-\def\StopLeft  {\stopstreamlayer}
-\def\StopRight {\stopstreamlayer}
-
-\def\StartPair {}
-\def\StopPair  {\setups[place:both]}
-
-% \doifnotmode {demo} {\endinput}
-
-\setupbodyfont[8pt] \definefont[BigFont][Normal sa 4]
-
-\starttext
-
-\StartPage
-    \StartPair \StartLeft ZAPF  \StopLeft \StartRight \input zapf  \StopRight \StopPair
-    \StartPair \StartLeft DAVIS \StopLeft \StartRight \input davis \StopRight \StopPair
-    \StartPair \StartLeft WARD  \StopLeft \StartRight \input ward  \StopRight \StopPair
-\StopPage
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-64.tex b/tex/context/modules/common/s-pre-64.tex
deleted file mode 100644
index ef4889bbb..000000000
--- a/tex/context/modules/common/s-pre-64.tex
+++ /dev/null
@@ -1,208 +0,0 @@
-%D \module
-%D   [      file=s-pre-64,
-%D        version=2006.05.11,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 64,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-% To be documented, used in 2007
-
-\usemodule[s][pre-60]
-
-\newcounter\shapesynctag
-\newdimen\slantedshapedimen
-\newdimen\slantedshapestep
-\newdimen\slantedshapeleftskip
-\newdimen\slantedshapeoffset
-\newdimen\slantedshapeextra
-
-\positioningtrue
-
-\def\AdaptShape
-  {\doglobal\increment\shapesynctag
-   \getnoflines\textheight
-   \slantedshapestep\dimexpr\slantedshapeleftskip/\noflines\relax
-   \leftskip\slantedshapeleftskip
-   \scratchdimen\dimexpr\MPy{text:\MPp\shapesynctag}+\MPh{text:\MPp\shapesynctag}-\topskip-\MPy\shapesynctag\relax
-   \advance\scratchdimen\slantedshapeextra
-   \getnoflines\scratchdimen
-   \slantedshapedimen \noflines \slantedshapestep
-   \scratchtoks\emptytoks
-   \dorecurse{30}
-     {\appendetoks
-         \the\dimexpr-\slantedshapedimen+\slantedshapeoffset \relax\space
-         \the\dimexpr \hsize-2\slantedshapeoffset\relax\space
-      \to\scratchtoks
-      \advance\slantedshapedimen \slantedshapestep}%
-   \parshape 30 \the\scratchtoks
-   \strut\xypos\shapesynctag}
-
-\def\AdaptShapeX
-  {\doglobal\increment\shapesynctag
-   \getnoflines\textheight
-   \slantedshapestep\dimexpr\slantedshapeleftskip/\noflines\relax
-   \leftskip\slantedshapeleftskip
-   \scratchdimen\dimexpr\MPy{text:\MPp\shapesynctag}+\MPh{text:\MPp\shapesynctag}-\topskip-\MPy\shapesynctag\relax
-   \advance\scratchdimen\slantedshapeextra
-   \getnoflines\scratchdimen
-   \slantedshapedimen \noflines \slantedshapestep
-   \scratchtoks\emptytoks
-   \dorecurse{30}
-     {\appendetoks
-         \the\dimexpr-\slantedshapedimen+\slantedshapeoffset +5cm \relax\space
-         \the\dimexpr \hsize-2\slantedshapeoffset\relax\space
-      \to\scratchtoks
-      \advance\slantedshapedimen \slantedshapestep}%
-   \parshape 30 \the\scratchtoks
-   \strut\xypos\shapesynctag}
-
-\setuppapersize[S6][S6]
-
-\setupinteraction
-  [state=start,
-   click=no]
-
-\setupinteractionscreen
-  [option=max]
-
-\setuplayout
-  [backspace=12pt,
-   topspace=24pt,
-   height=middle,
-   width=middle,
-   header=0pt,
-   footer=0pt]
-
-\definecolor[maincolor][b=.5]
-\definecolor[somecolor][g=.5]
-\definecolor[morecolor][r=.5]
-
-\setupcolors
-  [textcolor=maincolor,
-   state=start]
-
-\setupbackgrounds
-  [text]% [text]
-  [background={base,text,invoke}]
-
-\definelayer
-  [text]
-  [width=\textwidth,
-   height=\textheight]
-
-\definelayer
-  [base]
-  [width=\textwidth,
-   height=\textheight]
-
-\definetype [epet] [style=,color=morecolor]
-\setuptype         [style=,color=somecolor]
-
-\slantedshapeleftskip150pt
-\slantedshapeoffset12pt
-\slantedshapeextra10pt
-
-\startreusableMPgraphic{page}
-    StartPage ;
-        fill Page withcolor \MPcolor{maincolor} ;
-        path p ; p := Field[Text][Text] enlarged 6pt ;
-        p :=
-            llcorner p shifted (0,-12pt) --
-            lrcorner p shifted (-150pt,0) --
-            urcorner p shifted (0,12pt) --
-            ulcorner p shifted (150pt,0) --
-            cycle ;
-        fill p
-            withcolor .9white ;
-    StopPage ;
-\stopreusableMPgraphic
-
-\defineoverlay[page][\reuseMPgraphic{page}]
-\setupbackgrounds[page][background=page]
-
-\setupalign[flushleft]
-
-\def\StartItem
-  {\blank[line]
-   \begingroup
-   \EveryPar {\AdaptShape}} % beware: \ABBREV aan begin gaat fout
-
-\def\StopItem
-  {\endgraf
-   \endgroup
-   \blank[line]}
-
-\def\StartType
-  {\blank[halfline]
-   \begingroup
-   \EveryPar {\AdaptShape}
-   \dontleavehmode \quad}
-
-\def\StopType
-  {\endgraf
-   \endgroup
-   \blank[halfline]}
-
-\def\Title#1%
-  {\page
-   \setlayer
-     [text]
-     [preset=lefttop,
-      rotation=90]
-     {\color[white]{\scale[height=24pt]{\strut#1}}}}
-
-\def\SetBanner#1%
-  {\setuplayer[base][state=repeat]
-   \setlayer[base][preset=rightbottom]{\color[white]{\scale[height=9pt]{\strut#1}}}}
-
-\let\TitleFont\relax
-
-\startmode[atpragma]
-    \definefontfeature[default][method=node,script=latn,language=dflt,liga=yes,onum=yes,kern=yes]
-    \definefont[TitleFont][palatinosanscom-bold*default at 48pt]
-    \definefont[MainTextFont][palatinosanscom-regular*default at 12pt] \setupinterlinespace[line=15pt]
-    \appendtoks
-        \MainTextFont % hack, as we define a bodyfont at that point (better have a proper typeface)
-    \to \everystarttext
-\stopmode
-
-\doifnotmode{demo}{\endinput}
-
-\starttext
-
-\usemodule[abr-01]
-
-\SetBanner{tug 2007 san diego}
-
-\Title {hans hagen}
-
-\startstandardmakeup \TitleFont \setupinterlinespace[line=3ex] \vfill
-
-\StartItem \dontleavehmode \quad {\morecolor zapfino, a}   \StopItem
-\StartItem \dontleavehmode \quad {\morecolor torture test} \StopItem
-\StartItem \dontleavehmode \quad {\morecolor for luatex}   \StopItem
-
-\vfill \stopstandardmakeup
-
-\Title{loading fonts}
-
-\StartSteps
-
-\StartItem the \OPENTYPE\ font reader is borrowed from \FONTFORGE\  \FlushStep \StopItem
-\StartItem once it was ready, we could look into such a font  \FlushStep \StopItem
-\StartItem it tooks while to figure out the format due to rather fuzzy specs  \FlushStep \StopItem
-\StartItem it took us even more time to find out that the loader was flawed  \FlushStep \StopItem
-\StartItem one reason was that fonts themselves may have bugs or be incomplete \FlushStep \StopItem
-\StartItem then we changed to \FONTFORGE\ version 2 \FlushStep \StopItem
-\StartItem this made the missing pieces surface in more complex feature handling \FlushStep \StopItem
-\StartItem while implementing features the new table format was cleaned up \FlushStep \StopItem
-
-\StopSteps
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-68.tex b/tex/context/modules/common/s-pre-68.tex
deleted file mode 100644
index 3c04a87e1..000000000
--- a/tex/context/modules/common/s-pre-68.tex
+++ /dev/null
@@ -1,150 +0,0 @@
-%D \module
-%D   [      file=s-pre-68,
-%D        version=2009.08.28,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 68,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\usemodule[pre-60,abr-02]
-
-% style
-
-\setuppapersize
-  [S66][S66]
-
-\setuplayout
-  [height=middle,
-   width=middle,
-   header=0pt,
-   footer=0pt,
-   backspace=2cm,
-   topspace=2cm]
-
-\setupinteraction
-  [state=start,
-   click=no]
-
-\definecolor[maincolor][r=.4]
-
-\startreusableMPgraphic{page}
-    StartPage ;
-        fill Page enlarged 5mm withcolor \MPcolor{maincolor} ;
-    StopPage ;
-\stopreusableMPgraphic
-
-\startreusableMPgraphic{next}
-    fill ultriangle scaled .15PaperWidth withcolor white ;
-\stopreusableMPgraphic
-
-\startreusableMPgraphic{last}
-    fill boundingbox(ultriangle scaled .15PaperWidth) withcolor white ;
-\stopreusableMPgraphic
-
-\startuniqueMPgraphic{bullit}
-    fill ultriangle scaled 2ExHeight withcolor white ;
-\stopuniqueMPgraphic
-
-\definelayer
-  [extra]
-  [width=\paperwidth,
-   height=\paperheight]
-
-\defineoverlay
-  [page]
-  [\reuseMPgraphic{page}]
-
-\setupbackgrounds
-  [page]
-  [background={page,extra}]
-
-\setupcolors
-  [state=start,
-   textcolor=white]
-
-\setuphead
-  [chapter]
-  [style=\bfc]
-
-\definehead[Title][title]
-
-\definesymbol[MyBullet][\uniqueMPgraphic{bullit}]
-
-\setupitemgroup[itemize][each][symbol=MyBullet]
-
-\usetypescript[cambria]
-\setupbodyfont[cambria,14.4pt]
-
-% interface
-
-\def\StartItems
-  {\begingroup
-   \StartSteps
-   \startitemize
-   \def\StartItems{\startitemize\def\StopItems{\stopitemize}}}
-
-\def\StopItems
-  {\FlushStep
-   \stopitemize
-   \NextPageSymbol
-   \StopSteps
-   \endgroup}
-
-\def\Item
-  {\def\Item{\FlushStep\item}
-   \item}
-
-\def\NextPageSymbol
-  {\setlayer
-     [extra]
-     [preset=rightbottom,offset=2mm]
-     {\ifnum\realpageno=\lastpage
-       \reuseMPgraphic{last}%
-      \else\ifnum\realpageno>1
-       \reuseMPgraphic{next}%
-      \fi\fi
-      \FlushStep}}
-
-\def\TitlePage#1#2%
-  {\startstandardmakeup[bottom=,top=]
-   \scale[width=\textwidth]{\framed[align=flushleft,foregroundstyle=\bf,frame=off]{#1}}
-   \vfilll
-   \hfill\scale[width=.5\textwidth]{\framed[align=flushright,foregroundstyle=\bf,frame=off]{#2}}
-   \stopstandardmakeup}
-
-\doifnotmode{demo}{\endinput}
-
-\starttext
-
-\TitlePage{I'm running\\out of examples}{Hans Hagen\\Someplace, 2031}
-
-\Title{Alpha}
-
-\StartItems
-\Item one
-\Item two
-\Item three
-\StopItems
-
-\Title{Beta}
-
-\StartItems
-\Item four
-\Item five
-\Item six
-\StopItems
-
-\Title{Gamma}
-
-\StartItems
-\Item seven
-\Item eight
-\Item nine
-\StopItems
-
-\stoptext
diff --git a/tex/context/modules/mkiv/s-pre-60.mkiv b/tex/context/modules/mkiv/s-pre-60.mkiv
deleted file mode 100644
index 70f8978b0..000000000
--- a/tex/context/modules/mkiv/s-pre-60.mkiv
+++ /dev/null
@@ -1,212 +0,0 @@
-%D \module
-%D   [      file=s-pre-60,
-%D        version=2004.03.15,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 60,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-% use lua instead of global mess
-
-\unprotect
-
-\startmode[paper,print]
-    \let\StartSteps\relax
-    \let\StopSteps \relax
-    \let\FlushStep \relax
-    \let\ResetStep \relax
-    \let\StartBusy \relax
-    \let\StopBusy  \relax
-    \endinput
-\stopmode
-
-\newcount\c_module_pre_steps_current
-\newcount\c_module_pre_steps_maximum
-\newcount\c_module_pre_steps_nesting_step
-\newcount\c_module_pre_steps_nesting_steps
-\newcount\c_module_pre_steps_nesting_busy
-
-\def\StepCounter   {\the\c_module_pre_steps_current}
-\def\StepMaximum   {\the\c_module_pre_steps_maximum}
-\def\StepLayer     {step:\the\c_module_pre_steps_current}
-\def\NextStepLayer {step:\the\numexpr\c_module_pre_steps_current+\plusone\relax}
-\def\FirstStepLayer{step:1}
-
-\useJSscripts[stp]
-
-\startsetups[set-stepper]
-
-    \ifnum\getvariable{stepper}{nofsteps}>\c_module_pre_steps_maximum
-
-        \dostepwiserecurse {\numexpr\c_module_pre_steps_maximum+\plusone\relax} {\getvariable{stepper}{nofsteps}} {1} {
-            \doifnotmode{nosteps,nostep} {
-                \expanded{\defineviewerlayer[step:\recurselevel][state=stop,scope=global]}
-            }
-        }
-
-        \global\c_module_pre_steps_maximum\getvariable{stepper}{nofsteps}\relax
-
-    \fi
-
-\stopsetups
-
-\setvariables
-  [stepper]
-  [set=\setups{set-stepper},
-   nofsteps=50]
-
-\defineviewerlayer[step:busy][state=start]
-
-\definereference [SetupStepper]  [JS(SetupStepper{step,\StepMaximum})]
-\definereference [ResetStepper]  [JS(ResetStepper)]
-\definereference [CheckStepper]  [JS(CheckStepper{\StepCounter})]
-\definereference [InvokeStepper] [JS(InvokeStepper)]
-
-% todo: roll back blank
-
-\unexpanded\def\ResetStep
-  {\iftrialtypesetting\else
-     \global\c_module_pre_steps_current\zerocount
-   \fi}
-
-\unexpanded\def\NextStep
-  {\iftrialtypesetting\else
-     \global\advance\c_module_pre_steps_current\plusone
-   \fi}
-
-\unexpanded\def\PrevStep
-  {\iftrialtypesetting\else
-     \global\advance\c_module_pre_steps_current\minusone
-   \fi}
-
-\unexpanded\def\FlushStep
-  {\iftrialtypesetting\else
-     \StopStep
-     \NextStep
-     \StartStep
-   \fi}
-
-\unexpanded\def\StartStep
-  {\iftrialtypesetting\else
-     \global\advance\c_module_pre_steps_nesting_step\plusone
-     \ifcase\c_module_pre_steps_nesting_step\or
-       \startviewerlayer[\StepLayer]%
-     \fi
-   \fi
-   \ignorespaces}
-
-\unexpanded\def\StopStep
-  {\removeunwantedspaces
-   \iftrialtypesetting\else
-     \ifcase\c_module_pre_steps_nesting_step\or
-       \stopviewerlayer
-     \fi
-     \global\advance\c_module_pre_steps_nesting_step\minusone
-   \fi}
-
-\unexpanded\def\StartSteps
-  {\iftrialtypesetting\else
-     \global\advance\c_module_pre_steps_nesting_steps\plusone
-     \ifcase\c_module_pre_steps_nesting_steps\or
-       \ResetStep
-       \NextStep
-       \StartStep
-     \fi
-   \fi}
-
-\unexpanded\def\StopSteps
-  {\iftrialtypesetting\else
-     \ifcase\c_module_pre_steps_nesting_steps\or
-       \StopStep
-       \PrevStep
-     \fi
-     \global\advance\c_module_pre_steps_nesting_steps\minusone
-   \fi}
-
-\unexpanded\def\StartBusy
-  {\iftrialtypesetting\else
-     \global\advance\c_module_pre_steps_nesting_busy\plusone
-     \ifcase\c_module_pre_steps_nesting_busy\or
-       \startviewerlayer[step:busy]
-     \fi
-   \fi
-   \ignorespaces}
-
-\unexpanded\def\StopBusy
-  {\removeunwantedspaces
-   \iftrialtypesetting\else
-     \ifcase\c_module_pre_steps_nesting_busy\or
-       \stopviewerlayer
-     \fi
-     \global\advance\c_module_pre_steps_nesting_busy\minusone
-   \fi}
-
-%D Handy:
-
-\unexpanded\def\StartLocalSteps
-  {\ResetStep}
-
-\unexpanded\def\StopLocalSteps
-  {}
-
-\unexpanded\def\StartLocalStep
-  {\NextStep
-   \StartStep}
-
-\unexpanded\def\StopLocalStep
-  {\StopStep}
-
-\appendtoks
-    \ResetStep
-\to \everyaftershipout
-
-\setupinteraction
-  [%openaction=SetupStepper,
-   closeaction=ResetStepper,
-   openpageaction=CheckStepper,
-   closepageaction=ResetStepper]
-
-\defineoverlay[invoke][\overlaybutton{InvokeStepper}]
-
-\setupbackgrounds
-  [text]
-  [background=invoke]
-
-% bonus
-
-\useMPlibrary[nav]
-
-\definepalet
-  [navplus]
-  [attach=interactioncolor,
-   comment=interactioncolor]
-
-\setupcomment
-  [symbol={comment-normal,comment-down},
-   textlayer=\StepLayer,
-   option=buffer,
-   height=\textheight,
-   width=\textwidth,
-   margin=0pt]
-
-\setupattachments
-  [symbol={attach-normal,attach-down},
-   textlayer=\StepLayer]
-
-%D used as (given some definitions):
-%D
-%D \starttyping
-%D \StartLocalSteps
-%D     \startcombination[both]
-%D         {\StartLocalStep\placestreamlayer[left]\StopLocalStep}  {}
-%D         {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {}
-%D     \stopcombination
-%D \StopLocalSteps
-%D \stoptyping
-
-\protect \endinput
diff --git a/tex/context/modules/mkiv/s-pre-69.mkiv b/tex/context/modules/mkiv/s-pre-69.mkiv
deleted file mode 100644
index cc6af9ad3..000000000
--- a/tex/context/modules/mkiv/s-pre-69.mkiv
+++ /dev/null
@@ -1,336 +0,0 @@
-%D \module
-%D   [      file=s-pre-69,
-%D        version=2010.04.28,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 69,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\setuppapersize[S6][S6]
-\setuppapersize[SM][SM]
-
-\usemodule
-  [abr-01,pre-60]
-
-\setupinteraction
-  [state=start,
-   contrastcolor=white,
-   color=white,
-   click=no]
-
-\setuplayout
-  [location=middle,
-   topspace=60pt,
-   bottomspace=80pt,
-   backspace=80pt,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-\setupcolors
-  [textcolor=white]
-
-\setupbodyfont[euler]
-
-\definecolor[maincolor] [blue]
-\definecolor[extracolor][green]
-
-% \definecolor[maincolor] [red]
-% \definecolor[extracolor][blue]
-
-\startMPinitializations
-    if unknown MyColor[1] :
-        color MyColor[] ;
-        MyColor[1] := transparent(1,.25,\MPcolor{maincolor}) ;
-        MyColor[2] := transparent(1,.25,\MPcolor{extracolor}) ;
-
-        picture MySoFar ; MySoFar := nullpicture ;
-        path MyLastOne ; MyLastOne := origin -- cycle ;
-        color MyPageColor ; MyPageColor := MyColor[1] ;
-        path MyLeftSteps, MyRightSteps ;
-        boolean MyPageDone ; MyPageDone := false ;
-
-        vardef MySmallShape(expr parent) =
-            path p ; p := boundingbox parent ;
-            p := boundingbox parent ;
-            numeric w, h ; w := bbwidth(p) ; h := bbheight(p) ;
-            urcorner p shifted (-uniformdeviate w/4,0) --
-            lrcorner p shifted (0,uniformdeviate h/4) --
-            llcorner p shifted (uniformdeviate w/4,0) --
-            ulcorner p shifted (0,-uniformdeviate h/4) -- cycle
-        enddef ;
-
-        vardef MyShape(expr parent) =
-            path p ; p := boundingbox parent ;
-            if MyPageDone :
-                MyPageDone := false ;
-                urcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
-                lrcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
-                llcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) --
-                ulcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) -- cycle
-            else :
-                MyPageDone := true ;
-                urcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) --
-                lrcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) --
-                llcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) --
-                ulcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) -- cycle
-            fi
-        enddef ;
-
-        vardef MyMakeOne =
-            MyLastOne := MyShape(Page) ;
-        enddef ;
-
-        vardef MyAddOne =
-            addto MySoFar also image(fill MyLastOne withcolor MyPageColor ; ) ;
-        enddef ;
-
-        vardef MyDrawOne =
-            fill MyLastOne withcolor black ;
-            fill MyLastOne withcolor MyPageColor ;
-        enddef ;
-
-        vardef MyDrawPage =
-            draw MySoFar ;
-        enddef ;
-
-        vardef MySetSteps =
-            path l, r ; numeric s ; path ll[], rr[] ; path t ;
-            l := point 2 of MyLastOne -- point 3 of MyLastOne ;
-            r := point 0 of MyLastOne -- point 1 of MyLastOne ;
-            t := topboundary Field[Text][Text] rightenlarged TextWidth leftenlarged TextWidth ;
-            s := bbheight(Field[Text][Text])/LineHeight + 2 ;
-            t := t shifted (0,-TopSkip) ;
-            for i=1 upto s :
-                ll[i] := t intersectionpoint l ;
-                rr[i] := t intersectionpoint r ;
-                t := t shifted (0,-LineHeight) ;
-            endfor ;
-            MyLeftSteps  := for i=1 upto s : ll[i] -- endfor cycle ;
-            MyRightSteps := for i=1 upto s : rr[i] -- endfor cycle ;
-        enddef ;
-
-        vardef MyDrawText(expr txt) =
-            pair a ; a := (point 1 of MyLastOne) - (point 2 of MyLastOne) ;
-            picture p ; p := txt ;
-            p := p
-                shifted (-EmWidth,EmWidth)
-                shifted ulcorner txt
-                shifted point 1 of MyLastOne ;
-            p := p rotatedaround(lrcorner p, radian * tan(ypart a/xpart a)) ;
-            setbounds p to origin -- cycle ;
-            draw p ;
-        enddef ;
-
-        vardef MyDrawTitle(expr txt) =
-        %   pair a ; a := (point 2 of MyLastOne) - (point 3 of MyLastOne) ;
-            pair a ; a := (point 3 of MyLastOne) - (point 4 of MyLastOne) ;
-            picture p ;
-            if bbheight(txt) > bbwidth(txt) :
-                p := txt ysized(0.8*TextHeight) ;
-            else :
-                p := txt xsized(0.8*TextWidth) ;
-            fi ;
-            numeric d ; d := arclength(point 2 of MyLastOne -- point 3 of MyLastOne) - bbheight(p) ;
-            p := p
-                shifted (BackSpace,-d/2)
-                shifted -ulcorner p
-                shifted point 3 of MyLastOne ;
-        %   p := p rotatedaround(ulcorner p, - radian * tan(xpart a/ypart a)) ;
-        %   p := p rotatedaround(ulcorner p,  radian * tan(ypart a/xpart a)) ;
-            setbounds p to origin -- cycle ;
-            draw p ;
-        enddef ;
-
-        vardef MyDrawSteps =
-            s := bbheight(Field[Text][Text])/LineHeight + 2 ;
-            for i=1 upto s :
-                draw ll[i] withpen pencircle scaled 1mm ;
-                draw rr[i] withpen pencircle scaled 1mm ;
-                draw ll[i] -- rr[i] ;
-            endfor ;
-            draw Field[Text][Text] ;
-        enddef ;
-
-    fi ;
-\stopMPinitializations
-
-\startuseMPgraphic{initialization}
-    StartPage ;
-        MySoFar := image(fill Page enlarged 12pt withcolor MyPageColor) ;
-        MyMakeOne ;
-        MySetSteps ;
-    StopPage ;
-\stopuseMPgraphic
-
-\appendtoks
-    \startnointerference
-        \useMPgraphic{initialization}
-    \stopnointerference
-\to \everystarttext
-
-\startuseMPgraphic{page}
-    StartPage ;
-        MyDrawPage ;
-        MyDrawOne ;
-        MySetSteps ;
-        MyDrawTitle(textext("\getvariable{document}{title}")) ;
-        MyDrawText(textext("\getvariable{document}{topic}")) ;
-        %
-        % we have multiple runs when we have text
-        %
-%         MyDrawSteps ;
-%         MyMakeOne ;
-%         MySetSteps ;
-    StopPage ;
-\stopuseMPgraphic
-
-\appendtoks
-    \startnointerference
-        \startMPcode
-            MyAddOne ;
-            MyMakeOne ;
-            MySetSteps ;
-        \stopMPcode
-    \stopnointerference
-\to \everyshipout
-
-\defineoverlay[page][\useMPgraphic{page}]
-
-\startuseMPgraphic{symbol}
-    color cc ; cc := MyColor[2] ;
-    path p ; p := MySmallShape(unitsquare scaled (.6*LineHeight)) ;
-    fill p withcolor white ;
-    fill p withcolor cc ;
-\stopuseMPgraphic
-
-\definesymbol[mysymbol][\struttedbox{\useMPgraphic{symbol}}]
-
-\setupitemgroup[itemize][1][symbol=mysymbol]
-
-\setupbackgrounds
-  [page]
-  [background=page]
-
-\startluacode
-    local texdimen = tex.dimen
-    function document.SetParShape()
-        local leftpath  = metapost.getclippath("metafun","metafun","clip currentpicture to MyLeftSteps ;")
-        local rightpath = metapost.getclippath("metafun","metafun","clip currentpicture to MyRightSteps ;")
-        local shape = { }
-        for i=1,#leftpath do
-            local left  = leftpath[i].x_coord
-            local right = rightpath[i].x_coord
-            local hsize = right - left - (texdimen.backspace + texdimen.cutspace)*number.dimenfactors.bp
-            shape[#shape+1] = string.format("%sbp %sbp",left,hsize)
-        end
-     -- print(table.serialize(shape))
-     -- context.parshape(string.format("%s %s ",#shape,table.concat(shape," ")))
-        context("\\parshape %s %s ",#shape,table.concat(shape," "))
-    end
-\stopluacode
-
-\nopenalties \dontcomplain
-
-\setupwhitespace[none]
-
-\def\StartText#1#2%
-  {\starttext
-   \setvariable{document}{title}{\framed[frame=off,offset=0pt,align=flushleft,foregroundstyle=\tfd\setupinterlinespace]{\begstrut#1\endstrut}}
-   \setvariable{document}{topic}{\tfb#2}
-   \startstandardmakeup
-     % dummy page
-   \stopstandardmakeup
-   \setvariable{document}{title}{}
-   \setvariable{document}{topic}{}}
-
-\def\StopText
-  {\stoptext}
-
-\def\StartItems#1%
-  {\setvariable{document}{topic}{\tfb#1}
-   \startstandardmakeup[top=,bottom=\vss]
-   \startelement[items][title={#1}]%
-   \ctxlua{document.SetParShape()}
-   \StartSteps}
-
-\def\StopItems
-  {\StopSteps
-   \stopelement
-   \stopstandardmakeup}
-
-\def\StartItem
-  {\dontleavehmode
-   \startelement[item]%
-   \llap{\symbol[mysymbol]\quad}% graphic
-   \ignorespaces}
-
-\def\StopItem
-  {\removeunwantedspaces
-   \nobreak
-   \crlf
-   \stopelement
-   \crlf
-   \FlushStep}
-
-\def\ShapeParagraph
-  {\ctxlua{document.SetParShape()}}
-
-% no parshape yet
-
-\def\StartParagraphs#1%
-  {\setvariable{document}{topic}{\tfb#1}
-   \startstandardmakeup[top=,bottom=\vss]
-  %\ctxlua{document.SetParShape()}
-   \startelement[paragraphs]%
-   \StartSteps}
-
-\def\StopParagraphs
-  {\StopSteps
-   \stopelement
-   \stopstandardmakeup}
-
-\def\StartParagraph
-  {\startelement[paragraph]}
-
-\def\StopParagraph
-  {\par
-   \stopelement
-   \FlushStep}
-
-% experiment .. likely to change
-
-\setelementexporttag[items]     [nature][display]
-\setelementexporttag[item]      [nature][mixed]
-\setelementexporttag[paragraphs][nature][display]
-\setelementexporttag[paragraph] [nature][mixed]
-
-\continueifinputfile{s-pre-69.mkiv}
-
-% finetuning: \StartText{\TEX\ and Reality\vskip2exClashing Mindsets?\vskip1ex}{Bacho\TEX, May 1, 2010}
-
-\StartText{Just\\A Demo}{Bacho\TEX, May 1, 2010}
-
-\StartItems{Quote from Tufte and Ward}
-    \StartItem
-        \input tufte
-    \StopItem
-    \StartItem
-        \input ward
-    \StopItem
-\StopItems
-
-% \dorecurse{20}{
-%     \ctxlua{document.SetParShape()}
-%     \input tufte
-%     \page
-% }
-
-\StopText
-
diff --git a/tex/context/modules/mkiv/s-pre-70.mkiv b/tex/context/modules/mkiv/s-pre-70.mkiv
deleted file mode 100644
index 2c8bb2d26..000000000
--- a/tex/context/modules/mkiv/s-pre-70.mkiv
+++ /dev/null
@@ -1,176 +0,0 @@
-%D \module
-%D   [      file=s-pre-70,
-%D        version=2008.04.15,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 70,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D At the cost of more runtime and a larger output file, we
-%D turn on randomization. The instances are cached in the
-%D MkIV cache, so successive runs use the same shapes.
-
-% \usemodule[punk] \usetypescript[punk] \setupbodyfont[punk,20pt]
-%
-% \EnableRandomPunk
-
-\setupbodyfont[punknova,20pt] % we now use the opentype variant
-
-%D We use the regular screen size paper and layout setup.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=30pt,
-   backspace=30pt,
-   width=middle,
-   height=fit,
-   header=0pt,
-   footer=0pt,
-   bottomdistance=24pt,
-   bottom=30pt,
-   bottom=18pt,
-   top=0pt]
-
-\setupinterlinespace
-  [top=height,
-   line=1.25\bodyfontsize]
-
-\setupcolors
-  [state=start,
-   textcolor=white]
-
-\setupinteraction
-  [state=start,
-   %click=off,
-   menu=on]
-
-%D We predefine a few palets. Of course you can define more.
-
-\definecolor[punkblue]  [r=.4,b=.8,g=.4]
-\definecolor[punkgreen] [r=.4,b=.4,g=.8]
-\definecolor[punkred]   [r=.8,b=.4,g=.4]
-\definecolor[punkyellow][r=.6,g=.6,b=.2]
-
-\definepalet [punk-one]           [textcolor=punkblue,pagecolor=punkgreen]
-\definepalet [punk-two]           [textcolor=punkred,pagecolor=punkyellow]
-\definepalet [punk-three]         [textcolor=punkblue,pagecolor=punkyellow]
-\definepalet [punk-one-reverse]   [textcolor=punkgreen,pagecolor=punkblue]
-\definepalet [punk-two-reverse]   [textcolor=punkyellow,pagecolor=punkred]
-\definepalet [punk-three-reverse] [textcolor=punkyellow,pagecolor=punkblue]
-
-\setuppalet[punk-one]
-
-%D We use a few backgrounds. The hyperlink that invokes the
-%D stepper is hooked into the text background.
-
-\definelayer
-  [page]
-  [width=\paperwidth,
-   height=\paperheight]
-
-\setupbackgrounds
-  [page]
-  [background={color,page},
-   backgroundcolor=pagecolor,
-   setups=pagestuff]
-
-\setupbackgrounds
-  [text]
-  [background={color,invoke},
-   backgroundoffset=12pt,
-   backgroundcolor=textcolor]
-
-%D We need different symbols for itemized lists.
-
-\definesymbol[1][\hbox{\lower1ex\hbox{*}}]
-\definesymbol[2][\endash]
-\definesymbol[3][\letterhash]
-\definesymbol[3][>]
-
-%D We don't want these reversed clicked areas in Acrobat.
-
-\setupinteraction
-  [click=no,
-   color=white, % pagecolor,
-   contrastcolor=white] % pagecolor,
-
-%D We define a rather simple navigational panel at the
-%D bottom
-
-\setupinteractionmenu
-  [bottom]
-  [color=white, % pagecolor,
-   contrastcolor=white, % pagecolor,
-   background=color,
-   backgroundcolor=textcolor,
-   frame=off,
-   height=24pt,
-   left=\hfill,
-   middle=\hskip12pt]
-
-\setupsubpagenumber
-  [state=start]
-
-\startinteractionmenu[bottom]
-    \starttxt
-        \interactionbar
-          [alternative=d,
-           symbol=yes,
-           color=white,
-           contrastcolor=textcolor]
-    \stoptxt
-    \hfilll
-    \startbut [previouspage] < < < \stopbut
-    \startbut [nextpage]     > > > \stopbut
-\stopinteractionmenu
-
-%D Instead of the normal symbols we use more punky ones.
-
-\startsymbolset [punk]
-    \definesymbol[previous]  [\string<\string<]
-    \definesymbol[somewhere] [\string^\string^]
-    \definesymbol[next]      [\string>\string>]
-\stopsymbolset
-
-\setupinteraction[symbolset=punk]
-
-%D Because the font is rather large, we use less whitespace.
-
-\setuphead
-  [chapter]
-  [after={\blank[big]}]
-
-%D Run this file with the command: \type {context --mode=demo s-pre-70}
-%D in order to get an example.
-
-\continueifinputfile{s-pre-70.mkiv}
-
-\usemodule[pre-60] % use the stepper
-
-\starttext
-
-\title {Punk for dummies}
-
-\dorecurse{10} {
-
-    \title{Just a few dummy pages}
-
-    \StartSteps
-        \startitemize[packed]
-            \startitem bla \FlushStep \stopitem
-            \startitem bla bla \FlushStep \stopitem
-            \startitem bla bla bla \FlushStep \stopitem
-            \startitem bla bla bla bla \FlushStep \stopitem
-        \stopitemize
-    \StopSteps
-
-}
-
-\stoptext
diff --git a/tex/context/modules/mkiv/s-pre-71.lua b/tex/context/modules/mkiv/s-pre-71.lua
deleted file mode 100644
index bfa45a705..000000000
--- a/tex/context/modules/mkiv/s-pre-71.lua
+++ /dev/null
@@ -1,63 +0,0 @@
-if not modules then modules = { } end modules ['steps'] = {
-    version   = 1.001,
-    comment   = "companion to steps.mkiv",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
-moduledata.steps = moduledata.steps or { }
-local steps      = moduledata.steps
-
-local locations = {
-    'lefttop',
-    'middletop',
-    'righttop',
-    'middleleft',
-    'middle',
-    'middleright',
-    'leftbottom',
-    'middlebottom',
-    'rightbottom',
-}
-
-local done, current, previous, n
-
-function steps.reset_locations()
-    done, current, previous, n = table.tohash(locations,false), 0, 0, 0
-end
-
-function steps.next_location(loc)
-    previous = current
-    n = n + 1
-    loc = loc and loc ~= "" and tonumber(loc)
-    while true do
-        current = loc or math.random(1,#locations)
-        if not done[current] then
-            done[current] = true
-            break
-        end
-    end
-end
-
-function steps.current_location()
-    context(locations[current] or "")
-end
-
-function steps.previous_location()
-    context(locations[previous] or "")
-end
-
-function steps.current_n()
-    context(current)
-end
-
-function steps.previous_n()
-    context(previous)
-end
-
-function steps.step()
-    context(n)
-end
-
-steps.reset_locations()
diff --git a/tex/context/modules/mkiv/s-pre-71.mkiv b/tex/context/modules/mkiv/s-pre-71.mkiv
deleted file mode 100644
index 38dae61df..000000000
--- a/tex/context/modules/mkiv/s-pre-71.mkiv
+++ /dev/null
@@ -1,170 +0,0 @@
-% engine=luatex
-
-%D \module
-%D   [      file=s-pre-71,
-%D        version=2008.08.05,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 71,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D I might improve this module so consider it experimental.
-
-% \enablemode[numbers]
-% \enablemode[paper]
-
-\usemodule[pre-60,abr-02]
-
-\registerctxluafile{s-pre-71}{}
-
-\setupinteraction[state=start,click=off]
-
-\definepapersize[wide][width=900pt,height=600pt]
-
-\setuppapersize[wide][wide]
-
-\setuplayout[page]
-
-% \setupbodyfont[15pt]
-
-\usetypescriptfile[type-hgz]
-\usetypescript[palatino-informal]
-\setupbodyfont[palatino-informal,15pt]
-
-\setupsorting[logo][style=]
-
-\startnotmode[paper]
-    \setupbackgrounds[page][background=color,backgroundcolor=black]
-\stopnotmode
-
-\TransparencyHack
-
-\definelayer[page][width=\paperwidth,height=\paperheight]
-
-\definecolor[TopicColor-1][r=.3,g=.4,b=.5]
-\definecolor[TopicColor-2][r=.3,g=.5,b=.4]
-\definecolor[TopicColor-3][r=.4,g=.3,b=.5]
-\definecolor[TopicColor-4][r=.4,g=.5,b=.3]
-\definecolor[TopicColor-5][r=.5,g=.3,b=.4]
-\definecolor[TopicColor-6][r=.5,g=.4,b=.3]
-\definecolor[TopicColor-7][r=.35,g=.35,b=.6]
-\definecolor[TopicColor-8][r=.6,g=.35,b=.35]
-\definecolor[TopicColor-9][r=.35,g=.6,b=.35]
-
-\definecolor[TopicColor-0][t=.5,a=1,s=.5]
-\definecolor[TopicColor]  [s=1]
-
-\setupcolors[state=start]
-\setupcolors[textcolor=TopicColor]
-
-\def\StartTopics
-  {\startstandardmakeup
-   \ctxlua{moduledata.steps.reset_locations()}
-   \doifnotmode{paper}{\StartLocalSteps}}
-
-\def\StopTopics
-  {\doifnotmode{paper}{\StopLocalSteps}
-   \flushlayer[page]
-   \stopstandardmakeup}
-
-\def\StartTopic
-  {\dosingleempty\doStartTopic}
-
-\def\doStartTopic[#1]%
-  {\doifnotmode{paper}{\NextStep}
-   \ctxlua{moduledata.steps.next_location("#1")}
-   \startnotmode[paper]
-     \doifnothing{#1}
-       {\ifcase\ctxlua{moduledata.steps.previous_n()}\else
-          \setlayer
-            [page]
-            [preset=\ctxlua{moduledata.steps.previous_location()}]
-             \bgroup
-               \doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-               \framed
-                 [offset=20pt,
-                  strut=no,
-                  align=normal,
-                  frame=off,
-                  height=\dimexpr\paperheight/3\relax,
-                  width=\dimexpr\paperwidth/3\relax,
-                  background=color,
-                  backgroundcolor=TopicColor-0]
-                 {}%
-               \doifnotmode{paper}{\stopviewerlayer}%
-             \egroup
-         \fi}
-   \stopnotmode
-   \setlayer
-     [page]
-     [preset=\ctxlua{moduledata.steps.current_location()}]
-     \bgroup
-       \doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-       \framed
-         [offset=20pt,
-          strut=no,
-          align=\expdoifelse{#1}{}{normal}{middle,lohi},
-          align=\expdoifelse{#1}{}{flushleft,verytolerant}{middle,lohi},
-          frame=off,
-          height=\dimexpr\paperheight/3\relax,
-          width=\dimexpr\paperwidth/3\relax,
-          background=color,
-          backgroundcolor=TopicColor-\ctxlua{moduledata.steps.current_n()}]
-         \bgroup
-         \ignorespaces}
-
-\def\StopTopic
-  {\removeunwantedspaces
-   \egroup
-   \doifnotmode{paper}{\stopviewerlayer}%
-   \egroup
-   \startmode[numbers]
-   \setlayerframed
-     [page]
-     [preset=\ctxlua{moduledata.steps.current_location()}]
-     [height=\dimexpr\paperheight/3\relax,
-      width=\dimexpr\paperwidth/3\relax,
-      frame=off,
-      foregroundstyle=\bfa,
-      align={flushright,low}]
-     {\doifnotmode{paper}{\startviewerlayer[\StepLayer]}%
-      \ctxlua{moduledata.steps.step()}\kern\strutdepth
-      \doifnotmode{paper}{\stopviewerlayer}}
-   \stopmode}
-
-\logo [METAPOST] {MetaPost}
-
-\definefont[TitleFont][SansBold at 60pt]
-\definefont[TempFont] [SansBold at 12pt]
-
-\let\StartText\starttext
-\let\StopText \stoptext
-
-\continueifinputfile{s-pre-71.mkiv}
-
-\starttext
-
-\StartTopics
-    \StartTopic[1] A \StopTopic
-    \StartTopic[5] B \StopTopic
-    \StartTopic[9] C \StopTopic
-\StopTopics
-
-\StartTopics
-    \StartTopic A \StopTopic
-    \StartTopic B \StopTopic
-    \StartTopic C \StopTopic
-    \StartTopic D \StopTopic
-    \StartTopic E \StopTopic
-    \StartTopic F \StopTopic
-    \StartTopic G \StopTopic
-    \StartTopic H \StopTopic
-    \StartTopic I \StopTopic
-\StopTopics
-
-\stoptext
diff --git a/tex/generic/context/luatex/luatex-basics-chr.lua b/tex/generic/context/luatex/luatex-basics-chr.lua
index 4329256f2..75dffd192 100644
--- a/tex/generic/context/luatex/luatex-basics-chr.lua
+++ b/tex/generic/context/luatex/luatex-basics-chr.lua
@@ -9,6 +9,174 @@ characters.blockrange = { }
 -- classifiers needed for analysis
 
 characters.classifiers={
+ [768]=5,
+ [769]=5,
+ [770]=5,
+ [771]=5,
+ [772]=5,
+ [773]=5,
+ [774]=5,
+ [775]=5,
+ [776]=5,
+ [777]=5,
+ [778]=5,
+ [779]=5,
+ [780]=5,
+ [781]=5,
+ [782]=5,
+ [783]=5,
+ [784]=5,
+ [785]=5,
+ [786]=5,
+ [787]=5,
+ [788]=5,
+ [789]=5,
+ [790]=5,
+ [791]=5,
+ [792]=5,
+ [793]=5,
+ [794]=5,
+ [795]=5,
+ [796]=5,
+ [797]=5,
+ [798]=5,
+ [799]=5,
+ [800]=5,
+ [801]=5,
+ [802]=5,
+ [803]=5,
+ [804]=5,
+ [805]=5,
+ [806]=5,
+ [807]=5,
+ [808]=5,
+ [809]=5,
+ [810]=5,
+ [811]=5,
+ [812]=5,
+ [813]=5,
+ [814]=5,
+ [815]=5,
+ [816]=5,
+ [817]=5,
+ [818]=5,
+ [819]=5,
+ [820]=5,
+ [821]=5,
+ [822]=5,
+ [823]=5,
+ [824]=5,
+ [825]=5,
+ [826]=5,
+ [827]=5,
+ [828]=5,
+ [829]=5,
+ [830]=5,
+ [831]=5,
+ [832]=5,
+ [833]=5,
+ [834]=5,
+ [835]=5,
+ [836]=5,
+ [837]=5,
+ [838]=5,
+ [839]=5,
+ [840]=5,
+ [841]=5,
+ [842]=5,
+ [843]=5,
+ [844]=5,
+ [845]=5,
+ [846]=5,
+ [847]=5,
+ [848]=5,
+ [849]=5,
+ [850]=5,
+ [851]=5,
+ [852]=5,
+ [853]=5,
+ [854]=5,
+ [855]=5,
+ [856]=5,
+ [857]=5,
+ [858]=5,
+ [859]=5,
+ [860]=5,
+ [861]=5,
+ [862]=5,
+ [863]=5,
+ [864]=5,
+ [865]=5,
+ [866]=5,
+ [867]=5,
+ [868]=5,
+ [869]=5,
+ [870]=5,
+ [871]=5,
+ [872]=5,
+ [873]=5,
+ [874]=5,
+ [875]=5,
+ [876]=5,
+ [877]=5,
+ [878]=5,
+ [879]=5,
+ [1155]=5,
+ [1156]=5,
+ [1157]=5,
+ [1158]=5,
+ [1159]=5,
+ [1425]=5,
+ [1426]=5,
+ [1427]=5,
+ [1428]=5,
+ [1429]=5,
+ [1430]=5,
+ [1431]=5,
+ [1432]=5,
+ [1433]=5,
+ [1434]=5,
+ [1435]=5,
+ [1436]=5,
+ [1437]=5,
+ [1438]=5,
+ [1439]=5,
+ [1440]=5,
+ [1441]=5,
+ [1442]=5,
+ [1443]=5,
+ [1444]=5,
+ [1445]=5,
+ [1446]=5,
+ [1447]=5,
+ [1448]=5,
+ [1449]=5,
+ [1450]=5,
+ [1451]=5,
+ [1452]=5,
+ [1453]=5,
+ [1454]=5,
+ [1455]=5,
+ [1456]=5,
+ [1457]=5,
+ [1458]=5,
+ [1459]=5,
+ [1460]=5,
+ [1461]=5,
+ [1462]=5,
+ [1463]=5,
+ [1464]=5,
+ [1465]=5,
+ [1466]=5,
+ [1467]=5,
+ [1468]=5,
+ [1469]=5,
+ [1471]=5,
+ [1473]=5,
+ [1474]=5,
+ [1476]=5,
+ [1477]=5,
+ [1479]=5,
  [1536]=4,
  [1537]=4,
  [1538]=4,
@@ -389,6 +557,17 @@ characters.classifiers={
  [1917]=2,
  [1918]=2,
  [1919]=2,
+ [1958]=5,
+ [1959]=5,
+ [1960]=5,
+ [1961]=5,
+ [1962]=5,
+ [1963]=5,
+ [1964]=5,
+ [1965]=5,
+ [1966]=5,
+ [1967]=5,
+ [1968]=5,
  [1984]=6,
  [1985]=6,
  [1986]=6,
@@ -448,6 +627,27 @@ characters.classifiers={
  [2040]=6,
  [2041]=6,
  [2042]=2,
+ [2070]=5,
+ [2071]=5,
+ [2072]=5,
+ [2073]=5,
+ [2075]=5,
+ [2076]=5,
+ [2077]=5,
+ [2078]=5,
+ [2079]=5,
+ [2080]=5,
+ [2081]=5,
+ [2082]=5,
+ [2083]=5,
+ [2085]=5,
+ [2086]=5,
+ [2087]=5,
+ [2089]=5,
+ [2090]=5,
+ [2091]=5,
+ [2092]=5,
+ [2093]=5,
  [2112]=3,
  [2113]=2,
  [2114]=2,
@@ -473,6 +673,9 @@ characters.classifiers={
  [2134]=4,
  [2135]=4,
  [2136]=4,
+ [2137]=5,
+ [2138]=5,
+ [2139]=5,
  [2208]=2,
  [2209]=2,
  [2210]=2,
@@ -494,9 +697,339 @@ characters.classifiers={
  [2226]=3,
  [2227]=2,
  [2228]=2,
+ [2230]=2,
+ [2231]=2,
+ [2232]=2,
+ [2233]=3,
+ [2234]=2,
+ [2235]=2,
+ [2236]=2,
+ [2237]=2,
+ [2260]=5,
+ [2261]=5,
+ [2262]=5,
+ [2263]=5,
+ [2264]=5,
+ [2265]=5,
+ [2266]=5,
+ [2267]=5,
+ [2268]=5,
+ [2269]=5,
+ [2270]=5,
+ [2271]=5,
+ [2272]=5,
+ [2273]=5,
+ [2274]=4,
+ [2275]=5,
+ [2276]=5,
+ [2277]=5,
+ [2278]=5,
+ [2279]=5,
+ [2280]=5,
+ [2281]=5,
+ [2282]=5,
+ [2283]=5,
+ [2284]=5,
+ [2285]=5,
+ [2286]=5,
+ [2287]=5,
+ [2288]=5,
+ [2289]=5,
+ [2290]=5,
+ [2291]=5,
+ [2292]=5,
+ [2293]=5,
+ [2294]=5,
+ [2295]=5,
+ [2296]=5,
+ [2297]=5,
+ [2298]=5,
+ [2299]=5,
+ [2300]=5,
+ [2301]=5,
+ [2302]=5,
+ [2303]=5,
+ [2304]=5,
+ [2305]=5,
+ [2306]=5,
+ [2362]=5,
+ [2364]=5,
+ [2369]=5,
+ [2370]=5,
+ [2371]=5,
+ [2372]=5,
+ [2373]=5,
+ [2374]=5,
+ [2375]=5,
+ [2376]=5,
+ [2381]=5,
+ [2385]=5,
+ [2386]=5,
+ [2387]=5,
+ [2388]=5,
+ [2389]=5,
+ [2390]=5,
+ [2391]=5,
+ [2402]=5,
+ [2403]=5,
+ [2433]=5,
+ [2492]=5,
+ [2497]=5,
+ [2498]=5,
+ [2499]=5,
+ [2500]=5,
+ [2509]=5,
+ [2530]=5,
+ [2531]=5,
+ [2561]=5,
+ [2562]=5,
+ [2620]=5,
+ [2625]=5,
+ [2626]=5,
+ [2631]=5,
+ [2632]=5,
+ [2635]=5,
+ [2636]=5,
+ [2637]=5,
+ [2641]=5,
+ [2672]=5,
+ [2673]=5,
+ [2677]=5,
+ [2689]=5,
+ [2690]=5,
+ [2748]=5,
+ [2753]=5,
+ [2754]=5,
+ [2755]=5,
+ [2756]=5,
+ [2757]=5,
+ [2759]=5,
+ [2760]=5,
+ [2765]=5,
+ [2786]=5,
+ [2787]=5,
+ [2817]=5,
+ [2876]=5,
+ [2879]=5,
+ [2881]=5,
+ [2882]=5,
+ [2883]=5,
+ [2884]=5,
+ [2893]=5,
+ [2902]=5,
+ [2914]=5,
+ [2915]=5,
+ [2946]=5,
+ [3008]=5,
+ [3021]=5,
+ [3072]=5,
+ [3134]=5,
+ [3135]=5,
+ [3136]=5,
+ [3142]=5,
+ [3143]=5,
+ [3144]=5,
+ [3146]=5,
+ [3147]=5,
+ [3148]=5,
+ [3149]=5,
+ [3157]=5,
+ [3158]=5,
+ [3170]=5,
+ [3171]=5,
+ [3201]=5,
+ [3260]=5,
+ [3263]=5,
+ [3270]=5,
+ [3276]=5,
+ [3277]=5,
+ [3298]=5,
+ [3299]=5,
+ [3329]=5,
+ [3393]=5,
+ [3394]=5,
+ [3395]=5,
+ [3396]=5,
+ [3405]=5,
+ [3426]=5,
+ [3427]=5,
+ [3530]=5,
+ [3538]=5,
+ [3539]=5,
+ [3540]=5,
+ [3542]=5,
+ [3633]=5,
+ [3636]=5,
+ [3637]=5,
+ [3638]=5,
+ [3639]=5,
+ [3640]=5,
+ [3641]=5,
+ [3642]=5,
+ [3655]=5,
+ [3656]=5,
+ [3657]=5,
+ [3658]=5,
+ [3659]=5,
+ [3660]=5,
+ [3661]=5,
+ [3662]=5,
+ [3761]=5,
+ [3764]=5,
+ [3765]=5,
+ [3766]=5,
+ [3767]=5,
+ [3768]=5,
+ [3769]=5,
+ [3771]=5,
+ [3772]=5,
+ [3784]=5,
+ [3785]=5,
+ [3786]=5,
+ [3787]=5,
+ [3788]=5,
+ [3789]=5,
+ [3864]=5,
+ [3865]=5,
+ [3893]=5,
+ [3895]=5,
+ [3897]=5,
+ [3953]=5,
+ [3954]=5,
+ [3955]=5,
+ [3956]=5,
+ [3957]=5,
+ [3958]=5,
+ [3959]=5,
+ [3960]=5,
+ [3961]=5,
+ [3962]=5,
+ [3963]=5,
+ [3964]=5,
+ [3965]=5,
+ [3966]=5,
+ [3968]=5,
+ [3969]=5,
+ [3970]=5,
+ [3971]=5,
+ [3972]=5,
+ [3974]=5,
+ [3975]=5,
+ [3981]=5,
+ [3982]=5,
+ [3983]=5,
+ [3984]=5,
+ [3985]=5,
+ [3986]=5,
+ [3987]=5,
+ [3988]=5,
+ [3989]=5,
+ [3990]=5,
+ [3991]=5,
+ [3993]=5,
+ [3994]=5,
+ [3995]=5,
+ [3996]=5,
+ [3997]=5,
+ [3998]=5,
+ [3999]=5,
+ [4000]=5,
+ [4001]=5,
+ [4002]=5,
+ [4003]=5,
+ [4004]=5,
+ [4005]=5,
+ [4006]=5,
+ [4007]=5,
+ [4008]=5,
+ [4009]=5,
+ [4010]=5,
+ [4011]=5,
+ [4012]=5,
+ [4013]=5,
+ [4014]=5,
+ [4015]=5,
+ [4016]=5,
+ [4017]=5,
+ [4018]=5,
+ [4019]=5,
+ [4020]=5,
+ [4021]=5,
+ [4022]=5,
+ [4023]=5,
+ [4024]=5,
+ [4025]=5,
+ [4026]=5,
+ [4027]=5,
+ [4028]=5,
+ [4038]=5,
+ [4141]=5,
+ [4142]=5,
+ [4143]=5,
+ [4144]=5,
+ [4146]=5,
+ [4147]=5,
+ [4148]=5,
+ [4149]=5,
+ [4150]=5,
+ [4151]=5,
+ [4153]=5,
+ [4154]=5,
+ [4157]=5,
+ [4158]=5,
+ [4184]=5,
+ [4185]=5,
+ [4190]=5,
+ [4191]=5,
+ [4192]=5,
+ [4209]=5,
+ [4210]=5,
+ [4211]=5,
+ [4212]=5,
+ [4226]=5,
+ [4229]=5,
+ [4230]=5,
+ [4237]=5,
+ [4253]=5,
+ [4957]=5,
+ [4958]=5,
+ [4959]=5,
+ [5906]=5,
+ [5907]=5,
+ [5908]=5,
+ [5938]=5,
+ [5939]=5,
+ [5940]=5,
+ [5970]=5,
+ [5971]=5,
+ [6002]=5,
+ [6003]=5,
+ [6071]=5,
+ [6072]=5,
+ [6073]=5,
+ [6074]=5,
+ [6075]=5,
+ [6076]=5,
+ [6077]=5,
+ [6086]=5,
+ [6089]=5,
+ [6090]=5,
+ [6091]=5,
+ [6092]=5,
+ [6093]=5,
+ [6094]=5,
+ [6095]=5,
+ [6096]=5,
+ [6097]=5,
+ [6098]=5,
+ [6099]=5,
+ [6109]=5,
  [6150]=4,
  [6151]=2,
  [6154]=2,
+ [6155]=5,
+ [6156]=5,
+ [6157]=5,
  [6158]=4,
  [6176]=2,
  [6177]=2,
@@ -591,8 +1124,6 @@ characters.classifiers={
  [6274]=4,
  [6275]=4,
  [6276]=4,
- [6277]=4,
- [6278]=4,
  [6279]=2,
  [6280]=2,
  [6281]=2,
@@ -627,13 +1158,291 @@ characters.classifiers={
  [6310]=2,
  [6311]=2,
  [6312]=2,
+ [6313]=5,
  [6314]=2,
+ [6432]=5,
+ [6433]=5,
+ [6434]=5,
+ [6439]=5,
+ [6440]=5,
+ [6450]=5,
+ [6457]=5,
+ [6458]=5,
+ [6459]=5,
+ [6679]=5,
+ [6680]=5,
+ [6742]=5,
+ [6744]=5,
+ [6745]=5,
+ [6746]=5,
+ [6747]=5,
+ [6748]=5,
+ [6749]=5,
+ [6750]=5,
+ [6752]=5,
+ [6754]=5,
+ [6757]=5,
+ [6758]=5,
+ [6759]=5,
+ [6760]=5,
+ [6761]=5,
+ [6762]=5,
+ [6763]=5,
+ [6764]=5,
+ [6771]=5,
+ [6772]=5,
+ [6773]=5,
+ [6774]=5,
+ [6775]=5,
+ [6776]=5,
+ [6777]=5,
+ [6778]=5,
+ [6779]=5,
+ [6780]=5,
+ [6783]=5,
+ [6832]=5,
+ [6833]=5,
+ [6834]=5,
+ [6835]=5,
+ [6836]=5,
+ [6837]=5,
+ [6838]=5,
+ [6839]=5,
+ [6840]=5,
+ [6841]=5,
+ [6842]=5,
+ [6843]=5,
+ [6844]=5,
+ [6845]=5,
+ [6912]=5,
+ [6913]=5,
+ [6914]=5,
+ [6915]=5,
+ [6964]=5,
+ [6966]=5,
+ [6967]=5,
+ [6968]=5,
+ [6969]=5,
+ [6970]=5,
+ [6972]=5,
+ [6978]=5,
+ [7019]=5,
+ [7020]=5,
+ [7021]=5,
+ [7022]=5,
+ [7023]=5,
+ [7024]=5,
+ [7025]=5,
+ [7026]=5,
+ [7027]=5,
+ [7040]=5,
+ [7041]=5,
+ [7074]=5,
+ [7075]=5,
+ [7076]=5,
+ [7077]=5,
+ [7080]=5,
+ [7081]=5,
+ [7083]=5,
+ [7142]=5,
+ [7144]=5,
+ [7145]=5,
+ [7149]=5,
+ [7151]=5,
+ [7152]=5,
+ [7153]=5,
+ [7212]=5,
+ [7213]=5,
+ [7214]=5,
+ [7215]=5,
+ [7216]=5,
+ [7217]=5,
+ [7218]=5,
+ [7219]=5,
+ [7222]=5,
+ [7223]=5,
+ [7376]=5,
+ [7377]=5,
+ [7378]=5,
+ [7380]=5,
+ [7381]=5,
+ [7382]=5,
+ [7383]=5,
+ [7384]=5,
+ [7385]=5,
+ [7386]=5,
+ [7387]=5,
+ [7388]=5,
+ [7389]=5,
+ [7390]=5,
+ [7391]=5,
+ [7392]=5,
+ [7394]=5,
+ [7395]=5,
+ [7396]=5,
+ [7397]=5,
+ [7398]=5,
+ [7399]=5,
+ [7400]=5,
+ [7405]=5,
+ [7412]=5,
+ [7416]=5,
+ [7417]=5,
+ [7616]=5,
+ [7617]=5,
+ [7618]=5,
+ [7619]=5,
+ [7620]=5,
+ [7621]=5,
+ [7622]=5,
+ [7623]=5,
+ [7624]=5,
+ [7625]=5,
+ [7626]=5,
+ [7627]=5,
+ [7628]=5,
+ [7629]=5,
+ [7630]=5,
+ [7631]=5,
+ [7632]=5,
+ [7633]=5,
+ [7634]=5,
+ [7635]=5,
+ [7636]=5,
+ [7637]=5,
+ [7638]=5,
+ [7639]=5,
+ [7640]=5,
+ [7641]=5,
+ [7642]=5,
+ [7643]=5,
+ [7644]=5,
+ [7645]=5,
+ [7646]=5,
+ [7647]=5,
+ [7648]=5,
+ [7649]=5,
+ [7650]=5,
+ [7651]=5,
+ [7652]=5,
+ [7653]=5,
+ [7654]=5,
+ [7655]=5,
+ [7656]=5,
+ [7657]=5,
+ [7658]=5,
+ [7659]=5,
+ [7660]=5,
+ [7661]=5,
+ [7662]=5,
+ [7663]=5,
+ [7664]=5,
+ [7665]=5,
+ [7666]=5,
+ [7667]=5,
+ [7668]=5,
+ [7669]=5,
+ [7675]=5,
+ [7676]=5,
+ [7677]=5,
+ [7678]=5,
+ [7679]=5,
  [8204]=4,
  [8205]=2,
+ [8239]=4,
  [8294]=4,
  [8295]=4,
  [8296]=4,
  [8297]=4,
+ [8400]=5,
+ [8401]=5,
+ [8402]=5,
+ [8403]=5,
+ [8404]=5,
+ [8405]=5,
+ [8406]=5,
+ [8407]=5,
+ [8408]=5,
+ [8409]=5,
+ [8410]=5,
+ [8411]=5,
+ [8412]=5,
+ [8417]=5,
+ [8421]=5,
+ [8422]=5,
+ [8423]=5,
+ [8424]=5,
+ [8425]=5,
+ [8426]=5,
+ [8427]=5,
+ [8428]=5,
+ [8429]=5,
+ [8430]=5,
+ [8431]=5,
+ [8432]=5,
+ [11503]=5,
+ [11504]=5,
+ [11505]=5,
+ [11647]=5,
+ [11744]=5,
+ [11745]=5,
+ [11746]=5,
+ [11747]=5,
+ [11748]=5,
+ [11749]=5,
+ [11750]=5,
+ [11751]=5,
+ [11752]=5,
+ [11753]=5,
+ [11754]=5,
+ [11755]=5,
+ [11756]=5,
+ [11757]=5,
+ [11758]=5,
+ [11759]=5,
+ [11760]=5,
+ [11761]=5,
+ [11762]=5,
+ [11763]=5,
+ [11764]=5,
+ [11765]=5,
+ [11766]=5,
+ [11767]=5,
+ [11768]=5,
+ [11769]=5,
+ [11770]=5,
+ [11771]=5,
+ [11772]=5,
+ [11773]=5,
+ [11774]=5,
+ [11775]=5,
+ [12330]=5,
+ [12331]=5,
+ [12332]=5,
+ [12333]=5,
+ [12334]=5,
+ [12335]=5,
+ [12441]=5,
+ [12442]=5,
+ [42607]=5,
+ [42612]=5,
+ [42613]=5,
+ [42614]=5,
+ [42615]=5,
+ [42616]=5,
+ [42617]=5,
+ [42618]=5,
+ [42619]=5,
+ [42620]=5,
+ [42621]=5,
+ [42654]=5,
+ [42655]=5,
+ [42736]=5,
+ [42737]=5,
+ [43014]=5,
+ [43019]=5,
+ [43045]=5,
+ [43046]=5,
  [43072]=2,
  [43073]=2,
  [43074]=2,
@@ -686,6 +1495,120 @@ characters.classifiers={
  [43121]=2,
  [43122]=1,
  [43123]=4,
+ [43204]=5,
+ [43205]=5,
+ [43232]=5,
+ [43233]=5,
+ [43234]=5,
+ [43235]=5,
+ [43236]=5,
+ [43237]=5,
+ [43238]=5,
+ [43239]=5,
+ [43240]=5,
+ [43241]=5,
+ [43242]=5,
+ [43243]=5,
+ [43244]=5,
+ [43245]=5,
+ [43246]=5,
+ [43247]=5,
+ [43248]=5,
+ [43249]=5,
+ [43302]=5,
+ [43303]=5,
+ [43304]=5,
+ [43305]=5,
+ [43306]=5,
+ [43307]=5,
+ [43308]=5,
+ [43309]=5,
+ [43335]=5,
+ [43336]=5,
+ [43337]=5,
+ [43338]=5,
+ [43339]=5,
+ [43340]=5,
+ [43341]=5,
+ [43342]=5,
+ [43343]=5,
+ [43344]=5,
+ [43345]=5,
+ [43392]=5,
+ [43393]=5,
+ [43394]=5,
+ [43443]=5,
+ [43446]=5,
+ [43447]=5,
+ [43448]=5,
+ [43449]=5,
+ [43452]=5,
+ [43493]=5,
+ [43561]=5,
+ [43562]=5,
+ [43563]=5,
+ [43564]=5,
+ [43565]=5,
+ [43566]=5,
+ [43569]=5,
+ [43570]=5,
+ [43573]=5,
+ [43574]=5,
+ [43587]=5,
+ [43596]=5,
+ [43644]=5,
+ [43696]=5,
+ [43698]=5,
+ [43699]=5,
+ [43700]=5,
+ [43703]=5,
+ [43704]=5,
+ [43710]=5,
+ [43711]=5,
+ [43713]=5,
+ [43756]=5,
+ [43757]=5,
+ [43766]=5,
+ [44005]=5,
+ [44008]=5,
+ [44013]=5,
+ [64286]=5,
+ [65056]=5,
+ [65057]=5,
+ [65058]=5,
+ [65059]=5,
+ [65060]=5,
+ [65061]=5,
+ [65062]=5,
+ [65063]=5,
+ [65064]=5,
+ [65065]=5,
+ [65066]=5,
+ [65067]=5,
+ [65068]=5,
+ [65069]=5,
+ [65070]=5,
+ [65071]=5,
+ [66045]=5,
+ [66272]=5,
+ [66422]=5,
+ [66423]=5,
+ [66424]=5,
+ [66425]=5,
+ [66426]=5,
+ [68097]=5,
+ [68098]=5,
+ [68099]=5,
+ [68101]=5,
+ [68102]=5,
+ [68108]=5,
+ [68109]=5,
+ [68110]=5,
+ [68111]=5,
+ [68152]=5,
+ [68153]=5,
+ [68154]=5,
+ [68159]=5,
  [68288]=2,
  [68289]=2,
  [68290]=2,
@@ -723,6 +1646,8 @@ characters.classifiers={
  [68322]=4,
  [68323]=4,
  [68324]=3,
+ [68325]=5,
+ [68326]=5,
  [68331]=2,
  [68332]=2,
  [68333]=2,
@@ -753,6 +1678,497 @@ characters.classifiers={
  [68525]=2,
  [68526]=2,
  [68527]=4,
+ [69633]=5,
+ [69688]=5,
+ [69689]=5,
+ [69690]=5,
+ [69691]=5,
+ [69692]=5,
+ [69693]=5,
+ [69694]=5,
+ [69695]=5,
+ [69696]=5,
+ [69697]=5,
+ [69698]=5,
+ [69699]=5,
+ [69700]=5,
+ [69701]=5,
+ [69702]=5,
+ [69759]=5,
+ [69760]=5,
+ [69761]=5,
+ [69811]=5,
+ [69812]=5,
+ [69813]=5,
+ [69814]=5,
+ [69817]=5,
+ [69818]=5,
+ [69888]=5,
+ [69889]=5,
+ [69890]=5,
+ [69927]=5,
+ [69928]=5,
+ [69929]=5,
+ [69930]=5,
+ [69931]=5,
+ [69933]=5,
+ [69934]=5,
+ [69935]=5,
+ [69936]=5,
+ [69937]=5,
+ [69938]=5,
+ [69939]=5,
+ [69940]=5,
+ [70003]=5,
+ [70016]=5,
+ [70017]=5,
+ [70070]=5,
+ [70071]=5,
+ [70072]=5,
+ [70073]=5,
+ [70074]=5,
+ [70075]=5,
+ [70076]=5,
+ [70077]=5,
+ [70078]=5,
+ [70090]=5,
+ [70091]=5,
+ [70092]=5,
+ [70191]=5,
+ [70192]=5,
+ [70193]=5,
+ [70196]=5,
+ [70198]=5,
+ [70199]=5,
+ [70206]=5,
+ [70367]=5,
+ [70371]=5,
+ [70372]=5,
+ [70373]=5,
+ [70374]=5,
+ [70375]=5,
+ [70376]=5,
+ [70377]=5,
+ [70378]=5,
+ [70400]=5,
+ [70401]=5,
+ [70460]=5,
+ [70464]=5,
+ [70502]=5,
+ [70503]=5,
+ [70504]=5,
+ [70505]=5,
+ [70506]=5,
+ [70507]=5,
+ [70508]=5,
+ [70512]=5,
+ [70513]=5,
+ [70514]=5,
+ [70515]=5,
+ [70516]=5,
+ [70712]=5,
+ [70713]=5,
+ [70714]=5,
+ [70715]=5,
+ [70716]=5,
+ [70717]=5,
+ [70718]=5,
+ [70719]=5,
+ [70722]=5,
+ [70723]=5,
+ [70724]=5,
+ [70726]=5,
+ [70835]=5,
+ [70836]=5,
+ [70837]=5,
+ [70838]=5,
+ [70839]=5,
+ [70840]=5,
+ [70842]=5,
+ [70847]=5,
+ [70848]=5,
+ [70850]=5,
+ [70851]=5,
+ [71090]=5,
+ [71091]=5,
+ [71092]=5,
+ [71093]=5,
+ [71100]=5,
+ [71101]=5,
+ [71103]=5,
+ [71104]=5,
+ [71132]=5,
+ [71133]=5,
+ [71219]=5,
+ [71220]=5,
+ [71221]=5,
+ [71222]=5,
+ [71223]=5,
+ [71224]=5,
+ [71225]=5,
+ [71226]=5,
+ [71229]=5,
+ [71231]=5,
+ [71232]=5,
+ [71339]=5,
+ [71341]=5,
+ [71344]=5,
+ [71345]=5,
+ [71346]=5,
+ [71347]=5,
+ [71348]=5,
+ [71349]=5,
+ [71351]=5,
+ [71453]=5,
+ [71454]=5,
+ [71455]=5,
+ [71458]=5,
+ [71459]=5,
+ [71460]=5,
+ [71461]=5,
+ [71463]=5,
+ [71464]=5,
+ [71465]=5,
+ [71466]=5,
+ [71467]=5,
+ [72752]=5,
+ [72753]=5,
+ [72754]=5,
+ [72755]=5,
+ [72756]=5,
+ [72757]=5,
+ [72758]=5,
+ [72760]=5,
+ [72761]=5,
+ [72762]=5,
+ [72763]=5,
+ [72764]=5,
+ [72765]=5,
+ [72767]=5,
+ [72850]=5,
+ [72851]=5,
+ [72852]=5,
+ [72853]=5,
+ [72854]=5,
+ [72855]=5,
+ [72856]=5,
+ [72857]=5,
+ [72858]=5,
+ [72859]=5,
+ [72860]=5,
+ [72861]=5,
+ [72862]=5,
+ [72863]=5,
+ [72864]=5,
+ [72865]=5,
+ [72866]=5,
+ [72867]=5,
+ [72868]=5,
+ [72869]=5,
+ [72870]=5,
+ [72871]=5,
+ [72874]=5,
+ [72875]=5,
+ [72876]=5,
+ [72877]=5,
+ [72878]=5,
+ [72879]=5,
+ [72880]=5,
+ [72882]=5,
+ [72883]=5,
+ [72885]=5,
+ [72886]=5,
+ [92912]=5,
+ [92913]=5,
+ [92914]=5,
+ [92915]=5,
+ [92916]=5,
+ [92976]=5,
+ [92977]=5,
+ [92978]=5,
+ [92979]=5,
+ [92980]=5,
+ [92981]=5,
+ [92982]=5,
+ [94095]=5,
+ [94096]=5,
+ [94097]=5,
+ [94098]=5,
+ [113821]=5,
+ [113822]=5,
+ [119143]=5,
+ [119144]=5,
+ [119145]=5,
+ [119163]=5,
+ [119164]=5,
+ [119165]=5,
+ [119166]=5,
+ [119167]=5,
+ [119168]=5,
+ [119169]=5,
+ [119170]=5,
+ [119173]=5,
+ [119174]=5,
+ [119175]=5,
+ [119176]=5,
+ [119177]=5,
+ [119178]=5,
+ [119179]=5,
+ [119210]=5,
+ [119211]=5,
+ [119212]=5,
+ [119213]=5,
+ [119362]=5,
+ [119363]=5,
+ [119364]=5,
+ [121344]=5,
+ [121345]=5,
+ [121346]=5,
+ [121347]=5,
+ [121348]=5,
+ [121349]=5,
+ [121350]=5,
+ [121351]=5,
+ [121352]=5,
+ [121353]=5,
+ [121354]=5,
+ [121355]=5,
+ [121356]=5,
+ [121357]=5,
+ [121358]=5,
+ [121359]=5,
+ [121360]=5,
+ [121361]=5,
+ [121362]=5,
+ [121363]=5,
+ [121364]=5,
+ [121365]=5,
+ [121366]=5,
+ [121367]=5,
+ [121368]=5,
+ [121369]=5,
+ [121370]=5,
+ [121371]=5,
+ [121372]=5,
+ [121373]=5,
+ [121374]=5,
+ [121375]=5,
+ [121376]=5,
+ [121377]=5,
+ [121378]=5,
+ [121379]=5,
+ [121380]=5,
+ [121381]=5,
+ [121382]=5,
+ [121383]=5,
+ [121384]=5,
+ [121385]=5,
+ [121386]=5,
+ [121387]=5,
+ [121388]=5,
+ [121389]=5,
+ [121390]=5,
+ [121391]=5,
+ [121392]=5,
+ [121393]=5,
+ [121394]=5,
+ [121395]=5,
+ [121396]=5,
+ [121397]=5,
+ [121398]=5,
+ [121403]=5,
+ [121404]=5,
+ [121405]=5,
+ [121406]=5,
+ [121407]=5,
+ [121408]=5,
+ [121409]=5,
+ [121410]=5,
+ [121411]=5,
+ [121412]=5,
+ [121413]=5,
+ [121414]=5,
+ [121415]=5,
+ [121416]=5,
+ [121417]=5,
+ [121418]=5,
+ [121419]=5,
+ [121420]=5,
+ [121421]=5,
+ [121422]=5,
+ [121423]=5,
+ [121424]=5,
+ [121425]=5,
+ [121426]=5,
+ [121427]=5,
+ [121428]=5,
+ [121429]=5,
+ [121430]=5,
+ [121431]=5,
+ [121432]=5,
+ [121433]=5,
+ [121434]=5,
+ [121435]=5,
+ [121436]=5,
+ [121437]=5,
+ [121438]=5,
+ [121439]=5,
+ [121440]=5,
+ [121441]=5,
+ [121442]=5,
+ [121443]=5,
+ [121444]=5,
+ [121445]=5,
+ [121446]=5,
+ [121447]=5,
+ [121448]=5,
+ [121449]=5,
+ [121450]=5,
+ [121451]=5,
+ [121452]=5,
+ [121461]=5,
+ [121476]=5,
+ [121499]=5,
+ [121500]=5,
+ [121501]=5,
+ [121502]=5,
+ [121503]=5,
+ [121505]=5,
+ [121506]=5,
+ [121507]=5,
+ [121508]=5,
+ [121509]=5,
+ [121510]=5,
+ [121511]=5,
+ [121512]=5,
+ [121513]=5,
+ [121514]=5,
+ [121515]=5,
+ [121516]=5,
+ [121517]=5,
+ [121518]=5,
+ [121519]=5,
+ [122880]=5,
+ [122881]=5,
+ [122882]=5,
+ [122883]=5,
+ [122884]=5,
+ [122885]=5,
+ [122886]=5,
+ [122888]=5,
+ [122889]=5,
+ [122890]=5,
+ [122891]=5,
+ [122892]=5,
+ [122893]=5,
+ [122894]=5,
+ [122895]=5,
+ [122896]=5,
+ [122897]=5,
+ [122898]=5,
+ [122899]=5,
+ [122900]=5,
+ [122901]=5,
+ [122902]=5,
+ [122903]=5,
+ [122904]=5,
+ [122907]=5,
+ [122908]=5,
+ [122909]=5,
+ [122910]=5,
+ [122911]=5,
+ [122912]=5,
+ [122913]=5,
+ [122915]=5,
+ [122916]=5,
+ [122918]=5,
+ [122919]=5,
+ [122920]=5,
+ [122921]=5,
+ [122922]=5,
+ [125136]=5,
+ [125137]=5,
+ [125138]=5,
+ [125139]=5,
+ [125140]=5,
+ [125141]=5,
+ [125142]=5,
+ [125184]=2,
+ [125185]=2,
+ [125186]=2,
+ [125187]=2,
+ [125188]=2,
+ [125189]=2,
+ [125190]=2,
+ [125191]=2,
+ [125192]=2,
+ [125193]=2,
+ [125194]=2,
+ [125195]=2,
+ [125196]=2,
+ [125197]=2,
+ [125198]=2,
+ [125199]=2,
+ [125200]=2,
+ [125201]=2,
+ [125202]=2,
+ [125203]=2,
+ [125204]=2,
+ [125205]=2,
+ [125206]=2,
+ [125207]=2,
+ [125208]=2,
+ [125209]=2,
+ [125210]=2,
+ [125211]=2,
+ [125212]=2,
+ [125213]=2,
+ [125214]=2,
+ [125215]=2,
+ [125216]=2,
+ [125217]=2,
+ [125218]=2,
+ [125219]=2,
+ [125220]=2,
+ [125221]=2,
+ [125222]=2,
+ [125223]=2,
+ [125224]=2,
+ [125225]=2,
+ [125226]=2,
+ [125227]=2,
+ [125228]=2,
+ [125229]=2,
+ [125230]=2,
+ [125231]=2,
+ [125232]=2,
+ [125233]=2,
+ [125234]=2,
+ [125235]=2,
+ [125236]=2,
+ [125237]=2,
+ [125238]=2,
+ [125239]=2,
+ [125240]=2,
+ [125241]=2,
+ [125242]=2,
+ [125243]=2,
+ [125244]=2,
+ [125245]=2,
+ [125246]=2,
+ [125247]=2,
+ [125248]=2,
+ [125249]=2,
+ [125250]=2,
+ [125251]=2,
+ [125252]=5,
+ [125253]=5,
+ [125254]=5,
+ [125255]=5,
+ [125256]=5,
+ [125257]=5,
+ [125258]=5,
+ [1042752]=5,
 }
 
 -- done
diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua
index 5571a82ba..f9a59734b 100644
--- a/tex/generic/context/luatex/luatex-basics-nod.lua
+++ b/tex/generic/context/luatex/luatex-basics-nod.lua
@@ -228,8 +228,8 @@ nuts.getcomponents = direct.getcomponents or function(n)   return getfield(n,"co
 nuts.setcomponents = direct.setcomponents or function(n,c)        setfield(n,"components",c) end
 nuts.getkern       = direct.getkern       or function(n)   return getfield(n,"kern")         end
 nuts.setkern       = direct.setkern       or function(n,k)        setfield(n,"kern",k)       end
-nuts.getdir        = direct.getkern       or function(n)   return getfield(n,"dir")          end
-nuts.setdir        = direct.setkern       or function(n,d)        setfield(n,"dir",d)        end
+nuts.getdir        = direct.getdir        or function(n)   return getfield(n,"dir")          end
+nuts.setdir        = direct.setdir        or function(n,d)        setfield(n,"dir",d)        end
 nuts.getwidth      = direct.getwidth      or function(n)   return getfield(n,"width")        end
 nuts.setwidth      = direct.setwidth      or function(n,w) return setfield(n,"width",w)      end
 nuts.getheight     = direct.getheight     or function(n)   return getfield(n,"height")       end
diff --git a/tex/generic/context/luatex/luatex-basics-prepare.tex b/tex/generic/context/luatex/luatex-basics-prepare.tex
index 105226440..76a35cc94 100644
--- a/tex/generic/context/luatex/luatex-basics-prepare.tex
+++ b/tex/generic/context/luatex/luatex-basics-prepare.tex
@@ -58,6 +58,8 @@ for k, c in next, chardata do
                 else
                     classifiers[k] = s_rest
                 end
+            elseif c.category == "mn" then
+                classifiers[k] = s_mark
             end
         end
     end
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index dbd0a5227..cc9ce7b5f 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 05/14/17 19:09:26
+-- merge date  : 05/15/17 21:48:19
 
 do -- begin closure to overcome local limits and interference
 
@@ -5105,8 +5105,8 @@ nuts.getcomponents=direct.getcomponents or function(n)  return getfield(n,"compo
 nuts.setcomponents=direct.setcomponents or function(n,c)    setfield(n,"components",c) end
 nuts.getkern=direct.getkern    or function(n)  return getfield(n,"kern")     end
 nuts.setkern=direct.setkern    or function(n,k)    setfield(n,"kern",k)    end
-nuts.getdir=direct.getkern    or function(n)  return getfield(n,"dir")     end
-nuts.setdir=direct.setkern    or function(n,d)    setfield(n,"dir",d)    end
+nuts.getdir=direct.getdir    or function(n)  return getfield(n,"dir")     end
+nuts.setdir=direct.setdir    or function(n,d)    setfield(n,"dir",d)    end
 nuts.getwidth=direct.getwidth   or function(n)  return getfield(n,"width")    end
 nuts.setwidth=direct.setwidth   or function(n,w) return setfield(n,"width",w)   end
 nuts.getheight=direct.getheight   or function(n)  return getfield(n,"height")    end
@@ -5319,6 +5319,174 @@ do -- begin closure to overcome local limits and interference
 characters=characters or {}
 characters.blockrange={}
 characters.classifiers={
+ [768]=5,
+ [769]=5,
+ [770]=5,
+ [771]=5,
+ [772]=5,
+ [773]=5,
+ [774]=5,
+ [775]=5,
+ [776]=5,
+ [777]=5,
+ [778]=5,
+ [779]=5,
+ [780]=5,
+ [781]=5,
+ [782]=5,
+ [783]=5,
+ [784]=5,
+ [785]=5,
+ [786]=5,
+ [787]=5,
+ [788]=5,
+ [789]=5,
+ [790]=5,
+ [791]=5,
+ [792]=5,
+ [793]=5,
+ [794]=5,
+ [795]=5,
+ [796]=5,
+ [797]=5,
+ [798]=5,
+ [799]=5,
+ [800]=5,
+ [801]=5,
+ [802]=5,
+ [803]=5,
+ [804]=5,
+ [805]=5,
+ [806]=5,
+ [807]=5,
+ [808]=5,
+ [809]=5,
+ [810]=5,
+ [811]=5,
+ [812]=5,
+ [813]=5,
+ [814]=5,
+ [815]=5,
+ [816]=5,
+ [817]=5,
+ [818]=5,
+ [819]=5,
+ [820]=5,
+ [821]=5,
+ [822]=5,
+ [823]=5,
+ [824]=5,
+ [825]=5,
+ [826]=5,
+ [827]=5,
+ [828]=5,
+ [829]=5,
+ [830]=5,
+ [831]=5,
+ [832]=5,
+ [833]=5,
+ [834]=5,
+ [835]=5,
+ [836]=5,
+ [837]=5,
+ [838]=5,
+ [839]=5,
+ [840]=5,
+ [841]=5,
+ [842]=5,
+ [843]=5,
+ [844]=5,
+ [845]=5,
+ [846]=5,
+ [847]=5,
+ [848]=5,
+ [849]=5,
+ [850]=5,
+ [851]=5,
+ [852]=5,
+ [853]=5,
+ [854]=5,
+ [855]=5,
+ [856]=5,
+ [857]=5,
+ [858]=5,
+ [859]=5,
+ [860]=5,
+ [861]=5,
+ [862]=5,
+ [863]=5,
+ [864]=5,
+ [865]=5,
+ [866]=5,
+ [867]=5,
+ [868]=5,
+ [869]=5,
+ [870]=5,
+ [871]=5,
+ [872]=5,
+ [873]=5,
+ [874]=5,
+ [875]=5,
+ [876]=5,
+ [877]=5,
+ [878]=5,
+ [879]=5,
+ [1155]=5,
+ [1156]=5,
+ [1157]=5,
+ [1158]=5,
+ [1159]=5,
+ [1425]=5,
+ [1426]=5,
+ [1427]=5,
+ [1428]=5,
+ [1429]=5,
+ [1430]=5,
+ [1431]=5,
+ [1432]=5,
+ [1433]=5,
+ [1434]=5,
+ [1435]=5,
+ [1436]=5,
+ [1437]=5,
+ [1438]=5,
+ [1439]=5,
+ [1440]=5,
+ [1441]=5,
+ [1442]=5,
+ [1443]=5,
+ [1444]=5,
+ [1445]=5,
+ [1446]=5,
+ [1447]=5,
+ [1448]=5,
+ [1449]=5,
+ [1450]=5,
+ [1451]=5,
+ [1452]=5,
+ [1453]=5,
+ [1454]=5,
+ [1455]=5,
+ [1456]=5,
+ [1457]=5,
+ [1458]=5,
+ [1459]=5,
+ [1460]=5,
+ [1461]=5,
+ [1462]=5,
+ [1463]=5,
+ [1464]=5,
+ [1465]=5,
+ [1466]=5,
+ [1467]=5,
+ [1468]=5,
+ [1469]=5,
+ [1471]=5,
+ [1473]=5,
+ [1474]=5,
+ [1476]=5,
+ [1477]=5,
+ [1479]=5,
  [1536]=4,
  [1537]=4,
  [1538]=4,
@@ -5699,6 +5867,17 @@ characters.classifiers={
  [1917]=2,
  [1918]=2,
  [1919]=2,
+ [1958]=5,
+ [1959]=5,
+ [1960]=5,
+ [1961]=5,
+ [1962]=5,
+ [1963]=5,
+ [1964]=5,
+ [1965]=5,
+ [1966]=5,
+ [1967]=5,
+ [1968]=5,
  [1984]=6,
  [1985]=6,
  [1986]=6,
@@ -5758,6 +5937,27 @@ characters.classifiers={
  [2040]=6,
  [2041]=6,
  [2042]=2,
+ [2070]=5,
+ [2071]=5,
+ [2072]=5,
+ [2073]=5,
+ [2075]=5,
+ [2076]=5,
+ [2077]=5,
+ [2078]=5,
+ [2079]=5,
+ [2080]=5,
+ [2081]=5,
+ [2082]=5,
+ [2083]=5,
+ [2085]=5,
+ [2086]=5,
+ [2087]=5,
+ [2089]=5,
+ [2090]=5,
+ [2091]=5,
+ [2092]=5,
+ [2093]=5,
  [2112]=3,
  [2113]=2,
  [2114]=2,
@@ -5783,6 +5983,9 @@ characters.classifiers={
  [2134]=4,
  [2135]=4,
  [2136]=4,
+ [2137]=5,
+ [2138]=5,
+ [2139]=5,
  [2208]=2,
  [2209]=2,
  [2210]=2,
@@ -5804,9 +6007,339 @@ characters.classifiers={
  [2226]=3,
  [2227]=2,
  [2228]=2,
+ [2230]=2,
+ [2231]=2,
+ [2232]=2,
+ [2233]=3,
+ [2234]=2,
+ [2235]=2,
+ [2236]=2,
+ [2237]=2,
+ [2260]=5,
+ [2261]=5,
+ [2262]=5,
+ [2263]=5,
+ [2264]=5,
+ [2265]=5,
+ [2266]=5,
+ [2267]=5,
+ [2268]=5,
+ [2269]=5,
+ [2270]=5,
+ [2271]=5,
+ [2272]=5,
+ [2273]=5,
+ [2274]=4,
+ [2275]=5,
+ [2276]=5,
+ [2277]=5,
+ [2278]=5,
+ [2279]=5,
+ [2280]=5,
+ [2281]=5,
+ [2282]=5,
+ [2283]=5,
+ [2284]=5,
+ [2285]=5,
+ [2286]=5,
+ [2287]=5,
+ [2288]=5,
+ [2289]=5,
+ [2290]=5,
+ [2291]=5,
+ [2292]=5,
+ [2293]=5,
+ [2294]=5,
+ [2295]=5,
+ [2296]=5,
+ [2297]=5,
+ [2298]=5,
+ [2299]=5,
+ [2300]=5,
+ [2301]=5,
+ [2302]=5,
+ [2303]=5,
+ [2304]=5,
+ [2305]=5,
+ [2306]=5,
+ [2362]=5,
+ [2364]=5,
+ [2369]=5,
+ [2370]=5,
+ [2371]=5,
+ [2372]=5,
+ [2373]=5,
+ [2374]=5,
+ [2375]=5,
+ [2376]=5,
+ [2381]=5,
+ [2385]=5,
+ [2386]=5,
+ [2387]=5,
+ [2388]=5,
+ [2389]=5,
+ [2390]=5,
+ [2391]=5,
+ [2402]=5,
+ [2403]=5,
+ [2433]=5,
+ [2492]=5,
+ [2497]=5,
+ [2498]=5,
+ [2499]=5,
+ [2500]=5,
+ [2509]=5,
+ [2530]=5,
+ [2531]=5,
+ [2561]=5,
+ [2562]=5,
+ [2620]=5,
+ [2625]=5,
+ [2626]=5,
+ [2631]=5,
+ [2632]=5,
+ [2635]=5,
+ [2636]=5,
+ [2637]=5,
+ [2641]=5,
+ [2672]=5,
+ [2673]=5,
+ [2677]=5,
+ [2689]=5,
+ [2690]=5,
+ [2748]=5,
+ [2753]=5,
+ [2754]=5,
+ [2755]=5,
+ [2756]=5,
+ [2757]=5,
+ [2759]=5,
+ [2760]=5,
+ [2765]=5,
+ [2786]=5,
+ [2787]=5,
+ [2817]=5,
+ [2876]=5,
+ [2879]=5,
+ [2881]=5,
+ [2882]=5,
+ [2883]=5,
+ [2884]=5,
+ [2893]=5,
+ [2902]=5,
+ [2914]=5,
+ [2915]=5,
+ [2946]=5,
+ [3008]=5,
+ [3021]=5,
+ [3072]=5,
+ [3134]=5,
+ [3135]=5,
+ [3136]=5,
+ [3142]=5,
+ [3143]=5,
+ [3144]=5,
+ [3146]=5,
+ [3147]=5,
+ [3148]=5,
+ [3149]=5,
+ [3157]=5,
+ [3158]=5,
+ [3170]=5,
+ [3171]=5,
+ [3201]=5,
+ [3260]=5,
+ [3263]=5,
+ [3270]=5,
+ [3276]=5,
+ [3277]=5,
+ [3298]=5,
+ [3299]=5,
+ [3329]=5,
+ [3393]=5,
+ [3394]=5,
+ [3395]=5,
+ [3396]=5,
+ [3405]=5,
+ [3426]=5,
+ [3427]=5,
+ [3530]=5,
+ [3538]=5,
+ [3539]=5,
+ [3540]=5,
+ [3542]=5,
+ [3633]=5,
+ [3636]=5,
+ [3637]=5,
+ [3638]=5,
+ [3639]=5,
+ [3640]=5,
+ [3641]=5,
+ [3642]=5,
+ [3655]=5,
+ [3656]=5,
+ [3657]=5,
+ [3658]=5,
+ [3659]=5,
+ [3660]=5,
+ [3661]=5,
+ [3662]=5,
+ [3761]=5,
+ [3764]=5,
+ [3765]=5,
+ [3766]=5,
+ [3767]=5,
+ [3768]=5,
+ [3769]=5,
+ [3771]=5,
+ [3772]=5,
+ [3784]=5,
+ [3785]=5,
+ [3786]=5,
+ [3787]=5,
+ [3788]=5,
+ [3789]=5,
+ [3864]=5,
+ [3865]=5,
+ [3893]=5,
+ [3895]=5,
+ [3897]=5,
+ [3953]=5,
+ [3954]=5,
+ [3955]=5,
+ [3956]=5,
+ [3957]=5,
+ [3958]=5,
+ [3959]=5,
+ [3960]=5,
+ [3961]=5,
+ [3962]=5,
+ [3963]=5,
+ [3964]=5,
+ [3965]=5,
+ [3966]=5,
+ [3968]=5,
+ [3969]=5,
+ [3970]=5,
+ [3971]=5,
+ [3972]=5,
+ [3974]=5,
+ [3975]=5,
+ [3981]=5,
+ [3982]=5,
+ [3983]=5,
+ [3984]=5,
+ [3985]=5,
+ [3986]=5,
+ [3987]=5,
+ [3988]=5,
+ [3989]=5,
+ [3990]=5,
+ [3991]=5,
+ [3993]=5,
+ [3994]=5,
+ [3995]=5,
+ [3996]=5,
+ [3997]=5,
+ [3998]=5,
+ [3999]=5,
+ [4000]=5,
+ [4001]=5,
+ [4002]=5,
+ [4003]=5,
+ [4004]=5,
+ [4005]=5,
+ [4006]=5,
+ [4007]=5,
+ [4008]=5,
+ [4009]=5,
+ [4010]=5,
+ [4011]=5,
+ [4012]=5,
+ [4013]=5,
+ [4014]=5,
+ [4015]=5,
+ [4016]=5,
+ [4017]=5,
+ [4018]=5,
+ [4019]=5,
+ [4020]=5,
+ [4021]=5,
+ [4022]=5,
+ [4023]=5,
+ [4024]=5,
+ [4025]=5,
+ [4026]=5,
+ [4027]=5,
+ [4028]=5,
+ [4038]=5,
+ [4141]=5,
+ [4142]=5,
+ [4143]=5,
+ [4144]=5,
+ [4146]=5,
+ [4147]=5,
+ [4148]=5,
+ [4149]=5,
+ [4150]=5,
+ [4151]=5,
+ [4153]=5,
+ [4154]=5,
+ [4157]=5,
+ [4158]=5,
+ [4184]=5,
+ [4185]=5,
+ [4190]=5,
+ [4191]=5,
+ [4192]=5,
+ [4209]=5,
+ [4210]=5,
+ [4211]=5,
+ [4212]=5,
+ [4226]=5,
+ [4229]=5,
+ [4230]=5,
+ [4237]=5,
+ [4253]=5,
+ [4957]=5,
+ [4958]=5,
+ [4959]=5,
+ [5906]=5,
+ [5907]=5,
+ [5908]=5,
+ [5938]=5,
+ [5939]=5,
+ [5940]=5,
+ [5970]=5,
+ [5971]=5,
+ [6002]=5,
+ [6003]=5,
+ [6071]=5,
+ [6072]=5,
+ [6073]=5,
+ [6074]=5,
+ [6075]=5,
+ [6076]=5,
+ [6077]=5,
+ [6086]=5,
+ [6089]=5,
+ [6090]=5,
+ [6091]=5,
+ [6092]=5,
+ [6093]=5,
+ [6094]=5,
+ [6095]=5,
+ [6096]=5,
+ [6097]=5,
+ [6098]=5,
+ [6099]=5,
+ [6109]=5,
  [6150]=4,
  [6151]=2,
  [6154]=2,
+ [6155]=5,
+ [6156]=5,
+ [6157]=5,
  [6158]=4,
  [6176]=2,
  [6177]=2,
@@ -5901,8 +6434,6 @@ characters.classifiers={
  [6274]=4,
  [6275]=4,
  [6276]=4,
- [6277]=4,
- [6278]=4,
  [6279]=2,
  [6280]=2,
  [6281]=2,
@@ -5937,13 +6468,291 @@ characters.classifiers={
  [6310]=2,
  [6311]=2,
  [6312]=2,
+ [6313]=5,
  [6314]=2,
+ [6432]=5,
+ [6433]=5,
+ [6434]=5,
+ [6439]=5,
+ [6440]=5,
+ [6450]=5,
+ [6457]=5,
+ [6458]=5,
+ [6459]=5,
+ [6679]=5,
+ [6680]=5,
+ [6742]=5,
+ [6744]=5,
+ [6745]=5,
+ [6746]=5,
+ [6747]=5,
+ [6748]=5,
+ [6749]=5,
+ [6750]=5,
+ [6752]=5,
+ [6754]=5,
+ [6757]=5,
+ [6758]=5,
+ [6759]=5,
+ [6760]=5,
+ [6761]=5,
+ [6762]=5,
+ [6763]=5,
+ [6764]=5,
+ [6771]=5,
+ [6772]=5,
+ [6773]=5,
+ [6774]=5,
+ [6775]=5,
+ [6776]=5,
+ [6777]=5,
+ [6778]=5,
+ [6779]=5,
+ [6780]=5,
+ [6783]=5,
+ [6832]=5,
+ [6833]=5,
+ [6834]=5,
+ [6835]=5,
+ [6836]=5,
+ [6837]=5,
+ [6838]=5,
+ [6839]=5,
+ [6840]=5,
+ [6841]=5,
+ [6842]=5,
+ [6843]=5,
+ [6844]=5,
+ [6845]=5,
+ [6912]=5,
+ [6913]=5,
+ [6914]=5,
+ [6915]=5,
+ [6964]=5,
+ [6966]=5,
+ [6967]=5,
+ [6968]=5,
+ [6969]=5,
+ [6970]=5,
+ [6972]=5,
+ [6978]=5,
+ [7019]=5,
+ [7020]=5,
+ [7021]=5,
+ [7022]=5,
+ [7023]=5,
+ [7024]=5,
+ [7025]=5,
+ [7026]=5,
+ [7027]=5,
+ [7040]=5,
+ [7041]=5,
+ [7074]=5,
+ [7075]=5,
+ [7076]=5,
+ [7077]=5,
+ [7080]=5,
+ [7081]=5,
+ [7083]=5,
+ [7142]=5,
+ [7144]=5,
+ [7145]=5,
+ [7149]=5,
+ [7151]=5,
+ [7152]=5,
+ [7153]=5,
+ [7212]=5,
+ [7213]=5,
+ [7214]=5,
+ [7215]=5,
+ [7216]=5,
+ [7217]=5,
+ [7218]=5,
+ [7219]=5,
+ [7222]=5,
+ [7223]=5,
+ [7376]=5,
+ [7377]=5,
+ [7378]=5,
+ [7380]=5,
+ [7381]=5,
+ [7382]=5,
+ [7383]=5,
+ [7384]=5,
+ [7385]=5,
+ [7386]=5,
+ [7387]=5,
+ [7388]=5,
+ [7389]=5,
+ [7390]=5,
+ [7391]=5,
+ [7392]=5,
+ [7394]=5,
+ [7395]=5,
+ [7396]=5,
+ [7397]=5,
+ [7398]=5,
+ [7399]=5,
+ [7400]=5,
+ [7405]=5,
+ [7412]=5,
+ [7416]=5,
+ [7417]=5,
+ [7616]=5,
+ [7617]=5,
+ [7618]=5,
+ [7619]=5,
+ [7620]=5,
+ [7621]=5,
+ [7622]=5,
+ [7623]=5,
+ [7624]=5,
+ [7625]=5,
+ [7626]=5,
+ [7627]=5,
+ [7628]=5,
+ [7629]=5,
+ [7630]=5,
+ [7631]=5,
+ [7632]=5,
+ [7633]=5,
+ [7634]=5,
+ [7635]=5,
+ [7636]=5,
+ [7637]=5,
+ [7638]=5,
+ [7639]=5,
+ [7640]=5,
+ [7641]=5,
+ [7642]=5,
+ [7643]=5,
+ [7644]=5,
+ [7645]=5,
+ [7646]=5,
+ [7647]=5,
+ [7648]=5,
+ [7649]=5,
+ [7650]=5,
+ [7651]=5,
+ [7652]=5,
+ [7653]=5,
+ [7654]=5,
+ [7655]=5,
+ [7656]=5,
+ [7657]=5,
+ [7658]=5,
+ [7659]=5,
+ [7660]=5,
+ [7661]=5,
+ [7662]=5,
+ [7663]=5,
+ [7664]=5,
+ [7665]=5,
+ [7666]=5,
+ [7667]=5,
+ [7668]=5,
+ [7669]=5,
+ [7675]=5,
+ [7676]=5,
+ [7677]=5,
+ [7678]=5,
+ [7679]=5,
  [8204]=4,
  [8205]=2,
+ [8239]=4,
  [8294]=4,
  [8295]=4,
  [8296]=4,
  [8297]=4,
+ [8400]=5,
+ [8401]=5,
+ [8402]=5,
+ [8403]=5,
+ [8404]=5,
+ [8405]=5,
+ [8406]=5,
+ [8407]=5,
+ [8408]=5,
+ [8409]=5,
+ [8410]=5,
+ [8411]=5,
+ [8412]=5,
+ [8417]=5,
+ [8421]=5,
+ [8422]=5,
+ [8423]=5,
+ [8424]=5,
+ [8425]=5,
+ [8426]=5,
+ [8427]=5,
+ [8428]=5,
+ [8429]=5,
+ [8430]=5,
+ [8431]=5,
+ [8432]=5,
+ [11503]=5,
+ [11504]=5,
+ [11505]=5,
+ [11647]=5,
+ [11744]=5,
+ [11745]=5,
+ [11746]=5,
+ [11747]=5,
+ [11748]=5,
+ [11749]=5,
+ [11750]=5,
+ [11751]=5,
+ [11752]=5,
+ [11753]=5,
+ [11754]=5,
+ [11755]=5,
+ [11756]=5,
+ [11757]=5,
+ [11758]=5,
+ [11759]=5,
+ [11760]=5,
+ [11761]=5,
+ [11762]=5,
+ [11763]=5,
+ [11764]=5,
+ [11765]=5,
+ [11766]=5,
+ [11767]=5,
+ [11768]=5,
+ [11769]=5,
+ [11770]=5,
+ [11771]=5,
+ [11772]=5,
+ [11773]=5,
+ [11774]=5,
+ [11775]=5,
+ [12330]=5,
+ [12331]=5,
+ [12332]=5,
+ [12333]=5,
+ [12334]=5,
+ [12335]=5,
+ [12441]=5,
+ [12442]=5,
+ [42607]=5,
+ [42612]=5,
+ [42613]=5,
+ [42614]=5,
+ [42615]=5,
+ [42616]=5,
+ [42617]=5,
+ [42618]=5,
+ [42619]=5,
+ [42620]=5,
+ [42621]=5,
+ [42654]=5,
+ [42655]=5,
+ [42736]=5,
+ [42737]=5,
+ [43014]=5,
+ [43019]=5,
+ [43045]=5,
+ [43046]=5,
  [43072]=2,
  [43073]=2,
  [43074]=2,
@@ -5996,6 +6805,120 @@ characters.classifiers={
  [43121]=2,
  [43122]=1,
  [43123]=4,
+ [43204]=5,
+ [43205]=5,
+ [43232]=5,
+ [43233]=5,
+ [43234]=5,
+ [43235]=5,
+ [43236]=5,
+ [43237]=5,
+ [43238]=5,
+ [43239]=5,
+ [43240]=5,
+ [43241]=5,
+ [43242]=5,
+ [43243]=5,
+ [43244]=5,
+ [43245]=5,
+ [43246]=5,
+ [43247]=5,
+ [43248]=5,
+ [43249]=5,
+ [43302]=5,
+ [43303]=5,
+ [43304]=5,
+ [43305]=5,
+ [43306]=5,
+ [43307]=5,
+ [43308]=5,
+ [43309]=5,
+ [43335]=5,
+ [43336]=5,
+ [43337]=5,
+ [43338]=5,
+ [43339]=5,
+ [43340]=5,
+ [43341]=5,
+ [43342]=5,
+ [43343]=5,
+ [43344]=5,
+ [43345]=5,
+ [43392]=5,
+ [43393]=5,
+ [43394]=5,
+ [43443]=5,
+ [43446]=5,
+ [43447]=5,
+ [43448]=5,
+ [43449]=5,
+ [43452]=5,
+ [43493]=5,
+ [43561]=5,
+ [43562]=5,
+ [43563]=5,
+ [43564]=5,
+ [43565]=5,
+ [43566]=5,
+ [43569]=5,
+ [43570]=5,
+ [43573]=5,
+ [43574]=5,
+ [43587]=5,
+ [43596]=5,
+ [43644]=5,
+ [43696]=5,
+ [43698]=5,
+ [43699]=5,
+ [43700]=5,
+ [43703]=5,
+ [43704]=5,
+ [43710]=5,
+ [43711]=5,
+ [43713]=5,
+ [43756]=5,
+ [43757]=5,
+ [43766]=5,
+ [44005]=5,
+ [44008]=5,
+ [44013]=5,
+ [64286]=5,
+ [65056]=5,
+ [65057]=5,
+ [65058]=5,
+ [65059]=5,
+ [65060]=5,
+ [65061]=5,
+ [65062]=5,
+ [65063]=5,
+ [65064]=5,
+ [65065]=5,
+ [65066]=5,
+ [65067]=5,
+ [65068]=5,
+ [65069]=5,
+ [65070]=5,
+ [65071]=5,
+ [66045]=5,
+ [66272]=5,
+ [66422]=5,
+ [66423]=5,
+ [66424]=5,
+ [66425]=5,
+ [66426]=5,
+ [68097]=5,
+ [68098]=5,
+ [68099]=5,
+ [68101]=5,
+ [68102]=5,
+ [68108]=5,
+ [68109]=5,
+ [68110]=5,
+ [68111]=5,
+ [68152]=5,
+ [68153]=5,
+ [68154]=5,
+ [68159]=5,
  [68288]=2,
  [68289]=2,
  [68290]=2,
@@ -6033,6 +6956,8 @@ characters.classifiers={
  [68322]=4,
  [68323]=4,
  [68324]=3,
+ [68325]=5,
+ [68326]=5,
  [68331]=2,
  [68332]=2,
  [68333]=2,
@@ -6063,6 +6988,497 @@ characters.classifiers={
  [68525]=2,
  [68526]=2,
  [68527]=4,
+ [69633]=5,
+ [69688]=5,
+ [69689]=5,
+ [69690]=5,
+ [69691]=5,
+ [69692]=5,
+ [69693]=5,
+ [69694]=5,
+ [69695]=5,
+ [69696]=5,
+ [69697]=5,
+ [69698]=5,
+ [69699]=5,
+ [69700]=5,
+ [69701]=5,
+ [69702]=5,
+ [69759]=5,
+ [69760]=5,
+ [69761]=5,
+ [69811]=5,
+ [69812]=5,
+ [69813]=5,
+ [69814]=5,
+ [69817]=5,
+ [69818]=5,
+ [69888]=5,
+ [69889]=5,
+ [69890]=5,
+ [69927]=5,
+ [69928]=5,
+ [69929]=5,
+ [69930]=5,
+ [69931]=5,
+ [69933]=5,
+ [69934]=5,
+ [69935]=5,
+ [69936]=5,
+ [69937]=5,
+ [69938]=5,
+ [69939]=5,
+ [69940]=5,
+ [70003]=5,
+ [70016]=5,
+ [70017]=5,
+ [70070]=5,
+ [70071]=5,
+ [70072]=5,
+ [70073]=5,
+ [70074]=5,
+ [70075]=5,
+ [70076]=5,
+ [70077]=5,
+ [70078]=5,
+ [70090]=5,
+ [70091]=5,
+ [70092]=5,
+ [70191]=5,
+ [70192]=5,
+ [70193]=5,
+ [70196]=5,
+ [70198]=5,
+ [70199]=5,
+ [70206]=5,
+ [70367]=5,
+ [70371]=5,
+ [70372]=5,
+ [70373]=5,
+ [70374]=5,
+ [70375]=5,
+ [70376]=5,
+ [70377]=5,
+ [70378]=5,
+ [70400]=5,
+ [70401]=5,
+ [70460]=5,
+ [70464]=5,
+ [70502]=5,
+ [70503]=5,
+ [70504]=5,
+ [70505]=5,
+ [70506]=5,
+ [70507]=5,
+ [70508]=5,
+ [70512]=5,
+ [70513]=5,
+ [70514]=5,
+ [70515]=5,
+ [70516]=5,
+ [70712]=5,
+ [70713]=5,
+ [70714]=5,
+ [70715]=5,
+ [70716]=5,
+ [70717]=5,
+ [70718]=5,
+ [70719]=5,
+ [70722]=5,
+ [70723]=5,
+ [70724]=5,
+ [70726]=5,
+ [70835]=5,
+ [70836]=5,
+ [70837]=5,
+ [70838]=5,
+ [70839]=5,
+ [70840]=5,
+ [70842]=5,
+ [70847]=5,
+ [70848]=5,
+ [70850]=5,
+ [70851]=5,
+ [71090]=5,
+ [71091]=5,
+ [71092]=5,
+ [71093]=5,
+ [71100]=5,
+ [71101]=5,
+ [71103]=5,
+ [71104]=5,
+ [71132]=5,
+ [71133]=5,
+ [71219]=5,
+ [71220]=5,
+ [71221]=5,
+ [71222]=5,
+ [71223]=5,
+ [71224]=5,
+ [71225]=5,
+ [71226]=5,
+ [71229]=5,
+ [71231]=5,
+ [71232]=5,
+ [71339]=5,
+ [71341]=5,
+ [71344]=5,
+ [71345]=5,
+ [71346]=5,
+ [71347]=5,
+ [71348]=5,
+ [71349]=5,
+ [71351]=5,
+ [71453]=5,
+ [71454]=5,
+ [71455]=5,
+ [71458]=5,
+ [71459]=5,
+ [71460]=5,
+ [71461]=5,
+ [71463]=5,
+ [71464]=5,
+ [71465]=5,
+ [71466]=5,
+ [71467]=5,
+ [72752]=5,
+ [72753]=5,
+ [72754]=5,
+ [72755]=5,
+ [72756]=5,
+ [72757]=5,
+ [72758]=5,
+ [72760]=5,
+ [72761]=5,
+ [72762]=5,
+ [72763]=5,
+ [72764]=5,
+ [72765]=5,
+ [72767]=5,
+ [72850]=5,
+ [72851]=5,
+ [72852]=5,
+ [72853]=5,
+ [72854]=5,
+ [72855]=5,
+ [72856]=5,
+ [72857]=5,
+ [72858]=5,
+ [72859]=5,
+ [72860]=5,
+ [72861]=5,
+ [72862]=5,
+ [72863]=5,
+ [72864]=5,
+ [72865]=5,
+ [72866]=5,
+ [72867]=5,
+ [72868]=5,
+ [72869]=5,
+ [72870]=5,
+ [72871]=5,
+ [72874]=5,
+ [72875]=5,
+ [72876]=5,
+ [72877]=5,
+ [72878]=5,
+ [72879]=5,
+ [72880]=5,
+ [72882]=5,
+ [72883]=5,
+ [72885]=5,
+ [72886]=5,
+ [92912]=5,
+ [92913]=5,
+ [92914]=5,
+ [92915]=5,
+ [92916]=5,
+ [92976]=5,
+ [92977]=5,
+ [92978]=5,
+ [92979]=5,
+ [92980]=5,
+ [92981]=5,
+ [92982]=5,
+ [94095]=5,
+ [94096]=5,
+ [94097]=5,
+ [94098]=5,
+ [113821]=5,
+ [113822]=5,
+ [119143]=5,
+ [119144]=5,
+ [119145]=5,
+ [119163]=5,
+ [119164]=5,
+ [119165]=5,
+ [119166]=5,
+ [119167]=5,
+ [119168]=5,
+ [119169]=5,
+ [119170]=5,
+ [119173]=5,
+ [119174]=5,
+ [119175]=5,
+ [119176]=5,
+ [119177]=5,
+ [119178]=5,
+ [119179]=5,
+ [119210]=5,
+ [119211]=5,
+ [119212]=5,
+ [119213]=5,
+ [119362]=5,
+ [119363]=5,
+ [119364]=5,
+ [121344]=5,
+ [121345]=5,
+ [121346]=5,
+ [121347]=5,
+ [121348]=5,
+ [121349]=5,
+ [121350]=5,
+ [121351]=5,
+ [121352]=5,
+ [121353]=5,
+ [121354]=5,
+ [121355]=5,
+ [121356]=5,
+ [121357]=5,
+ [121358]=5,
+ [121359]=5,
+ [121360]=5,
+ [121361]=5,
+ [121362]=5,
+ [121363]=5,
+ [121364]=5,
+ [121365]=5,
+ [121366]=5,
+ [121367]=5,
+ [121368]=5,
+ [121369]=5,
+ [121370]=5,
+ [121371]=5,
+ [121372]=5,
+ [121373]=5,
+ [121374]=5,
+ [121375]=5,
+ [121376]=5,
+ [121377]=5,
+ [121378]=5,
+ [121379]=5,
+ [121380]=5,
+ [121381]=5,
+ [121382]=5,
+ [121383]=5,
+ [121384]=5,
+ [121385]=5,
+ [121386]=5,
+ [121387]=5,
+ [121388]=5,
+ [121389]=5,
+ [121390]=5,
+ [121391]=5,
+ [121392]=5,
+ [121393]=5,
+ [121394]=5,
+ [121395]=5,
+ [121396]=5,
+ [121397]=5,
+ [121398]=5,
+ [121403]=5,
+ [121404]=5,
+ [121405]=5,
+ [121406]=5,
+ [121407]=5,
+ [121408]=5,
+ [121409]=5,
+ [121410]=5,
+ [121411]=5,
+ [121412]=5,
+ [121413]=5,
+ [121414]=5,
+ [121415]=5,
+ [121416]=5,
+ [121417]=5,
+ [121418]=5,
+ [121419]=5,
+ [121420]=5,
+ [121421]=5,
+ [121422]=5,
+ [121423]=5,
+ [121424]=5,
+ [121425]=5,
+ [121426]=5,
+ [121427]=5,
+ [121428]=5,
+ [121429]=5,
+ [121430]=5,
+ [121431]=5,
+ [121432]=5,
+ [121433]=5,
+ [121434]=5,
+ [121435]=5,
+ [121436]=5,
+ [121437]=5,
+ [121438]=5,
+ [121439]=5,
+ [121440]=5,
+ [121441]=5,
+ [121442]=5,
+ [121443]=5,
+ [121444]=5,
+ [121445]=5,
+ [121446]=5,
+ [121447]=5,
+ [121448]=5,
+ [121449]=5,
+ [121450]=5,
+ [121451]=5,
+ [121452]=5,
+ [121461]=5,
+ [121476]=5,
+ [121499]=5,
+ [121500]=5,
+ [121501]=5,
+ [121502]=5,
+ [121503]=5,
+ [121505]=5,
+ [121506]=5,
+ [121507]=5,
+ [121508]=5,
+ [121509]=5,
+ [121510]=5,
+ [121511]=5,
+ [121512]=5,
+ [121513]=5,
+ [121514]=5,
+ [121515]=5,
+ [121516]=5,
+ [121517]=5,
+ [121518]=5,
+ [121519]=5,
+ [122880]=5,
+ [122881]=5,
+ [122882]=5,
+ [122883]=5,
+ [122884]=5,
+ [122885]=5,
+ [122886]=5,
+ [122888]=5,
+ [122889]=5,
+ [122890]=5,
+ [122891]=5,
+ [122892]=5,
+ [122893]=5,
+ [122894]=5,
+ [122895]=5,
+ [122896]=5,
+ [122897]=5,
+ [122898]=5,
+ [122899]=5,
+ [122900]=5,
+ [122901]=5,
+ [122902]=5,
+ [122903]=5,
+ [122904]=5,
+ [122907]=5,
+ [122908]=5,
+ [122909]=5,
+ [122910]=5,
+ [122911]=5,
+ [122912]=5,
+ [122913]=5,
+ [122915]=5,
+ [122916]=5,
+ [122918]=5,
+ [122919]=5,
+ [122920]=5,
+ [122921]=5,
+ [122922]=5,
+ [125136]=5,
+ [125137]=5,
+ [125138]=5,
+ [125139]=5,
+ [125140]=5,
+ [125141]=5,
+ [125142]=5,
+ [125184]=2,
+ [125185]=2,
+ [125186]=2,
+ [125187]=2,
+ [125188]=2,
+ [125189]=2,
+ [125190]=2,
+ [125191]=2,
+ [125192]=2,
+ [125193]=2,
+ [125194]=2,
+ [125195]=2,
+ [125196]=2,
+ [125197]=2,
+ [125198]=2,
+ [125199]=2,
+ [125200]=2,
+ [125201]=2,
+ [125202]=2,
+ [125203]=2,
+ [125204]=2,
+ [125205]=2,
+ [125206]=2,
+ [125207]=2,
+ [125208]=2,
+ [125209]=2,
+ [125210]=2,
+ [125211]=2,
+ [125212]=2,
+ [125213]=2,
+ [125214]=2,
+ [125215]=2,
+ [125216]=2,
+ [125217]=2,
+ [125218]=2,
+ [125219]=2,
+ [125220]=2,
+ [125221]=2,
+ [125222]=2,
+ [125223]=2,
+ [125224]=2,
+ [125225]=2,
+ [125226]=2,
+ [125227]=2,
+ [125228]=2,
+ [125229]=2,
+ [125230]=2,
+ [125231]=2,
+ [125232]=2,
+ [125233]=2,
+ [125234]=2,
+ [125235]=2,
+ [125236]=2,
+ [125237]=2,
+ [125238]=2,
+ [125239]=2,
+ [125240]=2,
+ [125241]=2,
+ [125242]=2,
+ [125243]=2,
+ [125244]=2,
+ [125245]=2,
+ [125246]=2,
+ [125247]=2,
+ [125248]=2,
+ [125249]=2,
+ [125250]=2,
+ [125251]=2,
+ [125252]=5,
+ [125253]=5,
+ [125254]=5,
+ [125255]=5,
+ [125256]=5,
+ [125257]=5,
+ [125258]=5,
+ [1042752]=5,
 }
 
 end -- closure
@@ -7548,7 +8964,7 @@ local sortedhash,sortedkeys=table.sortedhash,table.sortedkeys
 local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end)
 local trace_mapping=false trackers.register("fonts.mapping",function(v) trace_mapping=v end)
 local report_fonts=logs.reporter("fonts","loading")
-local force_ligatures=true directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end)
+local force_ligatures=false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end)
 local fonts=fonts or {}
 local mappings=fonts.mappings or {}
 fonts.mappings=mappings
@@ -7662,7 +9078,7 @@ do
   end
   mappings.overloads=o
 end
-function mappings.addtounicode(data,filename,checklookups)
+function mappings.addtounicode(data,filename,checklookups,forceligatures)
   local resources=data.resources
   local unicodes=resources.unicodes
   if not unicodes then
@@ -7851,22 +9267,26 @@ function mappings.addtounicode(data,filename,checklookups)
     end
   end
   if not collected then
-  elseif force_ligatures then
+  elseif forceligatures or force_ligatures then
     for i=1,#dlist do
       local du=dlist[i]
-      local u=collected[du] 
-      if u then
-        resolve(descriptions[du],u)
+      if du>=private or (du>=0xE000 and du<=0xF8FF) then
+        local u=collected[du] 
+        if u then
+          resolve(descriptions[du],u)
+        end
       end
     end
   else
     for i=1,#dlist do
       local du=dlist[i]
-      local glyph=descriptions[du]
-      if glyph.class=="ligature" and not glyph.unicode then
-        local u=collected[du] 
-        if u then
-           resolve(glyph,u)
+      if du>=private or (du>=0xE000 and du<=0xF8FF) then
+        local glyph=descriptions[du]
+        if glyph.class=="ligature" and not glyph.unicode then
+          local u=collected[du] 
+          if u then
+             resolve(glyph,u)
+          end
         end
       end
     end
@@ -20205,6 +21625,10 @@ function injections.isspace(n,threshold,id)
     end
   end
 end
+local getspaceboth=getboth
+function injections.installgetspaceboth(gb)
+  getspaceboth=gb or getboth
+end
 local function injectspaces(head)
   if not triggers then
     return head,false
@@ -20225,9 +21649,9 @@ local function injectspaces(head)
     factor=getthreshold(font)
   end
   for n in traverse_id(glue_code,tonut(head)) do
-    local prev,next=getboth(n)
-    local prevchar=ischar(prev)
-    local nextchar=ischar(next)
+    local prev,next=getspaceboth(n)
+    local prevchar=prev and ischar(prev)
+    local nextchar=next and ischar(next)
     if nextchar then
       local font=getfont(next)
       local trig=triggers[font]
@@ -24035,9 +25459,9 @@ local function spaceinitializer(tfmdata,value)
                     if type(kern)~="table" then
                       left[k]=kern
                     elseif single then
-                      left[k]=v[3]
+                      left[k]=kern[3]
                     else
-                      local one=v[1]
+                      local one=kern[1]
                       if one then
                         left[k]=one[3]
                       end
@@ -26093,7 +27517,7 @@ else
   local tounicode=fonts.mappings.tounicode16
   function otf.getactualtext(s)
     return
-      "/Span << /ActualText <feff"..n.."> >> BDC",
+      "/Span << /ActualText <feff"..s.."> >> BDC",
       "EMC"
   end
 end
diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex
index acf1d2308..6edc6f74b 100644
--- a/tex/generic/context/luatex/luatex-math.tex
+++ b/tex/generic/context/luatex/luatex-math.tex
@@ -2245,7 +2245,7 @@
     \def\root#1\of
       {\setbox\rootbox\hbox\bgroup
           $\m@th\scriptscriptstyle{#1}$%
-       \egroup}%
+       \egroup
        \mathpalette\r@@t}
 
     \catcode`@=12
author	Hans Hagen <pragma@wxs.nl>	2017-05-16 11:12:18 +0200
committer	Context Git Mirror Bot <phg42.2a@gmail.com>	2017-05-16 11:12:18 +0200
commit	cbc37c39432e0ebe38e0922fc6d14c2955ab3ba2 (patch)
tree	38358e219d38f2a49f227d96d24fdc27eb2544e6 /tex
parent	fd0c4577a4b6e85ca2db664906e1a03807ce133f (diff)
download	context-cbc37c39432e0ebe38e0922fc6d14c2955ab3ba2.tar.gz