diff options
| author | Hans Hagen <pragma@wxs.nl> | 2018-08-11 01:23:08 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2018-08-11 01:23:08 +0200 |
| commit | 1ef7a093aaf03b6327b3da94d47f53760c868c60 (patch) | |
| tree | 228e6d4a5005598aaea191b3317c2fa21e22de75 /tex | |
| parent | b61d5dd3555e906b21601ff75b3268c0f359283e (diff) | |
| download | context-1ef7a093aaf03b6327b3da94d47f53760c868c60.tar.gz | |
2018-08-10 16:58:00
Diffstat (limited to 'tex')
106 files changed, 6770 insertions, 1327 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 220ea6e69..06c0d4626 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{2018.07.27 19:12} +\newcontextversion{2018.08.10 16:51} %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 5d5d44bde..33917ad55 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{2018.07.27 19:12} +\edef\contextversion{2018.08.10 16:51} %D For those who want to use this: diff --git a/tex/context/base/mkiv/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua index 7b1746582..e0b9132ff 100644 --- a/tex/context/base/mkiv/anch-pgr.lua +++ b/tex/context/base/mkiv/anch-pgr.lua @@ -56,7 +56,6 @@ graphics.backgrounds = backgrounds -- -- -- local texsetattribute = tex.setattribute -local pdfgetpos = pdf.getpos -- why not a generic name ! local a_textbackground = attributes.private("textbackground") @@ -91,13 +90,21 @@ local realpage = 1 local recycle = 1000 -- only tables can overflow this local enabled = false +-- can change: + +local getpos = function() getpos = backends.codeinjections.getpos return getpos() end + +updaters.register("backend.update",function() + getpos = backends.codeinjections.getpos +end) + -- Freeing the data is somewhat tricky as we can have backgrounds spanning -- many pages but for an arbitrary background shape that is not so common. local function check(a,index,depth,d,where,ht,dp) -- this is not yet r2l ready local w = d.shapes[realpage] - local x, y = pdfgetpos() + local x, y = getpos() if trace_ranges then report_shapes("attribute %i, index %i, depth %i, location %s, position (%p,%p)", a,index,depth,where,x,y) diff --git a/tex/context/base/mkiv/anch-pos.lua b/tex/context/base/mkiv/anch-pos.lua index e6a69b1bd..99763edae 100644 --- a/tex/context/base/mkiv/anch-pos.lua +++ b/tex/context/base/mkiv/anch-pos.lua @@ -334,6 +334,12 @@ local getpos = function() getpos = backends.codeinjections.getpos return getp local gethpos = function() gethpos = backends.codeinjections.gethpos return gethpos() end local getvpos = function() getvpos = backends.codeinjections.getvpos return getvpos() end +updaters.register("backend.update",function() + getpos = backends.codeinjections.getpos + gethpos = backends.codeinjections.gethpos + getvpos = backends.codeinjections.getvpos +end) + local function setall(name,p,x,y,w,h,d,extra) tobesaved[name] = { p = p, @@ -531,7 +537,7 @@ local function setregionbox(n,tag,k,lo,ro,to,bo) -- kind end local box = getbox(n) local w, h, d = getwhd(box) - local x, y = getpos() -- hm, makes no sense here + local x, y = getpos() -- hm, makes no sense here as not in shipout tobesaved[tag] = { -- p = texgetcount("realpageno"), -- we copy them x = x ~= 0 and x or nil, -- was true diff --git a/tex/context/base/mkiv/back-ini.lua b/tex/context/base/mkiv/back-ini.lua index fd33d5ddc..256fcf445 100644 --- a/tex/context/base/mkiv/back-ini.lua +++ b/tex/context/base/mkiv/back-ini.lua @@ -105,11 +105,9 @@ tables.vfspecials = allocate { -- we'd better have this return something (defaults) -function codeinjections.getpos () return 0, 0 end -function codeinjections.gethpos () return 0 end -function codeinjections.getvpos () return 0 end -function codeinjections.hasmatrix() return false end -function codeinjections.getmatrix() return 1, 0, 0, 1, 0, 0 end +function codeinjections.getpos () return 0, 0 end +function codeinjections.gethpos() return 0 end +function codeinjections.getvpos() return 0 end -- can best be here diff --git a/tex/context/base/mkiv/char-ini.lua b/tex/context/base/mkiv/char-ini.lua index 4ee9db8b5..92f9a2291 100644 --- a/tex/context/base/mkiv/char-ini.lua +++ b/tex/context/base/mkiv/char-ini.lua @@ -749,6 +749,10 @@ local is_punctuation = allocate ( tohash { "pc","pd","ps","pe","pi","pf","po", } ) +local is_symbol = allocate ( tohash { + "sm", "sc", "sk", "so", +} ) + -- to be redone: store checked characters characters.is_character = is_character @@ -757,6 +761,7 @@ characters.is_command = is_command characters.is_spacing = is_spacing characters.is_mark = is_mark characters.is_punctuation = is_punctuation +characters.is_symbol = is_symbol local mti = function(t,k) if type(k) == "number" then diff --git a/tex/context/base/mkiv/cldf-ini.lua b/tex/context/base/mkiv/cldf-ini.lua index 72f1276d2..a7975eec4 100644 --- a/tex/context/base/mkiv/cldf-ini.lua +++ b/tex/context/base/mkiv/cldf-ini.lua @@ -1261,7 +1261,7 @@ local traced = function(one,two,...) elseif argtype == "number" then currenttrace(formatters["f : - : %s"](one)) elseif argtype == "userdata" then - currenttrace(formatters["f : - : %s"](userdata(one))) + currenttrace(formatters["F : - : %s"](userdata(one))) else currenttrace(formatters["f : - : <<%S>>"](one)) end diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index d25377d08..0de7057d6 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{2018.07.27 19:12} +\newcontextversion{2018.08.10 16:51} %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 741bde22d..bc599f373 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -42,7 +42,7 @@ %D has to match \type {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2018.07.27 19:12} +\edef\contextversion{2018.08.10 16:51} \edef\contextkind {beta} %D For those who want to use this: @@ -565,6 +565,9 @@ \loadmarkfile{back-exp} \loadmarkfile{back-pdf} % actually, this one should load the next three using document.arguments.backend + +\doifelsefileexists{back-shp.mkiv}{\loadmarkfile{back-shp}}{} + \loadmarkfile{mlib-pdf} \loadmarkfile{mlib-pps} \loadmarkfile{meta-pdf} diff --git a/tex/context/base/mkiv/core-uti.lua b/tex/context/base/mkiv/core-uti.lua index 9ba2c945f..9074d1da9 100644 --- a/tex/context/base/mkiv/core-uti.lua +++ b/tex/context/base/mkiv/core-uti.lua @@ -43,7 +43,7 @@ local report_passes = logs.reporter("job","passes") job = job or { } local job = job -job.version = 1.30 +job.version = 1.31 job.packversion = 1.02 -- some day we will implement loading of other jobs and then we need diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua index ff9d75060..626ce51f2 100644 --- a/tex/context/base/mkiv/font-ctx.lua +++ b/tex/context/base/mkiv/font-ctx.lua @@ -1898,10 +1898,19 @@ implement { local function nametoslot(name) local t = type(name) if t == "string" then - local slot = unicodes[true][name] + local unic = unicodes[true] + local slot = unic[name] if slot then return slot end + -- + local slot = unic[gsub(name,"_"," ")] or unic[gsub(name,"_","-")] or + unic[gsub(name,"-"," ")] or unic[gsub(name,"-","_")] or + unic[gsub(name," ","_")] or unic[gsub(name," ","-")] + if slot then + return slot + end + -- if not aglunicodes then aglunicodes = encodings.agl.unicodes end @@ -1920,14 +1929,13 @@ local function nametoslot(name) end end - local found = { } local function descriptiontoslot(name) local t = type(name) if t == "string" then -- slow - local list = sortedkeys(chardata) + local list = sortedkeys(chardata) -- can be a cache with weak tables local slot = found[name] local char = characters[true] if slot then diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index b44e20ede..140702ec8 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -225,7 +225,7 @@ local hash = table.setmetatableindex(function(t,k) elseif k < 0xD7FF or (k > 0xDFFF and k <= 0xFFFF) then v = f_single(k) else - v = k - 0x10000 + k = k - 0x10000 v = f_double(rshift(k,10)+0xD800,k%1024+0xDC00) end t[k] = v diff --git a/tex/context/base/mkiv/font-mps.lua b/tex/context/base/mkiv/font-mps.lua index cde34f2ae..766468c57 100644 --- a/tex/context/base/mkiv/font-mps.lua +++ b/tex/context/base/mkiv/font-mps.lua @@ -267,6 +267,7 @@ local getshift = nuts.getshift local getwidth = nuts.getwidth local getheight = nuts.getheight local getdepth = nuts.getdepth +local getexpansion = nuts.getexpansion local effective_glue = nuts.effective_glue @@ -339,7 +340,7 @@ function fonts.metapost.boxtomp(n,kind) while current do local id = getid(current) if id == glyph_code then - local code, width = metapost.output(kind,getfont(current),getchar(current),xoffset+dx,yoffset,getfield(current,"expansion_factor")) + local code, width = metapost.output(kind,getfont(current),getchar(current),xoffset+dx,yoffset,getexpansion(current)) result[#result+1] = code dx = dx + width elseif id == disc_code then diff --git a/tex/context/base/mkiv/font-sol.lua b/tex/context/base/mkiv/font-sol.lua index 73f7252d1..85f5df8d5 100644 --- a/tex/context/base/mkiv/font-sol.lua +++ b/tex/context/base/mkiv/font-sol.lua @@ -65,6 +65,8 @@ local getsubtype = nuts.getsubtype local getlist = nuts.getlist local getdir = nuts.getdir local getwidth = nuts.getwidth +local getdata = nuts.getdata + local getboxglue = nuts.getboxglue local setattr = nuts.setattr @@ -446,7 +448,7 @@ local function collect_words(list) -- can be made faster for attributes if subtype == userdefined_code then -- hm local user_id = getfield(current,"user_id") if user_id == splitter_one then - word = { getfield(current,"value"), current, current } + word = { getdata(current), current, current } w = w + 1 words[w] = word elseif user_id == splitter_two then diff --git a/tex/context/base/mkiv/grph-epd.lua b/tex/context/base/mkiv/grph-epd.lua index ae0358b36..a136108c8 100644 --- a/tex/context/base/mkiv/grph-epd.lua +++ b/tex/context/base/mkiv/grph-epd.lua @@ -39,6 +39,7 @@ local function mergegoodies(optionlist) end function figures.mergegoodies(optionlist) + -- todo: we can use runtoks instead context.stepwise(function() -- we use stepwise because we might need to define symbols -- for stamps that have no default appearance diff --git a/tex/context/base/mkiv/grph-rul.lua b/tex/context/base/mkiv/grph-rul.lua index 2cb2729bd..71f1f868c 100644 --- a/tex/context/base/mkiv/grph-rul.lua +++ b/tex/context/base/mkiv/grph-rul.lua @@ -15,7 +15,6 @@ local context = context local ruleactions = nodes.rules.ruleactions local userrule = nodes.rules.userrule local bpfactor = number.dimenfactors.bp -local pdfprint = pdf.print local current_attr = nodes.current_attr local setfield = nodes.setfield @@ -36,6 +35,16 @@ local floor = math.floor local getrandom = utilities.randomizer.get local formatters = string.formatters +-- This is very pdf specific. Maybe move some to lpdf-rul.lua some day. + +local pdfprint + +pdfprint = function(...) pdfprint = lpdf.print return pdfprint(...) end + +updaters.register("backend.update",function() + pdfprint = lpdf.print +end) + do local simplemetapost = metapost.simple diff --git a/tex/context/base/mkiv/l-macro-imp-optimize.lua b/tex/context/base/mkiv/l-macro-imp-optimize.lua index e04b37eab..856cab038 100644 --- a/tex/context/base/mkiv/l-macro-imp-optimize.lua +++ b/tex/context/base/mkiv/l-macro-imp-optimize.lua @@ -46,17 +46,17 @@ if LUAVERSION >= 5.3 and lua.macros then -- #define rshift(a,b) ((a >> b) & 0xFFFFFFFF) -- ]] - lua.macros.resolvestring [[ - #define band(a,b) (a&b) - #define bnot(a) (~a&0xFFFFFFFF) - #define bor(a,b) ((a|b)&0xFFFFFFFF) - #define btest(a,b) ((a&b)~=0) - #define bxor(a,b) ((a~b)&0xFFFFFFFF) - #define rshift(a,b) ((a&b)~=0) - #define extract(a,b,c) ((a>>b)&~(-1<<c)) - #define extract(a,b) ((a>>b)&0x1)) - #define lshift(a,b) ((a<<b)&0xFFFFFFFF) - #define rshift(a,b) ((a>>b)&0xFFFFFFFF) - ]] +lua.macros.resolvestring [[ +#define band(a,b) (a&b) +#define bnot(a) (~a&0xFFFFFFFF) +#define bor(a,b) ((a|b)&0xFFFFFFFF) +#define btest(a,b) ((a&b)~=0) +#define bxor(a,b) ((a~b)&0xFFFFFFFF) +#define rshift(a,b) ((a&b)~=0) +#define extract(a,b,c) ((a>>b)&~(-1<<c)) +#define extract(a,b) ((a>>b)&0x1) +#define lshift(a,b) ((a<<b)&0xFFFFFFFF) +#define rshift(a,b) ((a>>b)&0xFFFFFFFF) +]] end diff --git a/tex/context/base/mkiv/l-macro.lua b/tex/context/base/mkiv/l-macro.lua index cbd234fce..a3a5bf4d9 100644 --- a/tex/context/base/mkiv/l-macro.lua +++ b/tex/context/base/mkiv/l-macro.lua @@ -21,7 +21,7 @@ local newline = S("\n\r")^1 local continue = P("\\") * newline local spaces = S(" \t") + continue local name = R("az","AZ","__","09")^1 -local body = ((1+continue/"")-newline)^1 +local body = ((continue/"" + 1) - newline)^1 local lparent = P("(") local rparent = P(")") local noparent = 1 - (lparent + rparent) @@ -85,7 +85,7 @@ subparser = Cs((resolve + P(1))^1) local enddefine = P("#enddefine") / "" -local beginregister = (C(name) * spaces^0 * (arguments + Cc(false)) * C((1-enddefine)^1) * enddefine) / function(k,a,v) +local beginregister = (C(name) * (arguments + Cc(false)) * C((1-enddefine)^1) * enddefine) / function(k,a,v) local n = 0 if a then n = #a @@ -103,14 +103,14 @@ local beginregister = (C(name) * spaces^0 * (arguments + Cc(false)) * C((1-endde end local d = definitions[k] if not d then - d = { [0] = false, false, false, false, false, false, false, false, false } + d = { a = a, [0] = false, false, false, false, false, false, false, false, false } definitions[k] = d end d[n] = lpegmatch(subparser,v) or v return "" end -local register = (C(name) * spaces^0 * (arguments + Cc(false)) * spaces^0 * C(body)) / function(k,a,v) +local register = (Cs(name) * (arguments + Cc(false)) * spaces^0 * Cs(body)) / function(k,a,v) local n = 0 if a then n = #a @@ -128,7 +128,7 @@ local register = (C(name) * spaces^0 * (arguments + Cc(false)) * spaces^0 * C(bo end local d = definitions[k] if not d then - d = { [0] = false, false, false, false, false, false, false, false, false } + d = { a = a, [0] = false, false, false, false, false, false, false, false, false } definitions[k] = d end d[n] = lpegmatch(subparser,v) or v @@ -162,6 +162,25 @@ function macros.reset() patterns = { } end +function macros.showdefinitions() + -- no helpers loaded but not called early + for name, list in table.sortedhash(definitions) do + local arguments = list.a + if arguments then + arguments = "(" .. concat(arguments,",") .. ")" + else + arguments = "" + end + print("macro: " .. name .. arguments) + for i=0,#list do + local l = list[i] + if l then + print(" " .. l) + end + end + end +end + function macros.resolvestring(str) return lpegmatch(parser,str) or str end diff --git a/tex/context/base/mkiv/lpdf-ano.lua b/tex/context/base/mkiv/lpdf-ano.lua index 0cadb9d61..3d7479d6a 100644 --- a/tex/context/base/mkiv/lpdf-ano.lua +++ b/tex/context/base/mkiv/lpdf-ano.lua @@ -48,10 +48,6 @@ local nodeinjections = backends.pdf.nodeinjections local codeinjections = backends.pdf.codeinjections local registrations = backends.pdf.registrations -local getpos = codeinjections.getpos -local gethpos = codeinjections.gethpos -local getvpos = codeinjections.getvpos - local javascriptcode = interactions.javascripts.code local references = structures.references @@ -74,6 +70,18 @@ local new_latelua = nodepool.latelua local texgetcount = tex.getcount +-- can change: + +local getpos = lpdf.getpos +local gethpos = lpdf.gethpos +local getvpos = lpdf.getvpos + +updaters.register("backend.update",function() + getpos = lpdf.getpos + gethpos = lpdf.gethpos + getvpos = lpdf.getvpos +end) + local pdfdictionary = lpdf.dictionary local pdfarray = lpdf.array local pdfreference = lpdf.reference diff --git a/tex/context/base/mkiv/lpdf-epa.lua b/tex/context/base/mkiv/lpdf-epa.lua index 0792db646..1d0b9e8b2 100644 --- a/tex/context/base/mkiv/lpdf-epa.lua +++ b/tex/context/base/mkiv/lpdf-epa.lua @@ -28,6 +28,11 @@ local report_comment = logs.reporter("backend","comment") local report_field = logs.reporter("backend","field") local report_outline = logs.reporter("backend","outline") +local lpdf = lpdf +local epdf = epdf +local backends = backends +local context = context + local nodeinjections = backends.pdf.nodeinjections local pdfarray = lpdf.array @@ -45,15 +50,8 @@ local pdfcopyinteger = lpdf.copyinteger local pdfcopystring = lpdf.copystring local pdfcopyconstant = lpdf.copyconstant -local pdfgetpos = lpdf.getpos - local hpack_node = nodes.hpack -local epdf = epdf -local backends = backends -local lpdf = lpdf -local context = context - local loadpdffile = lpdf.epdf.load local nameonly = file.nameonly @@ -74,6 +72,14 @@ local layerspec = { -- predefining saves time "epdfcontent" } +-- can change: + +local pdfgetpos = lpdf.getpos + +updaters.register("backend.update",function() + pdfgetpos = lpdf.getpos +end) + local collected = allocate() local tobesaved = allocate() @@ -313,7 +319,7 @@ function codeinjections.mergereferences(specification) end end -- moved outside previous test - context.setgvalue("figurereference",reference) -- global + context.setgvalue("figurereference",reference) -- global, todo: setmacro if trace_links then report_link("setting figure reference to %a",reference) end @@ -493,6 +499,8 @@ local validstamps = { ForPublicRelease = true, } +-- todo: we can use runtoks instead of steps + local function validStamp(v) local name = "Stamped" -- fallback if v then diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 6392125ca..79ed3470c 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -85,6 +85,7 @@ local pdfgethpos = pdf.gethpos local pdfgetvpos = pdf.getvpos local pdfgetmatrix = pdf.getmatrix local pdfhasmatrix = pdf.hasmatrix +local pdfprint = pdf.print local pdfreserveobject = pdf.reserveobj local pdfimmediateobject = pdf.immediateobj @@ -185,11 +186,36 @@ end local codeinjections = pdfbackend.codeinjections local nodeinjections = pdfbackend.nodeinjections -codeinjections.getpos = pdfgetpos lpdf.getpos = pdfgetpos -codeinjections.gethpos = pdfgethpos lpdf.gethpos = pdfgethpos -codeinjections.getvpos = pdfgetvpos lpdf.getvpos = pdfgetvpos -codeinjections.hasmatrix = pdfhasmatrix lpdf.hasmatrix = pdfhasmatrix -codeinjections.getmatrix = pdfgetmatrix lpdf.getmatrix = pdfgetmatrix +-- can change: + +pdfbackend.codeinjections.getpos = pdfgetpos +pdfbackend.codeinjections.gethpos = pdfgethpos +pdfbackend.codeinjections.getvpos = pdfgetvpos + +lpdf.getpos = pdfgetpos +lpdf.gethpos = pdfgethpos +lpdf.getvpos = pdfgetvpos +lpdf.print = pdfprint + +updaters.register("backend.update.pdf",function() + + pdfgetpos = pdf.getpos + pdfgethpos = pdf.gethpos + pdfgetvpos = pdf.getvpos + pdfhasmatrix = pdf.hasmatrix + pdfgetmatrix = pdf.getmatrix + pdfprint = pdf.print + + pdfbackend.codeinjections.getpos = pdfgetpos + pdfbackend.codeinjections.gethpos = pdfgethpos + pdfbackend.codeinjections.getvpos = pdfgetvpos + + lpdf.getpos = pdfgetpos + lpdf.gethpos = pdfgethpos + lpdf.getvpos = pdfgetvpos + lpdf.print = pdfprint + +end) -- local function transform(llx,lly,urx,ury,rx,sx,sy,ry) -- local x1 = llx * rx + lly * sy @@ -206,17 +232,17 @@ codeinjections.getmatrix = pdfgetmatrix lpdf.getmatrix = pdfgetmatrix -- ury = max(y1,y2,y3,y4); -- return llx, lly, urx, ury -- end - -function lpdf.transform(llx,lly,urx,ury) -- not yet used so unchecked - if pdfhasmatrix() then - local sx, rx, ry, sy = pdfgetmatrix() - local w, h = urx - llx, ury - lly - return llx, lly, llx + sy*w - ry*h, lly + sx*h - rx*w - -- return transform(llx,lly,urx,ury,sx,rx,ry,sy) - else - return llx, lly, urx, ury - end -end +-- +-- function lpdf.transform(llx,lly,urx,ury) -- not yet used so unchecked +-- if pdfhasmatrix() then +-- local sx, rx, ry, sy = pdfgetmatrix() +-- local w, h = urx - llx, ury - lly +-- return llx, lly, llx + sy*w - ry*h, lly + sx*h - rx*w +-- -- return transform(llx,lly,urx,ury,sx,rx,ry,sy) +-- else +-- return llx, lly, urx, ury +-- end +-- end -- funny values for tx and ty @@ -266,106 +292,102 @@ end -- end -- end -local cache = table.setmetatableindex(function(t,k) -- can be made weak - local v = utfbyte(k) - if v < 0x10000 then - v = format("%04x",v) - else - v = format("%04x%04x",rshift(v,10),v%1024+0xDC00) - end - t[k] = v - return v -end) +local tosixteen, fromsixteen, topdfdoc, frompdfdoc, toeight, fromeight -local escaped = Cs(Cc("(") * (S("\\()\n\r\t\b\f")/"\\%0" + P(1))^0 * Cc(")")) -local unified = Cs(Cc("<feff") * (lpeg.patterns.utf8character/cache)^1 * Cc(">")) +do -local function tosixteen(str) -- an lpeg might be faster (no table) - if not str or str == "" then - return "<feff>" -- not () as we want an indication that it's unicode - else - return lpegmatch(unified,str) - end -end + local escaped = Cs(Cc("(") * (S("\\()\n\r\t\b\f")/"\\%0" + P(1))^0 * Cc(")")) -local more = 0 - -local pattern = C(4) / function(s) -- needs checking ! - local now = tonumber(s,16) - if more > 0 then - now = (more-0xD800)*0x400 + (now-0xDC00) + 0x10000 -- the 0x10000 smells wrong - more = 0 - return utfchar(now) - elseif now >= 0xD800 and now <= 0xDBFF then - more = now - return "" -- else the c's end up in the stream - else - return utfchar(now) - end -end + local cache = table.setmetatableindex(function(t,k) -- can be made weak + local v = utfbyte(k) + if v < 0x10000 then + v = format("%04x",v) + else + v = format("%04x%04x",rshift(v,10),v%1024+0xDC00) + end + t[k] = v + return v + end) -local pattern = P(true) / function() more = 0 end * Cs(pattern^0) + local unified = Cs(Cc("<feff") * (lpeg.patterns.utf8character/cache)^1 * Cc(">")) -local function fromsixteen(str) - if not str or str == "" then - return "" - else - return lpegmatch(pattern,str) + tosixteen = function(str) -- an lpeg might be faster (no table) + if not str or str == "" then + return "<feff>" -- not () as we want an indication that it's unicode + else + return lpegmatch(unified,str) + end end -end -local toregime = regimes.toregime -local fromregime = regimes.fromregime + local more = 0 -local function topdfdoc(str,default) - if not str or str == "" then - return "" - else - return lpegmatch(escaped,toregime("pdfdoc",str,default)) -- could be combined if needed + local pattern = C(4) / function(s) -- needs checking ! + local now = tonumber(s,16) + if more > 0 then + now = (more-0xD800)*0x400 + (now-0xDC00) + 0x10000 -- the 0x10000 smells wrong + more = 0 + return utfchar(now) + elseif now >= 0xD800 and now <= 0xDBFF then + more = now + return "" -- else the c's end up in the stream + else + return utfchar(now) + end end -end -local function frompdfdoc(str) - if not str or str == "" then - return "" - else - return fromregime("pdfdoc",str) + local pattern = P(true) / function() more = 0 end * Cs(pattern^0) + + fromsixteen = function(str) + if not str or str == "" then + return "" + else + return lpegmatch(pattern,str) + end end -end -if not toregime then topdfdoc = function(s) return s end end -if not fromregime then frompdfdoc = function(s) return s end end + local toregime = regimes.toregime + local fromregime = regimes.fromregime -local function toeight(str) - if not str or str == "" then - return "()" - else - return lpegmatch(escaped,str) + topdfdoc = function(str,default) + if not str or str == "" then + return "" + else + return lpegmatch(escaped,toregime("pdfdoc",str,default)) -- could be combined if needed + end end -end -local b_pattern = Cs((P("\\")/"" * ( - S("()") - + S("nrtbf") / { n = "\n", r = "\r", t = "\t", b = "\b", f = "\f" } - + lpegpatterns.octdigit^-3 / function(s) return char(tonumber(s,8)) end) -+ P(1))^0) + frompdfdoc = function(str) + if not str or str == "" then + return "" + else + return fromregime("pdfdoc",str) + end + end -local function fromeight(str) - if not str or str == "" then - return "" - else - return lpegmatch(unescape,str) + if not toregime then topdfdoc = function(s) return s end end + if not fromregime then frompdfdoc = function(s) return s end end + + toeight = function(str) + if not str or str == "" then + return "()" + else + return lpegmatch(escaped,str) + end end -end -lpdf.tosixteen = tosixteen -lpdf.toeight = toeight -lpdf.topdfdoc = topdfdoc -lpdf.fromsixteen = fromsixteen -lpdf.fromeight = fromeight -lpdf.frompdfdoc = frompdfdoc + local b_pattern = Cs((P("\\")/"" * ( + S("()") + + S("nrtbf") / { n = "\n", r = "\r", t = "\t", b = "\b", f = "\f" } + + lpegpatterns.octdigit^-3 / function(s) return char(tonumber(s,8)) end) + + P(1))^0) -do + fromeight = function(str) + if not str or str == "" then + return "" + else + return lpegmatch(unescape,str) + end + end local u_pattern = lpegpatterns.utfbom_16_be * lpegpatterns.utf16_to_utf8_be -- official + lpegpatterns.utfbom_16_le * lpegpatterns.utf16_to_utf8_le -- we've seen these @@ -416,6 +438,13 @@ do return lpegmatch(b_pattern,s) end + lpdf.tosixteen = tosixteen + lpdf.toeight = toeight + lpdf.topdfdoc = topdfdoc + lpdf.fromsixteen = fromsixteen + lpdf.fromeight = fromeight + lpdf.frompdfdoc = frompdfdoc + end local function merge_t(a,b) @@ -425,109 +454,117 @@ local function merge_t(a,b) return setmetatable(t,getmetatable(a)) end -local f_key_null = formatters["/%s null"] -local f_key_value = formatters["/%s %s"] -local f_key_dictionary = formatters["/%s << % t >>"] -local f_dictionary = formatters["<< % t >>"] -local f_key_array = formatters["/%s [ % t ]"] -local f_array = formatters["[ % t ]"] -local f_key_number = formatters["/%s %N"] -local f_tonumber = formatters["%N"] - local tostring_a, tostring_d -tostring_d = function(t,contentonly,key) - if next(t) then - local r, n = { }, 0 - for k in next, t do - n = n + 1 - r[n] = k - end - sort(r) - for i=1,n do - local k = r[i] - local v = t[k] - local tv = type(v) - if tv == "string" then - r[i] = f_key_value(k,toeight(v)) - elseif tv == "number" then - r[i] = f_key_number(k,v) - elseif tv == "table" then - local mv = getmetatable(v) - if mv and mv.__lpdftype then - -- if v == t then - -- report_objects("ignoring circular reference in dirctionary") - -- r[i] = f_key_null(k) - -- else - r[i] = f_key_value(k,tostring(v)) - -- end - elseif v[1] then - r[i] = f_key_value(k,tostring_a(v)) +do + + local f_key_null = formatters["/%s null"] + local f_key_value = formatters["/%s %s"] + local f_key_dictionary = formatters["/%s << % t >>"] + local f_dictionary = formatters["<< % t >>"] + local f_key_array = formatters["/%s [ % t ]"] + local f_array = formatters["[ % t ]"] + local f_key_number = formatters["/%s %N"] + local f_tonumber = formatters["%N"] + + tostring_d = function(t,contentonly,key) + if next(t) then + local r, n = { }, 0 + for k in next, t do + n = n + 1 + r[n] = k + end + sort(r) + for i=1,n do + local k = r[i] + local v = t[k] + local tv = type(v) + -- mostly tables + if tv == "table" then + local mv = getmetatable(v) + if mv and mv.__lpdftype then + -- if v == t then + -- report_objects("ignoring circular reference in dirctionary") + -- r[i] = f_key_null(k) + -- else + r[i] = f_key_value(k,tostring(v)) + -- end + elseif v[1] then + r[i] = f_key_value(k,tostring_a(v)) + else + r[i] = f_key_value(k,tostring_d(v)) + end + elseif tv == "string" then + r[i] = f_key_value(k,toeight(v)) + elseif tv == "number" then + r[i] = f_key_number(k,v) else - r[i] = f_key_value(k,tostring_d(v)) + r[i] = f_key_value(k,tostring(v)) end + end + if contentonly then + return concat(r," ") + elseif key then + return f_key_dictionary(key,r) else - r[i] = f_key_value(k,tostring(v)) + return f_dictionary(r) end - end - if contentonly then - return concat(r," ") - elseif key then - return f_key_dictionary(key,r) + elseif contentonly then + return "" else - return f_dictionary(r) + return "<< >>" end - elseif contentonly then - return "" - else - return "<< >>" end -end -tostring_a = function(t,contentonly,key) - local tn = #t - if tn ~= 0 then - local r = { } - for k=1,tn do - local v = t[k] - local tv = type(v) - if tv == "string" then - r[k] = toeight(v) - elseif tv == "number" then - r[k] = f_tonumber(v) - elseif tv == "table" then - local mv = getmetatable(v) - local mt = mv and mv.__lpdftype - if mt then - -- if v == t then - -- report_objects("ignoring circular reference in array") - -- r[k] = "null" - -- else - r[k] = tostring(v) - -- end - elseif v[1] then - r[k] = tostring_a(v) + tostring_a = function(t,contentonly,key) + local tn = #t + if tn ~= 0 then + local r = { } + for k=1,tn do + local v = t[k] + local tv = type(v) + -- mostly numbers and tables + if tv == "number" then + r[k] = f_tonumber(v) + elseif tv == "table" then + local mv = getmetatable(v) + local mt = mv and mv.__lpdftype + if mt then + -- if v == t then + -- report_objects("ignoring circular reference in array") + -- r[k] = "null" + -- else + r[k] = tostring(v) + -- end + elseif v[1] then + r[k] = tostring_a(v) + else + r[k] = tostring_d(v) + end + elseif tv == "string" then + r[k] = toeight(v) else - r[k] = tostring_d(v) + r[k] = tostring(v) end + end + if contentonly then + return concat(r, " ") + elseif key then + return f_key_array(key,r) else - r[k] = tostring(v) + return f_array(r) end - end - if contentonly then - return concat(r, " ") - elseif key then - return f_key_array(key,r) + elseif contentonly then + return "" else - return f_array(r) + return "[ ]" end - elseif contentonly then - return "" - else - return "[ ]" end + end +local f_tonumber = formatters["%N"] + local tostring_x = function(t) return concat(t," ") end local tostring_s = function(t) return toeight(t[1]) end local tostring_p = function(t) return topdfdoc(t[1],t[2]) end @@ -652,8 +689,6 @@ end for i=-1,9 do cache[i] = pdfnumber(i) end -local cache = { } -- can be weak - local replacer = S("\0\t\n\r\f ()[]{}/%%#\\") / { ["\00"]="#00", ["\09"]="#09", @@ -675,16 +710,17 @@ local replacer = S("\0\t\n\r\f ()[]{}/%%#\\") / { local escaped = Cs(Cc("/") * replacer^0) +local cache = table.setmetatableindex(function(t,k) + local v = setmetatable({ lpegmatch(escaped,k) }, mt_c) + t[k] = v + return v +end) + local function pdfconstant(str,default) if not str then - str = default or "" - end - local c = cache[str] - if not c then - c = setmetatable({ lpegmatch(escaped,str) },mt_c) - cache[str] = c + str = default or "none" end - return c + return cache[str] end local escaped = Cs(replacer^0) @@ -793,6 +829,10 @@ function lpdf.pagereference(n) end end +function lpdf.nofpages() + return structures.pages.nofpages +end + function lpdf.delayedobject(data,n) if n then pdfdeferredobject(n,data) @@ -917,6 +957,14 @@ local function resetpageproperties() pagesattributes = pdfdictionary() end +function lpdf.getpageproperties() + return { + pageresources = pageresources, + pageattributes = pageattributes, + pagesattributes = pagesattributes, + } +end + resetpageproperties() local function setpageproperties() @@ -1128,9 +1176,12 @@ do ColorSpace = ColorSpace, Pattern = Pattern, Shading = Shading, - -- ProcSet = pdfarray { pdfconstant("PDF") }, } - return collected() + if options and options.serialize == false then + return collected + else + return collected() + end else return "" end diff --git a/tex/context/base/mkiv/lpdf-nod.lua b/tex/context/base/mkiv/lpdf-nod.lua index d41aa0bee..ec71571d2 100644 --- a/tex/context/base/mkiv/lpdf-nod.lua +++ b/tex/context/base/mkiv/lpdf-nod.lua @@ -20,6 +20,7 @@ local nuts = nodes.nuts local tonut = nuts.tonut local setfield = nuts.setfield +local setdata = nuts.setdata local copy_node = nuts.copy local new_node = nuts.new @@ -42,10 +43,15 @@ local pdfsetmatrix = register(new_node(whatsit_code, whatsitcodes.pdfsetmatr local variables = interfaces.variables -function nodepool.pdforiginliteral(str) local t = copy_node(pdforiginliteral) setfield(t,"data",str) return t end -function nodepool.pdfpageliteral (str) local t = copy_node(pdfpageliteral ) setfield(t,"data",str) return t end -function nodepool.pdfdirectliteral(str) local t = copy_node(pdfdirectliteral) setfield(t,"data",str) return t end -function nodepool.pdfrawliteral (str) local t = copy_node(pdfrawliteral ) setfield(t,"data",str) return t end +-- function nodepool.pdforiginliteral(str) local t = copy_node(pdforiginliteral) setfield(t,"data",str) return t end +-- function nodepool.pdfpageliteral (str) local t = copy_node(pdfpageliteral ) setfield(t,"data",str) return t end +-- function nodepool.pdfdirectliteral(str) local t = copy_node(pdfdirectliteral) setfield(t,"data",str) return t end +-- function nodepool.pdfrawliteral (str) local t = copy_node(pdfrawliteral ) setfield(t,"data",str) return t end + +function nodepool.pdforiginliteral(str) local t = copy_node(pdforiginliteral) setdata(t,str) return t end +function nodepool.pdfpageliteral (str) local t = copy_node(pdfpageliteral ) setdata(t,str) return t end +function nodepool.pdfdirectliteral(str) local t = copy_node(pdfdirectliteral) setdata(t,str) return t end +function nodepool.pdfrawliteral (str) local t = copy_node(pdfrawliteral ) setdata(t,str) return t end nodepool.pdfliteral = nodepool.pdfpageliteral -- best is to use a specific one: origin | page | direct | raw @@ -60,7 +66,7 @@ end function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty) -- todo: tx ty local t = copy_node(pdfsetmatrix) if type(rx) == "string" then - setfield(t,"data",rx) + setdata(t,rx) else if not rx then rx = 1 @@ -80,12 +86,12 @@ function nodepool.pdfsetmatrix(rx,sx,sy,ry,tx,ty) -- todo: tx ty end if sx == 0 and sy == 0 then if rx == 1 and ry == 1 then - setfield(t,"data","1 0 0 1") + setdata(t,"1 0 0 1") else - setfield(t,"data",formatters["%0.6F 0 0 %0.6F"](rx,ry)) + setdata(t,formatters["%0.6F 0 0 %0.6F"](rx,ry)) end else - setfield(t,"data",formatters["%0.6F %0.6F %0.6F %0.6F"](rx,sx,sy,ry)) + setdata(t,formatters["%0.6F %0.6F %0.6F %0.6F"](rx,sx,sy,ry)) end end return t diff --git a/tex/context/base/mkiv/lpdf-pde.lua b/tex/context/base/mkiv/lpdf-pde.lua index 790e8e7ff..cecb1447f 100644 --- a/tex/context/base/mkiv/lpdf-pde.lua +++ b/tex/context/base/mkiv/lpdf-pde.lua @@ -41,7 +41,7 @@ local setmetatable, rawset, rawget, type, next = setmetatable, rawset, rawget, t local tostring, tonumber, unpack = tostring, tonumber, unpack local char, byte, find = string.char, string.byte, string.find local abs = math.abs -local concat, swapped = table.concat, table.swapped +local concat, swapped, sortedhash, sortedkeys = table.concat, table.swapped, table.sortedhash, table.sortedkeys local utfchar = string.char local setmetatableindex = table.setmetatableindex @@ -874,10 +874,15 @@ if img then do local plugins = nil + -- Sorting the hash slows down upto 5% bit but it is still as fast as the C + -- code. We could loop over the index instead but sorting might be nicer in + -- the end. + copydictionary = function (xref,copied,object) local target = pdfdictionary() local source = object.__raw__ - for key, value in next, source do + -- for key, value in next, source do + for key, value in sortedhash(source) do if plugins then local p = plugins[key] if p then diff --git a/tex/context/base/mkiv/luat-cbk.lua b/tex/context/base/mkiv/luat-cbk.lua index 6fcfdc7f2..d3184e1af 100644 --- a/tex/context/base/mkiv/luat-cbk.lua +++ b/tex/context/base/mkiv/luat-cbk.lua @@ -121,6 +121,12 @@ if trace_calls then end +-- temporary, not public: + +callbacks.functions = { } + +-- till here + local reported = { } local function register_usercall(what,name,func) diff --git a/tex/context/base/mkiv/luat-run.lua b/tex/context/base/mkiv/luat-run.lua index d09f01021..139e54338 100644 --- a/tex/context/base/mkiv/luat-run.lua +++ b/tex/context/base/mkiv/luat-run.lua @@ -141,6 +141,11 @@ else callbacks.register("finish_synctex_callback", wrapup_synctex, "rename temporary synctex file") end +-- temp hack for testing: + +callbacks.functions.start_page_number = start_shipout_page +callbacks.functions.stop_page_number = stop_shipout_page + -- an example: local tempfiles = { } diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua index 39b80e344..05c29dad3 100644 --- a/tex/context/base/mkiv/mlib-pps.lua +++ b/tex/context/base/mkiv/mlib-pps.lua @@ -1846,7 +1846,7 @@ local ot_reset, ot_analyze, ot_process do local outlinetexts = { } -- also in top data - local function ot_reset() + ot_reset = function () outlinetexts = { } end @@ -1874,7 +1874,7 @@ local ot_reset, ot_analyze, ot_process do else - local function ot_analyze(object,prescript) + ot_analyze = function(object,prescript) local ot_stage = prescript.ot_stage local ot_index = tonumber(prescript.ot_index) if ot_index and ot_stage == "trial" and not outlinetexts[ot_index] then diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index e456a0b89..d4b38bac4 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -232,6 +232,7 @@ return { "next", "nexttoken", -- "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox", + "boxisempty", -- "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchhsize", "scratchvsize", diff --git a/tex/context/base/mkiv/node-dir.lua b/tex/context/base/mkiv/node-dir.lua index 59564ac93..0494fd036 100644 --- a/tex/context/base/mkiv/node-dir.lua +++ b/tex/context/base/mkiv/node-dir.lua @@ -33,59 +33,83 @@ nodes.is_rotated = allocate { -- used RTT = true, ["+RTT"] = true, } -nodes.textdir_is_parallel = allocate { -- used - TLT = { +do + + local tlt = { TLT = true, ["+TLT"] = true, TRT = true, ["+TRT"] = true, -- LTL = false, -- RTT = false, - }, - TRT= { + } + + local trt = { TLT = true, ["+TLT"] = true, TRT = true, ["+TRT"] = true, -- LTL = false, -- RTT = false, - }, - LTL = { + } + + local ltl = { -- TLT = false, -- TRT = false, LTL = true, ["+LTL"] = true, RTT = true, ["+RTT"] = true, - }, - RTT = { + } + + local rtt = { -- TLT = false, -- TRT = false, LTL = true, ["+LTL"] = true, RTT = true, ["+RTT"] = true, } -} -nodes.pardir_is_parallel = allocate { - TLT = { + nodes.textdir_is_parallel = allocate { -- used + TLT = tlt, ["+TLT"] = tlt, -- ["-TLT"] = tlt, + TRT = trt, ["+TRT"] = trt, -- ["-TRT"] = trt, + LTL = ltl, ["+LTL"] = ltl, -- ["-LTL"] = ltl, + RTT = rtt, ["+RTT"] = rtt, -- ["-RTT"] = rtt, + } + +end + +do + + local tlt = { TLT = true, ["+TLT"] = true, TRT = true, ["+TRT"] = true, -- LTL = false, -- RTT = false, - }, - TRT = { + } + + local trt = { TLT = true, ["+TLT"] = true, TRT = true, ["+TRT"] = true, -- LTL = false, -- RTT = false, - }, - LTL = { + } + + local ltl = { -- TLT = false, -- TRT = false, LTL = true, ["+LTL"] = true, RTT = true, ["+RTT"] = true, - }, - RTT = { + } + + local rtt = { -- TLT = false, -- TRT = false, LTL = true, ["+LTL"] = true, RTT = true, ["+RTT"] = true, - }, -} + } + + nodes.pardir_is_parallel = allocate { + TLT = tlt, ["+TLT"] = tlt, -- ["-TLT"] = tlt, + TRT = trt, ["+TRT"] = trt, -- ["-TRT"] = trt, + LTL = ltl, ["+LTL"] = ltl, -- ["-LTL"] = ltl, + RTT = rtt, ["+RTT"] = rtt, -- ["-RTT"] = rtt, + } + +end nodes.pardir_is_opposite = allocate { TLT = { diff --git a/tex/context/base/mkiv/node-fnt.lua b/tex/context/base/mkiv/node-fnt.lua index 59a0ba671..f606e393c 100644 --- a/tex/context/base/mkiv/node-fnt.lua +++ b/tex/context/base/mkiv/node-fnt.lua @@ -50,7 +50,7 @@ local getdisc = nuts.getdisc local getnext = nuts.getnext local getprev = nuts.getprev local getboth = nuts.getboth -local getfield = nuts.getfield +local getdata = nuts.getdata ----- getdisc = nuts.getdisc local setchar = nuts.setchar local setlink = nuts.setlink @@ -183,7 +183,7 @@ local function start_trace(head) elseif id == disc_code then report_fonts("[disc] %s",nodes.listtoutf(n,true,false,n)) elseif id == boundary_code then - report_fonts("[boundary] %i:%i",getsubtype(n),getfield(n,"value")) + report_fonts("[boundary] %i:%i",getsubtype(n),getdata(n)) else report_fonts("[%s]",nodecodes[id]) end diff --git a/tex/context/base/mkiv/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua index c51298b4e..4044dc105 100644 --- a/tex/context/base/mkiv/node-ltp.lua +++ b/tex/context/base/mkiv/node-ltp.lua @@ -214,6 +214,8 @@ local getshift = nuts.getshift local getwidth = nuts.getwidth local getheight = nuts.getheight local getdepth = nuts.getdepth +local getdata = nuts.getdata +local getwhd = nuts.getwhd local isglyph = nuts.isglyph @@ -233,6 +235,7 @@ local setshift = nuts.setshift local setwidth = nuts.setwidth ----- setheight = nuts.setheight ----- setdepth = nuts.setdepth +local setexpansion = nuts.setexpansion local slide_node_list = nuts.slide -- get rid of this, probably ok > 78.2 local find_tail = nuts.tail @@ -630,7 +633,7 @@ local function find(head) -- do we really want to recurse into an hlist? end elseif id == boundary_code then if getsubtype(head) == protrusion_code then - local v = getfield(head,"value") + local v = getdata(head) if v == 1 or v == 3 then head = getnext(head) if head then @@ -653,19 +656,19 @@ end local function find_protchar_left(l) -- weird function local ln = getnext(l) - if ln and getid(ln) == hlist_code and not getlist(ln) and getfield(ln,"width") == 0 and getfield(ln,"height") == 0 and getfield(ln,"depth") == 0 then - l = getnext(l) - else -- if d then -- was always true - local id = getid(l) - while ln and not (id == glyph_code or id < math_code) do -- is there always a glyph? - l = ln - ln = getnext(l) - id = getid(ln) - end - end - -- if getid(l) == glyph_code then - -- return l - -- end + if ln and getid(ln) == hlist_code and not getlist(ln) then + local w, h, d = getwhd(ln) + if w == 0 and h == 0 and d == 0 then + l = getnext(l) + return find(l) or l + end + end -- if d then -- was always true + local id = getid(l) + while ln and not (id == glyph_code or id < math_code) do -- is there always a glyph? + l = ln + ln = getnext(l) + id = getid(ln) + end return find(l) or l end @@ -684,7 +687,7 @@ local function find(head,tail) end elseif id == boundary_code then if getsubtype(head) == protrusion_code then - local v = getfield(tail,"value") + local v = getdata(tail) if v == 2 or v == 3 then tail = getprev(tail) if tail then @@ -3130,7 +3133,7 @@ do local stretch, shrink = kern_stretch_shrink(g,kern) e = font_expand_ratio * stretch / 1000 end - setfield(g,"expansion_factor",e) + setexpansion(g,e) end end local tso = total_stretch[order] @@ -3187,7 +3190,7 @@ do local stretch, shrink = kern_stretch_shrink(g,kern) e = font_expand_ratio * shrink / 1000 end - setfield(g,"expansion_factor",e) + setexpansion(g,e) end end local tso = total_shrink[order] diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua index b970a46af..0397f0607 100644 --- a/tex/context/base/mkiv/node-nut.lua +++ b/tex/context/base/mkiv/node-nut.lua @@ -175,16 +175,119 @@ if not direct.getdirection then end +if not direct.getexpansion then + + local getfield = direct.getfield + local setfield = direct.setfield + + local nodecodes = nodes.nodecodes + local whatsitcodes = nodes.whatsitcodes + + local glyph_code = nodecodes.glyph + local kern_code = nodecodes.kern + + function direct.getexpansion(n) + local id = getid(n) + if id == glyph_code or id == kern_code then + return getfield(n,"expansion_factor") + end + end + + function direct.setexpansion(n,e) + local id = getid(n) + if id == glyph_code or id == kern_code then + setfield(n,"expansion_factor",e) + end + end + +end + +if not direct.getdata then + + local getid = direct.getid + local getsubtype = direct.getsubtype + local getfield = direct.getfield + local setfield = direct.setfield + + local nodecodes = nodes.nodecodes + local whatsitcodes = nodes.whatsitcodes + + local glyph_code = nodecodes.glyph + local boundary_code = nodecodes.boundary + local whatsit_code = nodecodes.whatsit + + local user_defined_code = whatsitcodes.userdefined + local pdf_literal_code = whatsitcodes.pdfliteral + local pdf_setmatrix_code = whatsitcodes.pdfsetmatrix + local late_lua_code = whatsitcodes.latelua + local special_code = whatsitcodes.special + local write_code = whatsitcodes.write + + function direct.getdata(n) + local id = getid(n) + if id == glyph_code then + return getfield(n,"data") + elseif id == boundary_code then + return getfield(n,"value") + elseif id == whatsit_code then + local subtype = getsubtype(n) + if subtype == user_defined_code then + return getfield(n,"value") + elseif subtype == pdf_literal_code then + return getfield(n,"data"), getfield(n,"mode") + elseif subtype == late_lua_code then + return getfield(n,"data") + elseif subtype == pdf_setmatrix_code then + return getfield(n,"data") + elseif subtype == special_code then + return getfield(n,"data") + elseif subtype == write_code then + return getfield(n,"data") + end + end + end + + function direct.setdata(n,v,vv) + local id = getid(n) + if id == glyph_code then + return setfield(n,"data",v) + elseif id == boundary_code then + return setfield(n,"value",v) + elseif id == whatsit_code then + local subtype = getsubtype(n) + if subtype == user_defined_code then + setfield(n,"value",v) + elseif subtype == pdf_literal_code then + setfield(n,"data",v) + if m then + setfield(n,"mode",vv) + end + elseif subtype == late_lua_code then + setfield(n,"data",v) + elseif subtype == pdf_setmatrix_code then + setfield(n,"data",v) + elseif subtype == special_code then + setfield(n,"data",v) + elseif subtype == write_code then + setfield(n,"data",v) + end + end + end + +end + if not node.direct.traverse_glyph or not node.direct.traverse_list then logs.report("system","using fake node list traversers") - local getnext = node.direct.getnext - local getid = node.direct.getid - local getsubtype = node.direct.getsubtype - local getchar = node.direct.getchar - local getfont = node.direct.getfont - local getlist = node.direct.getlist + local direct = node.direct + + local getnext = direct.getnext + local getid = direct.getid + local getsubtype = direct.getsubtype + local getchar = direct.getchar + local getfont = direct.getfont + local getlist = direct.getlist local function iterate(h,n) if n then @@ -374,6 +477,14 @@ nuts.setdisc = direct.setdisc nuts.getdiscretionary = direct.getdisc nuts.setdiscretionary = direct.setdisc +nuts.getdata = direct.getdata +nuts.setdata = direct.setdata +nuts.getvalue = direct.getdata +nuts.setvalue = direct.setdata + +nuts.getexpansion = direct.getexpansion +nuts.setexpansion = direct.setexpansion + nuts.getwhd = direct.getwhd nuts.setwhd = direct.setwhd nuts.getwidth = direct.getwidth diff --git a/tex/context/base/mkiv/node-ppt.lua b/tex/context/base/mkiv/node-ppt.lua index 0124f885b..f4a3df12c 100644 --- a/tex/context/base/mkiv/node-ppt.lua +++ b/tex/context/base/mkiv/node-ppt.lua @@ -29,6 +29,8 @@ local getsubtype = nuts.getsubtype local getfield = nuts.getfield local getlist = nuts.getlist local setlist = nuts.setlist +local getdata = nuts.getdata + local removenode = nuts.remove local nextnode = nuts.traversers.node @@ -333,7 +335,7 @@ end) -- last = nil -- end -- if getfield(source,"user_id") == property_id then --- local slot = getfield(source,"value") +-- local slot = getdata(source) -- local data = cache[slot] -- if data then -- cache[slot] = nil @@ -432,7 +434,7 @@ if LUATEXVERSION >= 1.090 then last = nil end if getfield(source,"user_id") == property_id then - local slot = getfield(source,"value") + local slot = getdata(source) local data = cache[slot] if data then cache[slot] = nil diff --git a/tex/context/base/mkiv/node-res.lua b/tex/context/base/mkiv/node-res.lua index 723562027..39d47f647 100644 --- a/tex/context/base/mkiv/node-res.lua +++ b/tex/context/base/mkiv/node-res.lua @@ -90,6 +90,9 @@ local setwidth = nuts.setwidth local setsubtype = nuts.setsubtype local setleader = nuts.setleader +local setdata = nuts.setdata +local setvalue = nuts.setvalue + local copy_nut = nuts.copy local new_nut = nuts.new local flush_nut = nuts.flush @@ -236,7 +239,8 @@ end function nutpool.boundary(v) local n = copy_nut(boundary) if v and v ~= 0 then - setfield(n,"value",v) + -- setfield(n,"value",v) + setvalue(n,v) end return n end @@ -244,7 +248,8 @@ end function nutpool.wordboundary(v) local n = copy_nut(wordboundary) if v and v ~= 0 then - setfield(n,"value",v) + -- setfield(n,"value",v) + setvalue(n,v) end return n end @@ -523,9 +528,11 @@ function nutpool.usernumber(id,num) local n = copy_nut(user_number) if num then setfield(n,"user_id",id) - setfield(n,"value",num) + -- setfield(n,"value",num) + setvalue(n,num) elseif id then - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end @@ -534,9 +541,11 @@ function nutpool.userlist(id,list) local n = copy_nut(user_nodes) if list then setfield(n,"user_id",id) - setfield(n,"value",list) + -- setfield(n,"value",list) + setvalue(n,list) else - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end @@ -545,9 +554,11 @@ function nutpool.userstring(id,str) local n = copy_nut(user_string) if str then setfield(n,"user_id",id) - setfield(n,"value",str) + -- setfield(n,"value",str) + setvalue(n,str) else - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end @@ -556,9 +567,11 @@ function nutpool.usertokens(id,tokens) local n = copy_nut(user_tokens) if tokens then setfield(n,"user_id",id) - setfield(n,"value",tokens) + -- setfield(n,"value",tokens) + setvalue(n,tokens) else - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end @@ -567,9 +580,11 @@ function nutpool.userlua(id,code) local n = copy_nut(user_lua) if code then setfield(n,"user_id",id) - setfield(n,"value",code) + -- setfield(n,"value",code) + setvalue(n,code) else - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end @@ -578,16 +593,19 @@ function nutpool.userattributes(id,attr) local n = copy_nut(user_attributes) if attr then setfield(n,"user_id",id) - setfield(n,"value",attr) + -- setfield(n,"value",attr) + setvalue(n,attr) else - setfield(n,"value",id) + -- setfield(n,"value",id) + setvalue(n,id) end return n end function nutpool.special(str) local n = copy_nut(special) - setfield(n,"data",str) + -- setfield(n,"data",str) + setdata(n,str) return n end diff --git a/tex/context/base/mkiv/node-rul.lua b/tex/context/base/mkiv/node-rul.lua index e8259df44..bb63e6668 100644 --- a/tex/context/base/mkiv/node-rul.lua +++ b/tex/context/base/mkiv/node-rul.lua @@ -204,18 +204,18 @@ local subtypeactions = { [rulecodes.radical] = mathradical, } -callbacks.register( - "process_rule", - function(n,h,v) - local n = tonut(n) - local s = getsubtype(n) - local a = subtypeactions[s] - if a then - a(n,h,v) - end - end, - "handle additional user rule features" -) +local function process_rule(n,h,v) + local n = tonut(n) + local s = getsubtype(n) + local a = subtypeactions[s] + if a then + a(n,h,v) + end +end + +callbacks.register("process_rule",process_rule,"handle additional user rule features") + +callbacks.functions.process_rule = process_rule -- @@ -899,7 +899,7 @@ interfaces.implement { setfield(n,"left",l) end if r then - etfield(n,"right",r) + setfield(n,"right",r) end end context(tonode(n)) diff --git a/tex/context/base/mkiv/node-ser.lua b/tex/context/base/mkiv/node-ser.lua index 7ed2b8d00..056b52e8d 100644 --- a/tex/context/base/mkiv/node-ser.lua +++ b/tex/context/base/mkiv/node-ser.lua @@ -87,7 +87,7 @@ local ignore = allocate ( tohash { local dimension = allocate ( tohash { "width", "height", "depth", "shift", "stretch", "shrink", - "xoffset", "yoffset", "xadvance", + "xoffset", "yoffset", "surround", "kern", "box_left_width", "box_right_width" diff --git a/tex/context/base/mkiv/node-syn.lua b/tex/context/base/mkiv/node-syn.lua index 153ab7eb2..0d4b1b45d 100644 --- a/tex/context/base/mkiv/node-syn.lua +++ b/tex/context/base/mkiv/node-syn.lua @@ -179,10 +179,11 @@ local force_synctex_line = tex.force_synctex_line local get_synctex_line = tex.get_synctex_line local set_synctex_mode = tex.set_synctex_mode -local getpos = function() - getpos = backends.codeinjections.getpos - return getpos() - end +local getpos = function() getpos = backends.codeinjections.getpos return getpos() end + +updaters.register("backend.update",function() + getpos = backends.codeinjections.getpos +end) local foundintree = resolvers.foundintree diff --git a/tex/context/base/mkiv/pack-lyr.mkiv b/tex/context/base/mkiv/pack-lyr.mkiv index 8661fe57a..99a0dfb2a 100644 --- a/tex/context/base/mkiv/pack-lyr.mkiv +++ b/tex/context/base/mkiv/pack-lyr.mkiv @@ -540,24 +540,85 @@ % todo: pass the layer with \lastnamedcs +% \def\pack_layers_flush_single +% {\startoverlay +% {\ifcsname\??layerbox \currentlayer \endcsname\pack_layers_flush_indeed\plusone \currentlayer \fi}% +% {\ifcsname\??layerbox \currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\fi}% +% \stopoverlay} +% +% \def\pack_layers_flush_double#1% +% {\startoverlay +% {\ifcsname\??layerbox \currentlayer \endcsname\pack_layers_flush_indeed\plusone \currentlayer \fi}% +% {\ifcsname\??layerbox \currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount {\currentlayer:\the\realpageno}\fi}% +% {\ifcsname\??layerbox#1\currentlayer \endcsname\pack_layers_flush_indeed\plusone {#1\currentlayer }\fi}% +% {\ifcsname\??layerbox#1\currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount{#1\currentlayer:\the\realpageno}\fi}% +% \stopoverlay} + +% optimized: + \def\pack_layers_flush_single - {\startoverlay - {\ifcsname\??layerbox \currentlayer \endcsname\pack_layers_flush_indeed\plusone \currentlayer \fi}% - {\ifcsname\??layerbox \currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\fi}% - \stopoverlay} + {\ifcsname\??layerbox\currentlayer\endcsname + \ifvoid\lastnamedcs + \ifcsname\??layerbox\currentlayer:\the\realpageno\endcsname + \ifvoid\lastnamedcs\else + \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\b_layer_two + \fi + \fi + \else + \chardef\b_layer_one\lastnamedcs + \ifcsname\??layerbox\currentlayer:\the\realpageno\endcsname + \ifvoid\lastnamedcs\else + \chardef\b_layer_two\lastnamedcs + \startoverlay + {\pack_layers_flush_indeed\plusone \currentlayer \b_layer_one}% + {\pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\b_layer_two}% + \stopoverlay + \fi + \else + \pack_layers_flush_indeed\plusone\currentlayer\b_layer_one + \fi + \fi + \else\ifcsname\??layerbox\currentlayer:\the\realpageno\endcsname + \ifvoid\lastnamedcs + % nothing + \else + \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\b_layer_two + \fi + \fi\fi} + +% less optimized: \def\pack_layers_flush_double#1% {\startoverlay - {\ifcsname\??layerbox \currentlayer \endcsname\pack_layers_flush_indeed\plusone \currentlayer \fi}% - {\ifcsname\??layerbox \currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount {\currentlayer:\the\realpageno}\fi}% - {\ifcsname\??layerbox#1\currentlayer \endcsname\pack_layers_flush_indeed\plusone {#1\currentlayer }\fi}% - {\ifcsname\??layerbox#1\currentlayer:\the\realpageno\endcsname\pack_layers_flush_indeed\zerocount{#1\currentlayer:\the\realpageno}\fi}% + {\ifcsname\??layerbox\currentlayer\endcsname + \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\plusone\currentlayer\b_layer_two + \fi + \fi}% + {\ifcsname\??layerbox\currentlayer:\the\realpageno\endcsname + \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\zerocount{\currentlayer:\the\realpageno}\b_layer_two + \fi + \fi}% + {\ifcsname\??layerbox#1\currentlayer\endcsname + \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\plusone{#1\currentlayer}\b_layer_two + \fi + \fi}% + {\ifcsname\??layerbox#1\currentlayer:\the\realpageno\endcsname + \ifvoid\lastnamedcss\else \chardef\b_layer_two\lastnamedcs + \pack_layers_flush_indeed\zerocount{#1\currentlayer:\the\realpageno}\b_layer_two + \fi + \fi}% \stopoverlay} \let\pack_layers_top_fill \relax \let\pack_layers_bottom_fill\vss -\def\pack_layers_flush_indeed#1#2% quite core, so optimized +%def\pack_layers_flush_indeed#1#2% +\def\pack_layers_flush_indeed#1#2#3% {\begingroup % already grouped \offinterlineskip \edef\p_pack_layers_preset{\layerparameter\c!preset}% @@ -587,7 +648,8 @@ \fi\fi \fi \fi - \chardef\b_layers\csname\??layerbox#2\endcsname % trick + %chardef\b_layers\csname\??layerbox#2\endcsname % trick + \let\b_layers#3% % we need to copy in order to retain the negative offsets for a next % stage of additions, i.e. llx/lly accumulate in repeat mode and the % compensation may differ each flush depending on added content diff --git a/tex/context/base/mkiv/page-imp.mkiv b/tex/context/base/mkiv/page-imp.mkiv index b80a3b266..359c120b0 100644 --- a/tex/context/base/mkiv/page-imp.mkiv +++ b/tex/context/base/mkiv/page-imp.mkiv @@ -164,6 +164,8 @@ \newdimen\d_page_shipouts_offset \d_page_shipouts_offset=-1in +\def\page_shipout_box#1{\normalshipout\box#1\relax} % takes a number + \def\page_shipouts_normal#1% {\global\advance\shippedoutpages\plusone % this is not resource safe! @@ -186,7 +188,7 @@ \ifcase\shipoutfinalizemethod \finalizeshipoutbox\shipoutscratchbox \fi - \normalshipout\vpack + \setbox\shipoutscratchbox\vpack {\offinterlineskip \vskip\d_page_shipouts_offset \hskip\d_page_shipouts_offset @@ -194,6 +196,7 @@ {\page_otr_flush_every_stuff \page_otr_flush_special_content \box\shipoutscratchbox}}% + \page_shipout_box\shipoutscratchbox % takes a box number! \else \page_shipouts_ignore{#1}% \fi} diff --git a/tex/context/base/mkiv/page-pcl.mkiv b/tex/context/base/mkiv/page-pcl.mkiv index 53d9f781d..5b7d0ae8a 100644 --- a/tex/context/base/mkiv/page-pcl.mkiv +++ b/tex/context/base/mkiv/page-pcl.mkiv @@ -769,7 +769,7 @@ \useblankparameter \pagecolumnsparameter % \useprofileparameter\pagecolumnsparameter % - \usemixedcolumnscolorparameter\c!color + \usepagecolumnscolorparameter\c!color % \setupnotes[\c!width=\textwidth]% % diff --git a/tex/context/base/mkiv/publ-aut.lua b/tex/context/base/mkiv/publ-aut.lua index 9ff078119..fd98c5e38 100644 --- a/tex/context/base/mkiv/publ-aut.lua +++ b/tex/context/base/mkiv/publ-aut.lua @@ -64,8 +64,8 @@ local v_last = interfaces.variables.last local space = lpegpatterns.whitespace local comma = P(",") -local period = P(".") -local dash = P("-") +local period = P(".") + P("{.}") +local dash = P("-") + P("{-}") local firstcharacter = lpegpatterns.utf8byte local utf8character = lpegpatterns.utf8character local p_and = space^1 * (P("and") + P("&&") + P("++")) * space^1 diff --git a/tex/context/base/mkiv/publ-dat.lua b/tex/context/base/mkiv/publ-dat.lua index 79b593345..6754382ff 100644 --- a/tex/context/base/mkiv/publ-dat.lua +++ b/tex/context/base/mkiv/publ-dat.lua @@ -34,7 +34,7 @@ local lpegmatch, lpegpatterns = lpeg.match, lpeg.patterns local textoutf = characters and characters.tex.toutf local settings_to_hash, settings_to_array = utilities.parsers.settings_to_hash, utilities.parsers.settings_to_array local formatters = string.formatters -local sortedkeys, sortedhash, keys = table.sortedkeys, table.sortedhash, table.keys +local sortedkeys, sortedhash, keys, sort = table.sortedkeys, table.sortedhash, table.keys, table.sort local xmlcollected, xmltext, xmlconvert = xml.collected, xml.text, xml.convert local setmetatableindex = table.setmetatableindex @@ -486,6 +486,8 @@ do local tags = table.setmetatableindex("table") + local indirectcrossrefs = true + local function do_definition(category,tag,tab,dataset) publicationsstats.nofdefinitions = publicationsstats.nofdefinitions + 1 if tag == "" then @@ -533,20 +535,24 @@ do value = lpegmatch(filter_2,value,1,dataset.commands) -- we need to start at 1 for { } end if normalized == "crossref" then - setmetatableindex(entries,function(t,k) - local parent = rawget(luadata,value) - if parent == entries then - report_duplicates("bad parent %a for %a in dataset %s",value,hashtag,dataset.name) - setmetatableindex(entries,nil) - return entries - elseif parent then - setmetatableindex(entries,parent) - return entries[k] - else - report_duplicates("no valid parent %a for %a in dataset %s",value,hashtag,dataset.name) - setmetatableindex(entries,nil) - end - end) + if indirectcrossrefs then + setmetatableindex(entries,function(t,k) + local parent = rawget(luadata,value) + if parent == entries then + report_duplicates("bad parent %a for %a in dataset %s",value,hashtag,dataset.name) + setmetatableindex(entries,nil) + return entries + elseif parent then + setmetatableindex(entries,parent) + return entries[k] + else + report_duplicates("no valid parent %a for %a in dataset %s",value,hashtag,dataset.name) + setmetatableindex(entries,nil) + end + end) + else + dataset.nofcrossrefs = dataset.nofcrossrefs +1 + end end entries[normalized] = value end @@ -695,12 +701,37 @@ do statistics.starttiming(publications) publicationsstats.nofbytes = publicationsstats.nofbytes + size current.nofbytes = current.nofbytes + size + current.nofcrossrefs = 0 if source then table.insert(current.sources, { filename = source, checksum = md5.HEX(content) }) current.loaded[source] = kind or true end - current.newtags = #current.luadata > 0 and { } or current.newtags + local luadata = current.luadata + current.newtags = #luadata > 0 and { } or current.newtags lpegmatch(bibtotable,content or "",1,current) + if current.nofcrossrefs > 0 then + for tag, entries in next, luadata do + local value = entries.crossref + if value then + local parent = luadata[value] + if parent == entries then + report_duplicates("bad parent %a for %a in dataset %s",value,hashtag,dataset.name) + elseif parent then + local t = { } + for k, v in next, parent do + if not entries[k] then + entries[k] = v + t[#t+1] = k + end + end + sort(t) + entries.inherited = concat(t,",") + else + report_duplicates("no valid parent %a for %a in dataset %s",value,hashtag,dataset.name) + end + end + end + end statistics.stoptiming(publications) end diff --git a/tex/context/base/mkiv/scrp-eth.lua b/tex/context/base/mkiv/scrp-eth.lua index cd2280c31..f6a994b88 100644 --- a/tex/context/base/mkiv/scrp-eth.lua +++ b/tex/context/base/mkiv/scrp-eth.lua @@ -12,7 +12,7 @@ if not modules then modules = { } end modules ['scrp-eth'] = { local nuts = nodes.nuts local getnext = nuts.getnext -local getchar = nuts.getchar +local ischar = nuts.ischar local getattr = nuts.getattr local nodecodes = nodes.nodecodes diff --git a/tex/context/base/mkiv/scrp-ini.lua b/tex/context/base/mkiv/scrp-ini.lua index d1ba30cab..aa16198d5 100644 --- a/tex/context/base/mkiv/scrp-ini.lua +++ b/tex/context/base/mkiv/scrp-ini.lua @@ -1062,12 +1062,14 @@ do end, nobreakspace_before = function(head,current) - head, current = insert_node_before(head,current,new_penalty(10000)) - return insert_node_before(head,current,space_glue(current)) + local g, p = space_glue(current), new_penalty(10000) + head, current = insert_node_before(head,current,p) + return insert_node_before(head,current,g) end, nobreakspace_after = function(head,current) - head, current = insert_node_after(head,current,space_glue(current)) - return insert_node_after(head,current,new_penalty(10000)) + local g, p = space_glue(current), new_penalty(10000) + head, current = insert_node_after(head,current,g) + return insert_node_after(head,current,p) end, } diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv index 074edd969..c241f4f2c 100644 --- a/tex/context/base/mkiv/spac-ver.mkiv +++ b/tex/context/base/mkiv/spac-ver.mkiv @@ -1332,8 +1332,14 @@ {\aftergroup\page_otr_synchronize_page_indeed \glet\page_otr_synchronize_page\relax} +% \unexpanded\def\page_otr_synchronize_page_indeed +% {\clf_synchronizepage +% \glet\page_otr_synchronize_page\page_otr_synchronize_page_yes} +% +% This has to become an otr method: \s!page_otr_command_synchonize_page + \unexpanded\def\page_otr_synchronize_page_indeed - {\clf_synchronizepage + {\ifx\currentoutputroutine\s!multicolumn\else\clf_synchronizepage\fi \glet\page_otr_synchronize_page\page_otr_synchronize_page_yes} \let\page_otr_synchronize_page\page_otr_synchronize_page_yes diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 784f1b3a2..afcce6971 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex b314749a6..2eb9c7104 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-blk.mkiv b/tex/context/base/mkiv/strc-blk.mkiv index 4d7437b37..724f7816c 100644 --- a/tex/context/base/mkiv/strc-blk.mkiv +++ b/tex/context/base/mkiv/strc-blk.mkiv @@ -34,15 +34,47 @@ \appendtoks \clf_definestructureblock{\currentblock}% - \setuevalue{\e!begin\currentblock}{\dotripleempty\strc_blocks_begin[\currentblock]}% + \setuevalue{\e!begin\currentblock}{\strc_blocks_begin{\currentblock}}% \letvalue {\e!end \currentblock}\donothing \to \everydefineblock -\unexpanded\def\strc_blocks_begin[#1][#2][#3]% - {\normalexpanded{\buff_pickup{\??block}{\e!begin#1}{\e!end#1}} +% The naive way: +% +% \unexpanded\def\strc_blocks_begin#1% +% {\dotripleempty\strc_blocks_begin_indeed[#1]} +% +% \unexpanded\def\strc_blocks_begin_indeed[#1][#2][#3]% +% {\normalexpanded{\buff_pickup{\??block}{\e!begin#1}{\e!end#1}} +% {}% +% {\clf_savestructureblock{#1}{#2}{#3}{\??block}}% +% \plusone}% +% +% We need to prevent too much lookahead which will gobble newlines +% that are needed for buffers. See blocks-002.tex as example. + +\let\m_block \empty +\let\m_subblock\empty + +\unexpanded\def\strc_blocks_begin#1% + {\edef\m_block {#1}% + \let \m_subblock\empty + \doifelsenextoptionalcs\strc_blocks_begin_yes\strc_blocks_begin_nop} + +\unexpanded\def\strc_blocks_begin_yes[#1]% + {\edef\m_subblock{#1}% + \doifelsenextoptionalcs\strc_blocks_begin_yes_yes\strc_blocks_begin_nop} + +\unexpanded\def\strc_blocks_begin_yes_yes[#1]% + {\strc_blocks_begin_indeed{#1}} + +\unexpanded\def\strc_blocks_begin_nop + {\strc_blocks_begin_indeed{}} + +\unexpanded\def\strc_blocks_begin_indeed#1% + {\normalexpanded{\buff_pickup{\??block}{\e!begin\m_block}{\e!end\m_block}}% {}% - {\clf_savestructureblock{#1}{#2}{#3}{\??block}}% - \plusone}% + {\clf_savestructureblock{\m_block}{\m_subblock}{#1}{\??block}}% + \plusone} \let\strc_blocks_setup\relax diff --git a/tex/context/base/mkiv/strc-ref.lua b/tex/context/base/mkiv/strc-ref.lua index cf39a4d99..2c9765a44 100644 --- a/tex/context/base/mkiv/strc-ref.lua +++ b/tex/context/base/mkiv/strc-ref.lua @@ -423,6 +423,10 @@ end local getpos = function() getpos = backends.codeinjections.getpos return getpos () end +updaters.register("backend.update",function() + getpos = backends.codeinjections.getpos +end) + local function synchronizepage(reference) -- non public helper reference.realpage = texgetcount("realpageno") if jobpositions.used then diff --git a/tex/context/base/mkiv/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv index f0178f41b..7a073fc84 100644 --- a/tex/context/base/mkiv/supp-box.mkiv +++ b/tex/context/base/mkiv/supp-box.mkiv @@ -2128,7 +2128,27 @@ %D %D \leavevmode\getbuffer +\def\boxisempty#1% + {\ifdim\wd#1=\zeropoint + \ifdim\ht#1=\zeropoint + \ifdim\dp#1=\zeropoint + \zerocount + \else + \plusone + \fi + \else + \plusone + \fi + \else + \plusone + \fi} + \def\syst_boxes_overlay_process + {\ifcase\boxisempty\nextbox\else + \syst_boxes_overlay_process_indeed + \fi} + +\def\syst_boxes_overlay_process_indeed {%\removeunwantedspaces % already done \scratchdepth\dp\ifdim\dp\nextbox>\dp\processbox\nextbox\else\processbox\fi \ifdim\ht\nextbox>\ht\processbox diff --git a/tex/context/base/mkiv/symb-imp-fontawesome.mkiv b/tex/context/base/mkiv/symb-imp-fontawesome.mkiv index 145adc46c..cae2e506b 100644 --- a/tex/context/base/mkiv/symb-imp-fontawesome.mkiv +++ b/tex/context/base/mkiv/symb-imp-fontawesome.mkiv @@ -10,749 +10,756 @@ \definefontsynonym [FontAwesome] [file:FontAwesome.otf] %def\FontAwesomeSymbol#1{\getglyphstyled{FontAwesome}{\utfchar{0x#1}}} -\def\FontAwesomeSymbol#1{\getglyphstyled{FontAwesome}{\tochar{x:#1}}} +\def\FontAwesomeSymbol#1{\getglyphstyled{FontAwesome}{\tochar{n:#1}}} -\startsymbolset [fontawesome] +\startsymbolset [fontawesome] [font=fontawesome] - \definesymbol [500px] [\FontAwesomeSymbol{f26e}] - \definesymbol [adjust] [\FontAwesomeSymbol{f042}] - \definesymbol [adn] [\FontAwesomeSymbol{f170}] - \definesymbol [align-center] [\FontAwesomeSymbol{f037}] - \definesymbol [align-justify] [\FontAwesomeSymbol{f039}] - \definesymbol [align-left] [\FontAwesomeSymbol{f036}] - \definesymbol [align-right] [\FontAwesomeSymbol{f038}] - \definesymbol [amazon] [\FontAwesomeSymbol{f270}] - \definesymbol [ambulance] [\FontAwesomeSymbol{f0f9}] - \definesymbol [american-sign-language-interpreting] [\FontAwesomeSymbol{f2a3}] - \definesymbol [anchor] [\FontAwesomeSymbol{f13d}] - \definesymbol [android] [\FontAwesomeSymbol{f17b}] - \definesymbol [angellist] [\FontAwesomeSymbol{f209}] - \definesymbol [angle-double-down] [\FontAwesomeSymbol{f103}] - \definesymbol [angle-double-left] [\FontAwesomeSymbol{f100}] - \definesymbol [angle-double-right] [\FontAwesomeSymbol{f101}] - \definesymbol [angle-double-up] [\FontAwesomeSymbol{f102}] - \definesymbol [angle-down] [\FontAwesomeSymbol{f107}] - \definesymbol [angle-left] [\FontAwesomeSymbol{f104}] - \definesymbol [angle-right] [\FontAwesomeSymbol{f105}] - \definesymbol [angle-up] [\FontAwesomeSymbol{f106}] - \definesymbol [apple] [\FontAwesomeSymbol{f179}] - \definesymbol [archive] [\FontAwesomeSymbol{f187}] - \definesymbol [area-chart] [\FontAwesomeSymbol{f1fe}] - \definesymbol [arrow-circle-down] [\FontAwesomeSymbol{f0ab}] - \definesymbol [arrow-circle-left] [\FontAwesomeSymbol{f0a8}] - \definesymbol [arrow-circle-o-down] [\FontAwesomeSymbol{f01a}] - \definesymbol [arrow-circle-o-left] [\FontAwesomeSymbol{f190}] - \definesymbol [arrow-circle-o-right] [\FontAwesomeSymbol{f18e}] - \definesymbol [arrow-circle-o-up] [\FontAwesomeSymbol{f01b}] - \definesymbol [arrow-circle-right] [\FontAwesomeSymbol{f0a9}] - \definesymbol [arrow-circle-up] [\FontAwesomeSymbol{f0aa}] - \definesymbol [arrow-down] [\FontAwesomeSymbol{f063}] - \definesymbol [arrow-left] [\FontAwesomeSymbol{f060}] - \definesymbol [arrow-right] [\FontAwesomeSymbol{f061}] - \definesymbol [arrow-up] [\FontAwesomeSymbol{f062}] - \definesymbol [arrows] [\FontAwesomeSymbol{f047}] - \definesymbol [arrows-alt] [\FontAwesomeSymbol{f0b2}] - \definesymbol [arrows-h] [\FontAwesomeSymbol{f07e}] - \definesymbol [arrows-v] [\FontAwesomeSymbol{f07d}] - \definesymbol [asl-interpreting] [\FontAwesomeSymbol{f2a3}] - \definesymbol [assistive-listening-systems] [\FontAwesomeSymbol{f2a2}] - \definesymbol [asterisk] [\FontAwesomeSymbol{f069}] - \definesymbol [at] [\FontAwesomeSymbol{f1fa}] - \definesymbol [audio-description] [\FontAwesomeSymbol{f29e}] - \definesymbol [automobile] [\FontAwesomeSymbol{f1b9}] - \definesymbol [backward] [\FontAwesomeSymbol{f04a}] - \definesymbol [balance-scale] [\FontAwesomeSymbol{f24e}] - \definesymbol [ban] [\FontAwesomeSymbol{f05e}] - \definesymbol [bank] [\FontAwesomeSymbol{f19c}] - \definesymbol [bar-chart] [\FontAwesomeSymbol{f080}] - \definesymbol [bar-chart-o] [\FontAwesomeSymbol{f080}] - \definesymbol [barcode] [\FontAwesomeSymbol{f02a}] - \definesymbol [bars] [\FontAwesomeSymbol{f0c9}] - \definesymbol [battery-0] [\FontAwesomeSymbol{f244}] - \definesymbol [battery-1] [\FontAwesomeSymbol{f243}] - \definesymbol [battery-2] [\FontAwesomeSymbol{f242}] - \definesymbol [battery-3] [\FontAwesomeSymbol{f241}] - \definesymbol [battery-4] [\FontAwesomeSymbol{f240}] - \definesymbol [battery-empty] [\FontAwesomeSymbol{f244}] - \definesymbol [battery-full] [\FontAwesomeSymbol{f240}] - \definesymbol [battery-half] [\FontAwesomeSymbol{f242}] - \definesymbol [battery-quarter] [\FontAwesomeSymbol{f243}] - \definesymbol [battery-three-quarters] [\FontAwesomeSymbol{f241}] - \definesymbol [bed] [\FontAwesomeSymbol{f236}] - \definesymbol [beer] [\FontAwesomeSymbol{f0fc}] - \definesymbol [behance] [\FontAwesomeSymbol{f1b4}] - \definesymbol [behance-square] [\FontAwesomeSymbol{f1b5}] - \definesymbol [bell] [\FontAwesomeSymbol{f0f3}] - \definesymbol [bell-o] [\FontAwesomeSymbol{f0a2}] - \definesymbol [bell-slash] [\FontAwesomeSymbol{f1f6}] - \definesymbol [bell-slash-o] [\FontAwesomeSymbol{f1f7}] - \definesymbol [bicycle] [\FontAwesomeSymbol{f206}] - \definesymbol [binoculars] [\FontAwesomeSymbol{f1e5}] - \definesymbol [birthday-cake] [\FontAwesomeSymbol{f1fd}] - \definesymbol [bitbucket] [\FontAwesomeSymbol{f171}] - \definesymbol [bitbucket-square] [\FontAwesomeSymbol{f172}] - \definesymbol [bitcoin] [\FontAwesomeSymbol{f15a}] - \definesymbol [black-tie] [\FontAwesomeSymbol{f27e}] - \definesymbol [blind] [\FontAwesomeSymbol{f29d}] - \definesymbol [bluetooth] [\FontAwesomeSymbol{f293}] - \definesymbol [bluetooth-b] [\FontAwesomeSymbol{f294}] - \definesymbol [bold] [\FontAwesomeSymbol{f032}] - \definesymbol [bolt] [\FontAwesomeSymbol{f0e7}] - \definesymbol [bomb] [\FontAwesomeSymbol{f1e2}] - \definesymbol [book] [\FontAwesomeSymbol{f02d}] - \definesymbol [bookmark] [\FontAwesomeSymbol{f02e}] - \definesymbol [bookmark-o] [\FontAwesomeSymbol{f097}] - \definesymbol [braille] [\FontAwesomeSymbol{f2a1}] - \definesymbol [briefcase] [\FontAwesomeSymbol{f0b1}] - \definesymbol [btc] [\FontAwesomeSymbol{f15a}] - \definesymbol [bug] [\FontAwesomeSymbol{f188}] - \definesymbol [building] [\FontAwesomeSymbol{f1ad}] - \definesymbol [building-o] [\FontAwesomeSymbol{f0f7}] - \definesymbol [bullhorn] [\FontAwesomeSymbol{f0a1}] - \definesymbol [bullseye] [\FontAwesomeSymbol{f140}] - \definesymbol [bus] [\FontAwesomeSymbol{f207}] - \definesymbol [buysellads] [\FontAwesomeSymbol{f20d}] - \definesymbol [cab] [\FontAwesomeSymbol{f1ba}] - \definesymbol [calculator] [\FontAwesomeSymbol{f1ec}] - \definesymbol [calendar] [\FontAwesomeSymbol{f073}] - \definesymbol [calendar-check-o] [\FontAwesomeSymbol{f274}] - \definesymbol [calendar-minus-o] [\FontAwesomeSymbol{f272}] - \definesymbol [calendar-o] [\FontAwesomeSymbol{f133}] - \definesymbol [calendar-plus-o] [\FontAwesomeSymbol{f271}] - \definesymbol [calendar-times-o] [\FontAwesomeSymbol{f273}] - \definesymbol [camera] [\FontAwesomeSymbol{f030}] - \definesymbol [camera-retro] [\FontAwesomeSymbol{f083}] - \definesymbol [car] [\FontAwesomeSymbol{f1b9}] - \definesymbol [caret-down] [\FontAwesomeSymbol{f0d7}] - \definesymbol [caret-left] [\FontAwesomeSymbol{f0d9}] - \definesymbol [caret-right] [\FontAwesomeSymbol{f0da}] - \definesymbol [caret-square-o-down] [\FontAwesomeSymbol{f150}] - \definesymbol [caret-square-o-left] [\FontAwesomeSymbol{f191}] - \definesymbol [caret-square-o-right] [\FontAwesomeSymbol{f152}] - \definesymbol [caret-square-o-up] [\FontAwesomeSymbol{f151}] - \definesymbol [caret-up] [\FontAwesomeSymbol{f0d8}] - \definesymbol [cart-arrow-down] [\FontAwesomeSymbol{f218}] - \definesymbol [cart-plus] [\FontAwesomeSymbol{f217}] - \definesymbol [cc] [\FontAwesomeSymbol{f20a}] - \definesymbol [cc-amex] [\FontAwesomeSymbol{f1f3}] - \definesymbol [cc-diners-club] [\FontAwesomeSymbol{f24c}] - \definesymbol [cc-discover] [\FontAwesomeSymbol{f1f2}] - \definesymbol [cc-jcb] [\FontAwesomeSymbol{f24b}] - \definesymbol [cc-mastercard] [\FontAwesomeSymbol{f1f1}] - \definesymbol [cc-paypal] [\FontAwesomeSymbol{f1f4}] - \definesymbol [cc-stripe] [\FontAwesomeSymbol{f1f5}] - \definesymbol [cc-visa] [\FontAwesomeSymbol{f1f0}] - \definesymbol [certificate] [\FontAwesomeSymbol{f0a3}] - \definesymbol [chain] [\FontAwesomeSymbol{f0c1}] - \definesymbol [chain-broken] [\FontAwesomeSymbol{f127}] - \definesymbol [check] [\FontAwesomeSymbol{f00c}] - \definesymbol [check-circle] [\FontAwesomeSymbol{f058}] - \definesymbol [check-circle-o] [\FontAwesomeSymbol{f05d}] - \definesymbol [check-square] [\FontAwesomeSymbol{f14a}] - \definesymbol [check-square-o] [\FontAwesomeSymbol{f046}] - \definesymbol [chevron-circle-down] [\FontAwesomeSymbol{f13a}] - \definesymbol [chevron-circle-left] [\FontAwesomeSymbol{f137}] - \definesymbol [chevron-circle-right] [\FontAwesomeSymbol{f138}] - \definesymbol [chevron-circle-up] [\FontAwesomeSymbol{f139}] - \definesymbol [chevron-down] [\FontAwesomeSymbol{f078}] - \definesymbol [chevron-left] [\FontAwesomeSymbol{f053}] - \definesymbol [chevron-right] [\FontAwesomeSymbol{f054}] - \definesymbol [chevron-up] [\FontAwesomeSymbol{f077}] - \definesymbol [child] [\FontAwesomeSymbol{f1ae}] - \definesymbol [chrome] [\FontAwesomeSymbol{f268}] - \definesymbol [circle] [\FontAwesomeSymbol{f111}] - \definesymbol [circle-o] [\FontAwesomeSymbol{f10c}] - \definesymbol [circle-o-notch] [\FontAwesomeSymbol{f1ce}] - \definesymbol [circle-thin] [\FontAwesomeSymbol{f1db}] - \definesymbol [clipboard] [\FontAwesomeSymbol{f0ea}] - \definesymbol [clock-o] [\FontAwesomeSymbol{f017}] - \definesymbol [clone] [\FontAwesomeSymbol{f24d}] - \definesymbol [close] [\FontAwesomeSymbol{f00d}] - \definesymbol [cloud] [\FontAwesomeSymbol{f0c2}] - \definesymbol [cloud-download] [\FontAwesomeSymbol{f0ed}] - \definesymbol [cloud-upload] [\FontAwesomeSymbol{f0ee}] - \definesymbol [cny] [\FontAwesomeSymbol{f157}] - \definesymbol [code] [\FontAwesomeSymbol{f121}] - \definesymbol [code-fork] [\FontAwesomeSymbol{f126}] - \definesymbol [codepen] [\FontAwesomeSymbol{f1cb}] - \definesymbol [codiepie] [\FontAwesomeSymbol{f284}] - \definesymbol [coffee] [\FontAwesomeSymbol{f0f4}] - \definesymbol [cog] [\FontAwesomeSymbol{f013}] - \definesymbol [cogs] [\FontAwesomeSymbol{f085}] - \definesymbol [columns] [\FontAwesomeSymbol{f0db}] - \definesymbol [comment] [\FontAwesomeSymbol{f075}] - \definesymbol [comment-o] [\FontAwesomeSymbol{f0e5}] - \definesymbol [commenting] [\FontAwesomeSymbol{f27a}] - \definesymbol [commenting-o] [\FontAwesomeSymbol{f27b}] - \definesymbol [comments] [\FontAwesomeSymbol{f086}] - \definesymbol [comments-o] [\FontAwesomeSymbol{f0e6}] - \definesymbol [compass] [\FontAwesomeSymbol{f14e}] - \definesymbol [compress] [\FontAwesomeSymbol{f066}] - \definesymbol [connectdevelop] [\FontAwesomeSymbol{f20e}] - \definesymbol [contao] [\FontAwesomeSymbol{f26d}] - \definesymbol [copy] [\FontAwesomeSymbol{f0c5}] - \definesymbol [copyright] [\FontAwesomeSymbol{f1f9}] - \definesymbol [creative-commons] [\FontAwesomeSymbol{f25e}] - \definesymbol [credit-card] [\FontAwesomeSymbol{f09d}] - \definesymbol [credit-card-alt] [\FontAwesomeSymbol{f283}] - \definesymbol [crop] [\FontAwesomeSymbol{f125}] - \definesymbol [crosshairs] [\FontAwesomeSymbol{f05b}] - \definesymbol [css3] [\FontAwesomeSymbol{f13c}] - \definesymbol [cube] [\FontAwesomeSymbol{f1b2}] - \definesymbol [cubes] [\FontAwesomeSymbol{f1b3}] - \definesymbol [cut] [\FontAwesomeSymbol{f0c4}] - \definesymbol [cutlery] [\FontAwesomeSymbol{f0f5}] - \definesymbol [dashboard] [\FontAwesomeSymbol{f0e4}] - \definesymbol [dashcube] [\FontAwesomeSymbol{f210}] - \definesymbol [database] [\FontAwesomeSymbol{f1c0}] - \definesymbol [deaf] [\FontAwesomeSymbol{f2a4}] - \definesymbol [deafness] [\FontAwesomeSymbol{f2a4}] - \definesymbol [dedent] [\FontAwesomeSymbol{f03b}] - \definesymbol [delicious] [\FontAwesomeSymbol{f1a5}] - \definesymbol [desktop] [\FontAwesomeSymbol{f108}] - \definesymbol [deviantart] [\FontAwesomeSymbol{f1bd}] - \definesymbol [diamond] [\FontAwesomeSymbol{f219}] - \definesymbol [digg] [\FontAwesomeSymbol{f1a6}] - \definesymbol [dollar] [\FontAwesomeSymbol{f155}] - \definesymbol [dot-circle-o] [\FontAwesomeSymbol{f192}] - \definesymbol [download] [\FontAwesomeSymbol{f019}] - \definesymbol [dribbble] [\FontAwesomeSymbol{f17d}] - \definesymbol [dropbox] [\FontAwesomeSymbol{f16b}] - \definesymbol [drupal] [\FontAwesomeSymbol{f1a9}] - \definesymbol [edge] [\FontAwesomeSymbol{f282}] - \definesymbol [edit] [\FontAwesomeSymbol{f044}] - \definesymbol [eject] [\FontAwesomeSymbol{f052}] - \definesymbol [ellipsis-h] [\FontAwesomeSymbol{f141}] - \definesymbol [ellipsis-v] [\FontAwesomeSymbol{f142}] - \definesymbol [empire] [\FontAwesomeSymbol{f1d1}] - \definesymbol [envelope] [\FontAwesomeSymbol{f0e0}] - \definesymbol [envelope-o] [\FontAwesomeSymbol{f003}] - \definesymbol [envelope-square] [\FontAwesomeSymbol{f199}] - \definesymbol [envira] [\FontAwesomeSymbol{f299}] - \definesymbol [eraser] [\FontAwesomeSymbol{f12d}] - \definesymbol [eur] [\FontAwesomeSymbol{f153}] - \definesymbol [euro] [\FontAwesomeSymbol{f153}] - \definesymbol [exchange] [\FontAwesomeSymbol{f0ec}] - \definesymbol [exclamation] [\FontAwesomeSymbol{f12a}] - \definesymbol [exclamation-circle] [\FontAwesomeSymbol{f06a}] - \definesymbol [exclamation-triangle] [\FontAwesomeSymbol{f071}] - \definesymbol [expand] [\FontAwesomeSymbol{f065}] - \definesymbol [expeditedssl] [\FontAwesomeSymbol{f23e}] - \definesymbol [external-link] [\FontAwesomeSymbol{f08e}] - \definesymbol [external-link-square] [\FontAwesomeSymbol{f14c}] - \definesymbol [eye] [\FontAwesomeSymbol{f06e}] - \definesymbol [eye-slash] [\FontAwesomeSymbol{f070}] - \definesymbol [eyedropper] [\FontAwesomeSymbol{f1fb}] - \definesymbol [fa] [\FontAwesomeSymbol{f2b4}] - \definesymbol [facebook] [\FontAwesomeSymbol{f09a}] - \definesymbol [facebook-f] [\FontAwesomeSymbol{f09a}] - \definesymbol [facebook-official] [\FontAwesomeSymbol{f230}] - \definesymbol [facebook-square] [\FontAwesomeSymbol{f082}] - \definesymbol [fast-backward] [\FontAwesomeSymbol{f049}] - \definesymbol [fast-forward] [\FontAwesomeSymbol{f050}] - \definesymbol [fax] [\FontAwesomeSymbol{f1ac}] - \definesymbol [feed] [\FontAwesomeSymbol{f09e}] - \definesymbol [female] [\FontAwesomeSymbol{f182}] - \definesymbol [fighter-jet] [\FontAwesomeSymbol{f0fb}] - \definesymbol [file] [\FontAwesomeSymbol{f15b}] - \definesymbol [file-archive-o] [\FontAwesomeSymbol{f1c6}] - \definesymbol [file-audio-o] [\FontAwesomeSymbol{f1c7}] - \definesymbol [file-code-o] [\FontAwesomeSymbol{f1c9}] - \definesymbol [file-excel-o] [\FontAwesomeSymbol{f1c3}] - \definesymbol [file-image-o] [\FontAwesomeSymbol{f1c5}] - \definesymbol [file-movie-o] [\FontAwesomeSymbol{f1c8}] - \definesymbol [file-o] [\FontAwesomeSymbol{f016}] - \definesymbol [file-pdf-o] [\FontAwesomeSymbol{f1c1}] - \definesymbol [file-photo-o] [\FontAwesomeSymbol{f1c5}] - \definesymbol [file-picture-o] [\FontAwesomeSymbol{f1c5}] - \definesymbol [file-powerpoint-o] [\FontAwesomeSymbol{f1c4}] - \definesymbol [file-sound-o] [\FontAwesomeSymbol{f1c7}] - \definesymbol [file-text] [\FontAwesomeSymbol{f15c}] - \definesymbol [file-text-o] [\FontAwesomeSymbol{f0f6}] - \definesymbol [file-video-o] [\FontAwesomeSymbol{f1c8}] - \definesymbol [file-word-o] [\FontAwesomeSymbol{f1c2}] - \definesymbol [file-zip-o] [\FontAwesomeSymbol{f1c6}] - \definesymbol [files-o] [\FontAwesomeSymbol{f0c5}] - \definesymbol [film] [\FontAwesomeSymbol{f008}] - \definesymbol [filter] [\FontAwesomeSymbol{f0b0}] - \definesymbol [fire] [\FontAwesomeSymbol{f06d}] - \definesymbol [fire-extinguisher] [\FontAwesomeSymbol{f134}] - \definesymbol [firefox] [\FontAwesomeSymbol{f269}] - \definesymbol [first-order] [\FontAwesomeSymbol{f2b0}] - \definesymbol [flag] [\FontAwesomeSymbol{f024}] - \definesymbol [flag-checkered] [\FontAwesomeSymbol{f11e}] - \definesymbol [flag-o] [\FontAwesomeSymbol{f11d}] - \definesymbol [flash] [\FontAwesomeSymbol{f0e7}] - \definesymbol [flask] [\FontAwesomeSymbol{f0c3}] - \definesymbol [flickr] [\FontAwesomeSymbol{f16e}] - \definesymbol [floppy-o] [\FontAwesomeSymbol{f0c7}] - \definesymbol [folder] [\FontAwesomeSymbol{f07b}] - \definesymbol [folder-o] [\FontAwesomeSymbol{f114}] - \definesymbol [folder-open] [\FontAwesomeSymbol{f07c}] - \definesymbol [folder-open-o] [\FontAwesomeSymbol{f115}] - \definesymbol [font] [\FontAwesomeSymbol{f031}] - \definesymbol [font-awesome] [\FontAwesomeSymbol{f2b4}] - \definesymbol [fonticons] [\FontAwesomeSymbol{f280}] - \definesymbol [fort-awesome] [\FontAwesomeSymbol{f286}] - \definesymbol [forumbee] [\FontAwesomeSymbol{f211}] - \definesymbol [forward] [\FontAwesomeSymbol{f04e}] - \definesymbol [foursquare] [\FontAwesomeSymbol{f180}] - \definesymbol [frown-o] [\FontAwesomeSymbol{f119}] - \definesymbol [futbol-o] [\FontAwesomeSymbol{f1e3}] - \definesymbol [gamepad] [\FontAwesomeSymbol{f11b}] - \definesymbol [gavel] [\FontAwesomeSymbol{f0e3}] - \definesymbol [gbp] [\FontAwesomeSymbol{f154}] - \definesymbol [ge] [\FontAwesomeSymbol{f1d1}] - \definesymbol [gear] [\FontAwesomeSymbol{f013}] - \definesymbol [gears] [\FontAwesomeSymbol{f085}] - \definesymbol [genderless] [\FontAwesomeSymbol{f22d}] - \definesymbol [get-pocket] [\FontAwesomeSymbol{f265}] - \definesymbol [gg] [\FontAwesomeSymbol{f260}] - \definesymbol [gg-circle] [\FontAwesomeSymbol{f261}] - \definesymbol [gift] [\FontAwesomeSymbol{f06b}] - \definesymbol [git] [\FontAwesomeSymbol{f1d3}] - \definesymbol [git-square] [\FontAwesomeSymbol{f1d2}] - \definesymbol [github] [\FontAwesomeSymbol{f09b}] - \definesymbol [github-alt] [\FontAwesomeSymbol{f113}] - \definesymbol [github-square] [\FontAwesomeSymbol{f092}] - \definesymbol [gitlab] [\FontAwesomeSymbol{f296}] - \definesymbol [gittip] [\FontAwesomeSymbol{f184}] - \definesymbol [glass] [\FontAwesomeSymbol{f000}] - \definesymbol [glide] [\FontAwesomeSymbol{f2a5}] - \definesymbol [glide-g] [\FontAwesomeSymbol{f2a6}] - \definesymbol [globe] [\FontAwesomeSymbol{f0ac}] - \definesymbol [google] [\FontAwesomeSymbol{f1a0}] - \definesymbol [google-plus] [\FontAwesomeSymbol{f0d5}] - \definesymbol [google-plus-circle] [\FontAwesomeSymbol{f2b3}] - \definesymbol [google-plus-official] [\FontAwesomeSymbol{f2b3}] - \definesymbol [google-plus-square] [\FontAwesomeSymbol{f0d4}] - \definesymbol [google-wallet] [\FontAwesomeSymbol{f1ee}] - \definesymbol [graduation-cap] [\FontAwesomeSymbol{f19d}] - \definesymbol [gratipay] [\FontAwesomeSymbol{f184}] - \definesymbol [group] [\FontAwesomeSymbol{f0c0}] - \definesymbol [h-square] [\FontAwesomeSymbol{f0fd}] - \definesymbol [hacker-news] [\FontAwesomeSymbol{f1d4}] - \definesymbol [hand-grab-o] [\FontAwesomeSymbol{f255}] - \definesymbol [hand-lizard-o] [\FontAwesomeSymbol{f258}] - \definesymbol [hand-o-down] [\FontAwesomeSymbol{f0a7}] - \definesymbol [hand-o-left] [\FontAwesomeSymbol{f0a5}] - \definesymbol [hand-o-right] [\FontAwesomeSymbol{f0a4}] - \definesymbol [hand-o-up] [\FontAwesomeSymbol{f0a6}] - \definesymbol [hand-paper-o] [\FontAwesomeSymbol{f256}] - \definesymbol [hand-peace-o] [\FontAwesomeSymbol{f25b}] - \definesymbol [hand-pointer-o] [\FontAwesomeSymbol{f25a}] - \definesymbol [hand-rock-o] [\FontAwesomeSymbol{f255}] - \definesymbol [hand-scissors-o] [\FontAwesomeSymbol{f257}] - \definesymbol [hand-spock-o] [\FontAwesomeSymbol{f259}] - \definesymbol [hand-stop-o] [\FontAwesomeSymbol{f256}] - \definesymbol [hard-of-hearing] [\FontAwesomeSymbol{f2a4}] - \definesymbol [hashtag] [\FontAwesomeSymbol{f292}] - \definesymbol [hdd-o] [\FontAwesomeSymbol{f0a0}] - \definesymbol [header] [\FontAwesomeSymbol{f1dc}] - \definesymbol [headphones] [\FontAwesomeSymbol{f025}] - \definesymbol [heart] [\FontAwesomeSymbol{f004}] - \definesymbol [heart-o] [\FontAwesomeSymbol{f08a}] - \definesymbol [heartbeat] [\FontAwesomeSymbol{f21e}] - \definesymbol [history] [\FontAwesomeSymbol{f1da}] - \definesymbol [home] [\FontAwesomeSymbol{f015}] - \definesymbol [hospital-o] [\FontAwesomeSymbol{f0f8}] - \definesymbol [hotel] [\FontAwesomeSymbol{f236}] - \definesymbol [hourglass] [\FontAwesomeSymbol{f254}] - \definesymbol [hourglass-1] [\FontAwesomeSymbol{f251}] - \definesymbol [hourglass-2] [\FontAwesomeSymbol{f252}] - \definesymbol [hourglass-3] [\FontAwesomeSymbol{f253}] - \definesymbol [hourglass-end] [\FontAwesomeSymbol{f253}] - \definesymbol [hourglass-half] [\FontAwesomeSymbol{f252}] - \definesymbol [hourglass-o] [\FontAwesomeSymbol{f250}] - \definesymbol [hourglass-start] [\FontAwesomeSymbol{f251}] - \definesymbol [houzz] [\FontAwesomeSymbol{f27c}] - \definesymbol [html5] [\FontAwesomeSymbol{f13b}] - \definesymbol [i-cursor] [\FontAwesomeSymbol{f246}] - \definesymbol [ils] [\FontAwesomeSymbol{f20b}] - \definesymbol [image] [\FontAwesomeSymbol{f03e}] - \definesymbol [inbox] [\FontAwesomeSymbol{f01c}] - \definesymbol [indent] [\FontAwesomeSymbol{f03c}] - \definesymbol [industry] [\FontAwesomeSymbol{f275}] - \definesymbol [info] [\FontAwesomeSymbol{f129}] - \definesymbol [info-circle] [\FontAwesomeSymbol{f05a}] - \definesymbol [inr] [\FontAwesomeSymbol{f156}] - \definesymbol [instagram] [\FontAwesomeSymbol{f16d}] - \definesymbol [institution] [\FontAwesomeSymbol{f19c}] - \definesymbol [internet-explorer] [\FontAwesomeSymbol{f26b}] - \definesymbol [intersex] [\FontAwesomeSymbol{f224}] - \definesymbol [ioxhost] [\FontAwesomeSymbol{f208}] - \definesymbol [italic] [\FontAwesomeSymbol{f033}] - \definesymbol [joomla] [\FontAwesomeSymbol{f1aa}] - \definesymbol [jpy] [\FontAwesomeSymbol{f157}] - \definesymbol [jsfiddle] [\FontAwesomeSymbol{f1cc}] - \definesymbol [key] [\FontAwesomeSymbol{f084}] - \definesymbol [keyboard-o] [\FontAwesomeSymbol{f11c}] - \definesymbol [krw] [\FontAwesomeSymbol{f159}] - \definesymbol [language] [\FontAwesomeSymbol{f1ab}] - \definesymbol [laptop] [\FontAwesomeSymbol{f109}] - \definesymbol [lastfm] [\FontAwesomeSymbol{f202}] - \definesymbol [lastfm-square] [\FontAwesomeSymbol{f203}] - \definesymbol [leaf] [\FontAwesomeSymbol{f06c}] - \definesymbol [leanpub] [\FontAwesomeSymbol{f212}] - \definesymbol [legal] [\FontAwesomeSymbol{f0e3}] - \definesymbol [lemon-o] [\FontAwesomeSymbol{f094}] - \definesymbol [level-down] [\FontAwesomeSymbol{f149}] - \definesymbol [level-up] [\FontAwesomeSymbol{f148}] - \definesymbol [life-bouy] [\FontAwesomeSymbol{f1cd}] - \definesymbol [life-buoy] [\FontAwesomeSymbol{f1cd}] - \definesymbol [life-ring] [\FontAwesomeSymbol{f1cd}] - \definesymbol [life-saver] [\FontAwesomeSymbol{f1cd}] - \definesymbol [lightbulb-o] [\FontAwesomeSymbol{f0eb}] - \definesymbol [line-chart] [\FontAwesomeSymbol{f201}] - \definesymbol [link] [\FontAwesomeSymbol{f0c1}] - \definesymbol [linkedin] [\FontAwesomeSymbol{f0e1}] - \definesymbol [linkedin-square] [\FontAwesomeSymbol{f08c}] - \definesymbol [linux] [\FontAwesomeSymbol{f17c}] - \definesymbol [list] [\FontAwesomeSymbol{f03a}] - \definesymbol [list-alt] [\FontAwesomeSymbol{f022}] - \definesymbol [list-ol] [\FontAwesomeSymbol{f0cb}] - \definesymbol [list-ul] [\FontAwesomeSymbol{f0ca}] - \definesymbol [location-arrow] [\FontAwesomeSymbol{f124}] - \definesymbol [lock] [\FontAwesomeSymbol{f023}] - \definesymbol [long-arrow-down] [\FontAwesomeSymbol{f175}] - \definesymbol [long-arrow-left] [\FontAwesomeSymbol{f177}] - \definesymbol [long-arrow-right] [\FontAwesomeSymbol{f178}] - \definesymbol [long-arrow-up] [\FontAwesomeSymbol{f176}] - \definesymbol [low-vision] [\FontAwesomeSymbol{f2a8}] - \definesymbol [magic] [\FontAwesomeSymbol{f0d0}] - \definesymbol [magnet] [\FontAwesomeSymbol{f076}] - \definesymbol [mail-forward] [\FontAwesomeSymbol{f064}] - \definesymbol [mail-reply] [\FontAwesomeSymbol{f112}] - \definesymbol [mail-reply-all] [\FontAwesomeSymbol{f122}] - \definesymbol [male] [\FontAwesomeSymbol{f183}] - \definesymbol [map] [\FontAwesomeSymbol{f279}] - \definesymbol [map-marker] [\FontAwesomeSymbol{f041}] - \definesymbol [map-o] [\FontAwesomeSymbol{f278}] - \definesymbol [map-pin] [\FontAwesomeSymbol{f276}] - \definesymbol [map-signs] [\FontAwesomeSymbol{f277}] - \definesymbol [mars] [\FontAwesomeSymbol{f222}] - \definesymbol [mars-double] [\FontAwesomeSymbol{f227}] - \definesymbol [mars-stroke] [\FontAwesomeSymbol{f229}] - \definesymbol [mars-stroke-h] [\FontAwesomeSymbol{f22b}] - \definesymbol [mars-stroke-v] [\FontAwesomeSymbol{f22a}] - \definesymbol [maxcdn] [\FontAwesomeSymbol{f136}] - \definesymbol [meanpath] [\FontAwesomeSymbol{f20c}] - \definesymbol [medium] [\FontAwesomeSymbol{f23a}] - \definesymbol [medkit] [\FontAwesomeSymbol{f0fa}] - \definesymbol [meh-o] [\FontAwesomeSymbol{f11a}] - \definesymbol [mercury] [\FontAwesomeSymbol{f223}] - \definesymbol [microphone] [\FontAwesomeSymbol{f130}] - \definesymbol [microphone-slash] [\FontAwesomeSymbol{f131}] - \definesymbol [minus] [\FontAwesomeSymbol{f068}] - \definesymbol [minus-circle] [\FontAwesomeSymbol{f056}] - \definesymbol [minus-square] [\FontAwesomeSymbol{f146}] - \definesymbol [minus-square-o] [\FontAwesomeSymbol{f147}] - \definesymbol [mixcloud] [\FontAwesomeSymbol{f289}] - \definesymbol [mobile] [\FontAwesomeSymbol{f10b}] - \definesymbol [mobile-phone] [\FontAwesomeSymbol{f10b}] - \definesymbol [modx] [\FontAwesomeSymbol{f285}] - \definesymbol [money] [\FontAwesomeSymbol{f0d6}] - \definesymbol [moon-o] [\FontAwesomeSymbol{f186}] - \definesymbol [mortar-board] [\FontAwesomeSymbol{f19d}] - \definesymbol [motorcycle] [\FontAwesomeSymbol{f21c}] - \definesymbol [mouse-pointer] [\FontAwesomeSymbol{f245}] - \definesymbol [music] [\FontAwesomeSymbol{f001}] - \definesymbol [navicon] [\FontAwesomeSymbol{f0c9}] - \definesymbol [neuter] [\FontAwesomeSymbol{f22c}] - \definesymbol [newspaper-o] [\FontAwesomeSymbol{f1ea}] - \definesymbol [object-group] [\FontAwesomeSymbol{f247}] - \definesymbol [object-ungroup] [\FontAwesomeSymbol{f248}] - \definesymbol [odnoklassniki] [\FontAwesomeSymbol{f263}] - \definesymbol [odnoklassniki-square] [\FontAwesomeSymbol{f264}] - \definesymbol [opencart] [\FontAwesomeSymbol{f23d}] - \definesymbol [openid] [\FontAwesomeSymbol{f19b}] - \definesymbol [opera] [\FontAwesomeSymbol{f26a}] - \definesymbol [optin-monster] [\FontAwesomeSymbol{f23c}] - \definesymbol [outdent] [\FontAwesomeSymbol{f03b}] - \definesymbol [pagelines] [\FontAwesomeSymbol{f18c}] - \definesymbol [paint-brush] [\FontAwesomeSymbol{f1fc}] - \definesymbol [paper-plane] [\FontAwesomeSymbol{f1d8}] - \definesymbol [paper-plane-o] [\FontAwesomeSymbol{f1d9}] - \definesymbol [paperclip] [\FontAwesomeSymbol{f0c6}] - \definesymbol [paragraph] [\FontAwesomeSymbol{f1dd}] - \definesymbol [paste] [\FontAwesomeSymbol{f0ea}] - \definesymbol [pause] [\FontAwesomeSymbol{f04c}] - \definesymbol [pause-circle] [\FontAwesomeSymbol{f28b}] - \definesymbol [pause-circle-o] [\FontAwesomeSymbol{f28c}] - \definesymbol [paw] [\FontAwesomeSymbol{f1b0}] - \definesymbol [paypal] [\FontAwesomeSymbol{f1ed}] - \definesymbol [pencil] [\FontAwesomeSymbol{f040}] - \definesymbol [pencil-square] [\FontAwesomeSymbol{f14b}] - \definesymbol [pencil-square-o] [\FontAwesomeSymbol{f044}] - \definesymbol [percent] [\FontAwesomeSymbol{f295}] - \definesymbol [phone] [\FontAwesomeSymbol{f095}] - \definesymbol [phone-square] [\FontAwesomeSymbol{f098}] - \definesymbol [photo] [\FontAwesomeSymbol{f03e}] - \definesymbol [picture-o] [\FontAwesomeSymbol{f03e}] - \definesymbol [pie-chart] [\FontAwesomeSymbol{f200}] - \definesymbol [pied-piper] [\FontAwesomeSymbol{f2ae}] - \definesymbol [pied-piper-alt] [\FontAwesomeSymbol{f1a8}] - \definesymbol [pied-piper-pp] [\FontAwesomeSymbol{f1a7}] - \definesymbol [pinterest] [\FontAwesomeSymbol{f0d2}] - \definesymbol [pinterest-p] [\FontAwesomeSymbol{f231}] - \definesymbol [pinterest-square] [\FontAwesomeSymbol{f0d3}] - \definesymbol [plane] [\FontAwesomeSymbol{f072}] - \definesymbol [play] [\FontAwesomeSymbol{f04b}] - \definesymbol [play-circle] [\FontAwesomeSymbol{f144}] - \definesymbol [play-circle-o] [\FontAwesomeSymbol{f01d}] - \definesymbol [plug] [\FontAwesomeSymbol{f1e6}] - \definesymbol [plus] [\FontAwesomeSymbol{f067}] - \definesymbol [plus-circle] [\FontAwesomeSymbol{f055}] - \definesymbol [plus-square] [\FontAwesomeSymbol{f0fe}] - \definesymbol [plus-square-o] [\FontAwesomeSymbol{f196}] - \definesymbol [power-off] [\FontAwesomeSymbol{f011}] - \definesymbol [print] [\FontAwesomeSymbol{f02f}] - \definesymbol [product-hunt] [\FontAwesomeSymbol{f288}] - \definesymbol [puzzle-piece] [\FontAwesomeSymbol{f12e}] - \definesymbol [qq] [\FontAwesomeSymbol{f1d6}] - \definesymbol [qrcode] [\FontAwesomeSymbol{f029}] - \definesymbol [question] [\FontAwesomeSymbol{f128}] - \definesymbol [question-circle] [\FontAwesomeSymbol{f059}] - \definesymbol [question-circle-o] [\FontAwesomeSymbol{f29c}] - \definesymbol [quote-left] [\FontAwesomeSymbol{f10d}] - \definesymbol [quote-right] [\FontAwesomeSymbol{f10e}] - \definesymbol [ra] [\FontAwesomeSymbol{f1d0}] - \definesymbol [random] [\FontAwesomeSymbol{f074}] - \definesymbol [rebel] [\FontAwesomeSymbol{f1d0}] - \definesymbol [recycle] [\FontAwesomeSymbol{f1b8}] - \definesymbol [reddit] [\FontAwesomeSymbol{f1a1}] - \definesymbol [reddit-alien] [\FontAwesomeSymbol{f281}] - \definesymbol [reddit-square] [\FontAwesomeSymbol{f1a2}] - \definesymbol [refresh] [\FontAwesomeSymbol{f021}] - \definesymbol [registered] [\FontAwesomeSymbol{f25d}] - \definesymbol [remove] [\FontAwesomeSymbol{f00d}] - \definesymbol [renren] [\FontAwesomeSymbol{f18b}] - \definesymbol [reorder] [\FontAwesomeSymbol{f0c9}] - \definesymbol [repeat] [\FontAwesomeSymbol{f01e}] - \definesymbol [reply] [\FontAwesomeSymbol{f112}] - \definesymbol [reply-all] [\FontAwesomeSymbol{f122}] - \definesymbol [resistance] [\FontAwesomeSymbol{f1d0}] - \definesymbol [retweet] [\FontAwesomeSymbol{f079}] - \definesymbol [rmb] [\FontAwesomeSymbol{f157}] - \definesymbol [road] [\FontAwesomeSymbol{f018}] - \definesymbol [rocket] [\FontAwesomeSymbol{f135}] - \definesymbol [rotate-left] [\FontAwesomeSymbol{f0e2}] - \definesymbol [rotate-right] [\FontAwesomeSymbol{f01e}] - \definesymbol [rouble] [\FontAwesomeSymbol{f158}] - \definesymbol [rss] [\FontAwesomeSymbol{f09e}] - \definesymbol [rss-square] [\FontAwesomeSymbol{f143}] - \definesymbol [rub] [\FontAwesomeSymbol{f158}] - \definesymbol [ruble] [\FontAwesomeSymbol{f158}] - \definesymbol [rupee] [\FontAwesomeSymbol{f156}] - \definesymbol [safari] [\FontAwesomeSymbol{f267}] - \definesymbol [save] [\FontAwesomeSymbol{f0c7}] - \definesymbol [scissors] [\FontAwesomeSymbol{f0c4}] - \definesymbol [scribd] [\FontAwesomeSymbol{f28a}] - \definesymbol [search] [\FontAwesomeSymbol{f002}] - \definesymbol [search-minus] [\FontAwesomeSymbol{f010}] - \definesymbol [search-plus] [\FontAwesomeSymbol{f00e}] - \definesymbol [sellsy] [\FontAwesomeSymbol{f213}] - \definesymbol [send] [\FontAwesomeSymbol{f1d8}] - \definesymbol [send-o] [\FontAwesomeSymbol{f1d9}] - \definesymbol [server] [\FontAwesomeSymbol{f233}] - \definesymbol [share] [\FontAwesomeSymbol{f064}] - \definesymbol [share-alt] [\FontAwesomeSymbol{f1e0}] - \definesymbol [share-alt-square] [\FontAwesomeSymbol{f1e1}] - \definesymbol [share-square] [\FontAwesomeSymbol{f14d}] - \definesymbol [share-square-o] [\FontAwesomeSymbol{f045}] - \definesymbol [shekel] [\FontAwesomeSymbol{f20b}] - \definesymbol [sheqel] [\FontAwesomeSymbol{f20b}] - \definesymbol [shield] [\FontAwesomeSymbol{f132}] - \definesymbol [ship] [\FontAwesomeSymbol{f21a}] - \definesymbol [shirtsinbulk] [\FontAwesomeSymbol{f214}] - \definesymbol [shopping-bag] [\FontAwesomeSymbol{f290}] - \definesymbol [shopping-basket] [\FontAwesomeSymbol{f291}] - \definesymbol [shopping-cart] [\FontAwesomeSymbol{f07a}] - \definesymbol [sign-in] [\FontAwesomeSymbol{f090}] - \definesymbol [sign-language] [\FontAwesomeSymbol{f2a7}] - \definesymbol [sign-out] [\FontAwesomeSymbol{f08b}] - \definesymbol [signal] [\FontAwesomeSymbol{f012}] - \definesymbol [signing] [\FontAwesomeSymbol{f2a7}] - \definesymbol [simplybuilt] [\FontAwesomeSymbol{f215}] - \definesymbol [sitemap] [\FontAwesomeSymbol{f0e8}] - \definesymbol [skyatlas] [\FontAwesomeSymbol{f216}] - \definesymbol [skype] [\FontAwesomeSymbol{f17e}] - \definesymbol [slack] [\FontAwesomeSymbol{f198}] - \definesymbol [sliders] [\FontAwesomeSymbol{f1de}] - \definesymbol [slideshare] [\FontAwesomeSymbol{f1e7}] - \definesymbol [smile-o] [\FontAwesomeSymbol{f118}] - \definesymbol [snapchat] [\FontAwesomeSymbol{f2ab}] - \definesymbol [snapchat-ghost] [\FontAwesomeSymbol{f2ac}] - \definesymbol [snapchat-square] [\FontAwesomeSymbol{f2ad}] - \definesymbol [soccer-ball-o] [\FontAwesomeSymbol{f1e3}] - \definesymbol [sort] [\FontAwesomeSymbol{f0dc}] - \definesymbol [sort-alpha-asc] [\FontAwesomeSymbol{f15d}] - \definesymbol [sort-alpha-desc] [\FontAwesomeSymbol{f15e}] - \definesymbol [sort-amount-asc] [\FontAwesomeSymbol{f160}] - \definesymbol [sort-amount-desc] [\FontAwesomeSymbol{f161}] - \definesymbol [sort-asc] [\FontAwesomeSymbol{f0de}] - \definesymbol [sort-desc] [\FontAwesomeSymbol{f0dd}] - \definesymbol [sort-down] [\FontAwesomeSymbol{f0dd}] - \definesymbol [sort-numeric-asc] [\FontAwesomeSymbol{f162}] - \definesymbol [sort-numeric-desc] [\FontAwesomeSymbol{f163}] - \definesymbol [sort-up] [\FontAwesomeSymbol{f0de}] - \definesymbol [soundcloud] [\FontAwesomeSymbol{f1be}] - \definesymbol [space-shuttle] [\FontAwesomeSymbol{f197}] - \definesymbol [spinner] [\FontAwesomeSymbol{f110}] - \definesymbol [spoon] [\FontAwesomeSymbol{f1b1}] - \definesymbol [spotify] [\FontAwesomeSymbol{f1bc}] - \definesymbol [square] [\FontAwesomeSymbol{f0c8}] - \definesymbol [square-o] [\FontAwesomeSymbol{f096}] - \definesymbol [stack-exchange] [\FontAwesomeSymbol{f18d}] - \definesymbol [stack-overflow] [\FontAwesomeSymbol{f16c}] - \definesymbol [star] [\FontAwesomeSymbol{f005}] - \definesymbol [star-half] [\FontAwesomeSymbol{f089}] - \definesymbol [star-half-empty] [\FontAwesomeSymbol{f123}] - \definesymbol [star-half-full] [\FontAwesomeSymbol{f123}] - \definesymbol [star-half-o] [\FontAwesomeSymbol{f123}] - \definesymbol [star-o] [\FontAwesomeSymbol{f006}] - \definesymbol [steam] [\FontAwesomeSymbol{f1b6}] - \definesymbol [steam-square] [\FontAwesomeSymbol{f1b7}] - \definesymbol [step-backward] [\FontAwesomeSymbol{f048}] - \definesymbol [step-forward] [\FontAwesomeSymbol{f051}] - \definesymbol [stethoscope] [\FontAwesomeSymbol{f0f1}] - \definesymbol [sticky-note] [\FontAwesomeSymbol{f249}] - \definesymbol [sticky-note-o] [\FontAwesomeSymbol{f24a}] - \definesymbol [stop] [\FontAwesomeSymbol{f04d}] - \definesymbol [stop-circle] [\FontAwesomeSymbol{f28d}] - \definesymbol [stop-circle-o] [\FontAwesomeSymbol{f28e}] - \definesymbol [street-view] [\FontAwesomeSymbol{f21d}] - \definesymbol [strikethrough] [\FontAwesomeSymbol{f0cc}] - \definesymbol [stumbleupon] [\FontAwesomeSymbol{f1a4}] - \definesymbol [stumbleupon-circle] [\FontAwesomeSymbol{f1a3}] - \definesymbol [subscript] [\FontAwesomeSymbol{f12c}] - \definesymbol [subway] [\FontAwesomeSymbol{f239}] - \definesymbol [suitcase] [\FontAwesomeSymbol{f0f2}] - \definesymbol [sun-o] [\FontAwesomeSymbol{f185}] - \definesymbol [superscript] [\FontAwesomeSymbol{f12b}] - \definesymbol [support] [\FontAwesomeSymbol{f1cd}] - \definesymbol [table] [\FontAwesomeSymbol{f0ce}] - \definesymbol [tablet] [\FontAwesomeSymbol{f10a}] - \definesymbol [tachometer] [\FontAwesomeSymbol{f0e4}] - \definesymbol [tag] [\FontAwesomeSymbol{f02b}] - \definesymbol [tags] [\FontAwesomeSymbol{f02c}] - \definesymbol [tasks] [\FontAwesomeSymbol{f0ae}] - \definesymbol [taxi] [\FontAwesomeSymbol{f1ba}] - \definesymbol [television] [\FontAwesomeSymbol{f26c}] - \definesymbol [tencent-weibo] [\FontAwesomeSymbol{f1d5}] - \definesymbol [terminal] [\FontAwesomeSymbol{f120}] - \definesymbol [text-height] [\FontAwesomeSymbol{f034}] - \definesymbol [text-width] [\FontAwesomeSymbol{f035}] - \definesymbol [th] [\FontAwesomeSymbol{f00a}] - \definesymbol [th-large] [\FontAwesomeSymbol{f009}] - \definesymbol [th-list] [\FontAwesomeSymbol{f00b}] - \definesymbol [themeisle] [\FontAwesomeSymbol{f2b2}] - \definesymbol [thumb-tack] [\FontAwesomeSymbol{f08d}] - \definesymbol [thumbs-down] [\FontAwesomeSymbol{f165}] - \definesymbol [thumbs-o-down] [\FontAwesomeSymbol{f088}] - \definesymbol [thumbs-o-up] [\FontAwesomeSymbol{f087}] - \definesymbol [thumbs-up] [\FontAwesomeSymbol{f164}] - \definesymbol [ticket] [\FontAwesomeSymbol{f145}] - \definesymbol [times] [\FontAwesomeSymbol{f00d}] - \definesymbol [times-circle] [\FontAwesomeSymbol{f057}] - \definesymbol [times-circle-o] [\FontAwesomeSymbol{f05c}] - \definesymbol [tint] [\FontAwesomeSymbol{f043}] - \definesymbol [toggle-down] [\FontAwesomeSymbol{f150}] - \definesymbol [toggle-left] [\FontAwesomeSymbol{f191}] - \definesymbol [toggle-off] [\FontAwesomeSymbol{f204}] - \definesymbol [toggle-on] [\FontAwesomeSymbol{f205}] - \definesymbol [toggle-right] [\FontAwesomeSymbol{f152}] - \definesymbol [toggle-up] [\FontAwesomeSymbol{f151}] - \definesymbol [trademark] [\FontAwesomeSymbol{f25c}] - \definesymbol [train] [\FontAwesomeSymbol{f238}] - \definesymbol [transgender] [\FontAwesomeSymbol{f224}] - \definesymbol [transgender-alt] [\FontAwesomeSymbol{f225}] - \definesymbol [trash] [\FontAwesomeSymbol{f1f8}] - \definesymbol [trash-o] [\FontAwesomeSymbol{f014}] - \definesymbol [tree] [\FontAwesomeSymbol{f1bb}] - \definesymbol [trello] [\FontAwesomeSymbol{f181}] - \definesymbol [tripadvisor] [\FontAwesomeSymbol{f262}] - \definesymbol [trophy] [\FontAwesomeSymbol{f091}] - \definesymbol [truck] [\FontAwesomeSymbol{f0d1}] - \definesymbol [try] [\FontAwesomeSymbol{f195}] - \definesymbol [tty] [\FontAwesomeSymbol{f1e4}] - \definesymbol [tumblr] [\FontAwesomeSymbol{f173}] - \definesymbol [tumblr-square] [\FontAwesomeSymbol{f174}] - \definesymbol [turkish-lira] [\FontAwesomeSymbol{f195}] - \definesymbol [tv] [\FontAwesomeSymbol{f26c}] - \definesymbol [twitch] [\FontAwesomeSymbol{f1e8}] - \definesymbol [twitter] [\FontAwesomeSymbol{f099}] - \definesymbol [twitter-square] [\FontAwesomeSymbol{f081}] - \definesymbol [umbrella] [\FontAwesomeSymbol{f0e9}] - \definesymbol [underline] [\FontAwesomeSymbol{f0cd}] - \definesymbol [undo] [\FontAwesomeSymbol{f0e2}] - \definesymbol [universal-access] [\FontAwesomeSymbol{f29a}] - \definesymbol [university] [\FontAwesomeSymbol{f19c}] - \definesymbol [unlink] [\FontAwesomeSymbol{f127}] - \definesymbol [unlock] [\FontAwesomeSymbol{f09c}] - \definesymbol [unlock-alt] [\FontAwesomeSymbol{f13e}] - \definesymbol [unsorted] [\FontAwesomeSymbol{f0dc}] - \definesymbol [upload] [\FontAwesomeSymbol{f093}] - \definesymbol [usb] [\FontAwesomeSymbol{f287}] - \definesymbol [usd] [\FontAwesomeSymbol{f155}] - \definesymbol [user] [\FontAwesomeSymbol{f007}] - \definesymbol [user-md] [\FontAwesomeSymbol{f0f0}] - \definesymbol [user-plus] [\FontAwesomeSymbol{f234}] - \definesymbol [user-secret] [\FontAwesomeSymbol{f21b}] - \definesymbol [user-times] [\FontAwesomeSymbol{f235}] - \definesymbol [users] [\FontAwesomeSymbol{f0c0}] - \definesymbol [venus] [\FontAwesomeSymbol{f221}] - \definesymbol [venus-double] [\FontAwesomeSymbol{f226}] - \definesymbol [venus-mars] [\FontAwesomeSymbol{f228}] - \definesymbol [viacoin] [\FontAwesomeSymbol{f237}] - \definesymbol [viadeo] [\FontAwesomeSymbol{f2a9}] - \definesymbol [viadeo-square] [\FontAwesomeSymbol{f2aa}] - \definesymbol [video-camera] [\FontAwesomeSymbol{f03d}] - \definesymbol [vimeo] [\FontAwesomeSymbol{f27d}] - \definesymbol [vimeo-square] [\FontAwesomeSymbol{f194}] - \definesymbol [vine] [\FontAwesomeSymbol{f1ca}] - \definesymbol [vk] [\FontAwesomeSymbol{f189}] - \definesymbol [volume-control-phone] [\FontAwesomeSymbol{f2a0}] - \definesymbol [volume-down] [\FontAwesomeSymbol{f027}] - \definesymbol [volume-off] [\FontAwesomeSymbol{f026}] - \definesymbol [volume-up] [\FontAwesomeSymbol{f028}] - \definesymbol [warning] [\FontAwesomeSymbol{f071}] - \definesymbol [wechat] [\FontAwesomeSymbol{f1d7}] - \definesymbol [weibo] [\FontAwesomeSymbol{f18a}] - \definesymbol [weixin] [\FontAwesomeSymbol{f1d7}] - \definesymbol [whatsapp] [\FontAwesomeSymbol{f232}] - \definesymbol [wheelchair] [\FontAwesomeSymbol{f193}] - \definesymbol [wheelchair-alt] [\FontAwesomeSymbol{f29b}] - \definesymbol [wifi] [\FontAwesomeSymbol{f1eb}] - \definesymbol [wikipedia-w] [\FontAwesomeSymbol{f266}] - \definesymbol [windows] [\FontAwesomeSymbol{f17a}] - \definesymbol [won] [\FontAwesomeSymbol{f159}] - \definesymbol [wordpress] [\FontAwesomeSymbol{f19a}] - \definesymbol [wpbeginner] [\FontAwesomeSymbol{f297}] - \definesymbol [wpforms] [\FontAwesomeSymbol{f298}] - \definesymbol [wrench] [\FontAwesomeSymbol{f0ad}] - \definesymbol [xing] [\FontAwesomeSymbol{f168}] - \definesymbol [xing-square] [\FontAwesomeSymbol{f169}] - \definesymbol [y-combinator] [\FontAwesomeSymbol{f23b}] - \definesymbol [y-combinator-square] [\FontAwesomeSymbol{f1d4}] - \definesymbol [yahoo] [\FontAwesomeSymbol{f19e}] - \definesymbol [yc] [\FontAwesomeSymbol{f23b}] - \definesymbol [yc-square] [\FontAwesomeSymbol{f1d4}] - \definesymbol [yelp] [\FontAwesomeSymbol{f1e9}] - \definesymbol [yen] [\FontAwesomeSymbol{f157}] - \definesymbol [yoast] [\FontAwesomeSymbol{f2b1}] - \definesymbol [youtube] [\FontAwesomeSymbol{f167}] - \definesymbol [youtube-play] [\FontAwesomeSymbol{f16a}] - \definesymbol [youtube-square] [\FontAwesomeSymbol{f166}] + \definesymbol [wheelchair] [\FontAwesomeSymbol{_378}] + +% \definesymbol [500px] [\FontAwesomeSymbol{f26e}] +% \definesymbol [adjust] [\FontAwesomeSymbol{f042}] +% \definesymbol [adn] [\FontAwesomeSymbol{f170}] +% \definesymbol [align-center] [\FontAwesomeSymbol{f037}] +% \definesymbol [align-justify] [\FontAwesomeSymbol{f039}] +% \definesymbol [align-left] [\FontAwesomeSymbol{f036}] +% \definesymbol [align-right] [\FontAwesomeSymbol{f038}] +% \definesymbol [amazon] [\FontAwesomeSymbol{f270}] +% \definesymbol [ambulance] [\FontAwesomeSymbol{f0f9}] +% \definesymbol [american-sign-language-interpreting] [\FontAwesomeSymbol{f2a3}] +% \definesymbol [anchor] [\FontAwesomeSymbol{f13d}] +% \definesymbol [android] [\FontAwesomeSymbol{f17b}] +% \definesymbol [angellist] [\FontAwesomeSymbol{f209}] +% \definesymbol [angle-double-down] [\FontAwesomeSymbol{f103}] +% \definesymbol [angle-double-left] [\FontAwesomeSymbol{f100}] +% \definesymbol [angle-double-right] [\FontAwesomeSymbol{f101}] +% \definesymbol [angle-double-up] [\FontAwesomeSymbol{f102}] +% \definesymbol [angle-down] [\FontAwesomeSymbol{f107}] +% \definesymbol [angle-left] [\FontAwesomeSymbol{f104}] +% \definesymbol [angle-right] [\FontAwesomeSymbol{f105}] +% \definesymbol [angle-up] [\FontAwesomeSymbol{f106}] +% \definesymbol [apple] [\FontAwesomeSymbol{f179}] +% \definesymbol [archive] [\FontAwesomeSymbol{f187}] +% \definesymbol [area-chart] [\FontAwesomeSymbol{f1fe}] +% \definesymbol [arrow-circle-down] [\FontAwesomeSymbol{f0ab}] +% \definesymbol [arrow-circle-left] [\FontAwesomeSymbol{f0a8}] +% \definesymbol [arrow-circle-o-down] [\FontAwesomeSymbol{f01a}] +% \definesymbol [arrow-circle-o-left] [\FontAwesomeSymbol{f190}] +% \definesymbol [arrow-circle-o-right] [\FontAwesomeSymbol{f18e}] +% \definesymbol [arrow-circle-o-up] [\FontAwesomeSymbol{f01b}] +% \definesymbol [arrow-circle-right] [\FontAwesomeSymbol{f0a9}] +% \definesymbol [arrow-circle-up] [\FontAwesomeSymbol{f0aa}] +% \definesymbol [arrow-down] [\FontAwesomeSymbol{f063}] +% \definesymbol [arrow-left] [\FontAwesomeSymbol{f060}] +% \definesymbol [arrow-right] [\FontAwesomeSymbol{f061}] +% \definesymbol [arrow-up] [\FontAwesomeSymbol{f062}] +% \definesymbol [arrows] [\FontAwesomeSymbol{f047}] +% \definesymbol [arrows-alt] [\FontAwesomeSymbol{f0b2}] +% \definesymbol [arrows-h] [\FontAwesomeSymbol{f07e}] +% \definesymbol [arrows-v] [\FontAwesomeSymbol{f07d}] +% \definesymbol [asl-interpreting] [\FontAwesomeSymbol{f2a3}] +% \definesymbol [assistive-listening-systems] [\FontAwesomeSymbol{f2a2}] +% \definesymbol [asterisk] [\FontAwesomeSymbol{f069}] +% \definesymbol [at] [\FontAwesomeSymbol{f1fa}] +% \definesymbol [audio-description] [\FontAwesomeSymbol{f29e}] +% \definesymbol [automobile] [\FontAwesomeSymbol{f1b9}] +% \definesymbol [backward] [\FontAwesomeSymbol{f04a}] +% \definesymbol [balance-scale] [\FontAwesomeSymbol{f24e}] +% \definesymbol [ban] [\FontAwesomeSymbol{f05e}] +% \definesymbol [bank] [\FontAwesomeSymbol{f19c}] +% \definesymbol [bar-chart] [\FontAwesomeSymbol{f080}] +% \definesymbol [bar-chart-o] [\FontAwesomeSymbol{f080}] +% \definesymbol [barcode] [\FontAwesomeSymbol{f02a}] +% \definesymbol [bars] [\FontAwesomeSymbol{f0c9}] +% \definesymbol [battery-0] [\FontAwesomeSymbol{f244}] +% \definesymbol [battery-1] [\FontAwesomeSymbol{f243}] +% \definesymbol [battery-2] [\FontAwesomeSymbol{f242}] +% \definesymbol [battery-3] [\FontAwesomeSymbol{f241}] +% \definesymbol [battery-4] [\FontAwesomeSymbol{f240}] +% \definesymbol [battery-empty] [\FontAwesomeSymbol{f244}] +% \definesymbol [battery-full] [\FontAwesomeSymbol{f240}] +% \definesymbol [battery-half] [\FontAwesomeSymbol{f242}] +% \definesymbol [battery-quarter] [\FontAwesomeSymbol{f243}] +% \definesymbol [battery-three-quarters] [\FontAwesomeSymbol{f241}] +% \definesymbol [bed] [\FontAwesomeSymbol{f236}] +% \definesymbol [beer] [\FontAwesomeSymbol{f0fc}] +% \definesymbol [behance] [\FontAwesomeSymbol{f1b4}] +% \definesymbol [behance-square] [\FontAwesomeSymbol{f1b5}] +% \definesymbol [bell] [\FontAwesomeSymbol{f0f3}] +% \definesymbol [bell-o] [\FontAwesomeSymbol{f0a2}] +% \definesymbol [bell-slash] [\FontAwesomeSymbol{f1f6}] +% \definesymbol [bell-slash-o] [\FontAwesomeSymbol{f1f7}] +% \definesymbol [bicycle] [\FontAwesomeSymbol{f206}] +% \definesymbol [binoculars] [\FontAwesomeSymbol{f1e5}] +% \definesymbol [birthday-cake] [\FontAwesomeSymbol{f1fd}] +% \definesymbol [bitbucket] [\FontAwesomeSymbol{f171}] +% \definesymbol [bitbucket-square] [\FontAwesomeSymbol{f172}] +% \definesymbol [bitcoin] [\FontAwesomeSymbol{f15a}] +% \definesymbol [black-tie] [\FontAwesomeSymbol{f27e}] +% \definesymbol [blind] [\FontAwesomeSymbol{f29d}] +% \definesymbol [bluetooth] [\FontAwesomeSymbol{f293}] +% \definesymbol [bluetooth-b] [\FontAwesomeSymbol{f294}] +% \definesymbol [bold] [\FontAwesomeSymbol{f032}] +% \definesymbol [bolt] [\FontAwesomeSymbol{f0e7}] +% \definesymbol [bomb] [\FontAwesomeSymbol{f1e2}] +% \definesymbol [book] [\FontAwesomeSymbol{f02d}] +% \definesymbol [bookmark] [\FontAwesomeSymbol{f02e}] +% \definesymbol [bookmark-o] [\FontAwesomeSymbol{f097}] +% \definesymbol [braille] [\FontAwesomeSymbol{f2a1}] +% \definesymbol [briefcase] [\FontAwesomeSymbol{f0b1}] +% \definesymbol [btc] [\FontAwesomeSymbol{f15a}] +% \definesymbol [bug] [\FontAwesomeSymbol{f188}] +% \definesymbol [building] [\FontAwesomeSymbol{f1ad}] +% \definesymbol [building-o] [\FontAwesomeSymbol{f0f7}] +% \definesymbol [bullhorn] [\FontAwesomeSymbol{f0a1}] +% \definesymbol [bullseye] [\FontAwesomeSymbol{f140}] +% \definesymbol [bus] [\FontAwesomeSymbol{f207}] +% \definesymbol [buysellads] [\FontAwesomeSymbol{f20d}] +% \definesymbol [cab] [\FontAwesomeSymbol{f1ba}] +% \definesymbol [calculator] [\FontAwesomeSymbol{f1ec}] +% \definesymbol [calendar] [\FontAwesomeSymbol{f073}] +% \definesymbol [calendar-check-o] [\FontAwesomeSymbol{f274}] +% \definesymbol [calendar-minus-o] [\FontAwesomeSymbol{f272}] +% \definesymbol [calendar-o] [\FontAwesomeSymbol{f133}] +% \definesymbol [calendar-plus-o] [\FontAwesomeSymbol{f271}] +% \definesymbol [calendar-times-o] [\FontAwesomeSymbol{f273}] +% \definesymbol [camera] [\FontAwesomeSymbol{f030}] +% \definesymbol [camera-retro] [\FontAwesomeSymbol{f083}] +% \definesymbol [car] [\FontAwesomeSymbol{f1b9}] +% \definesymbol [caret-down] [\FontAwesomeSymbol{f0d7}] +% \definesymbol [caret-left] [\FontAwesomeSymbol{f0d9}] +% \definesymbol [caret-right] [\FontAwesomeSymbol{f0da}] +% \definesymbol [caret-square-o-down] [\FontAwesomeSymbol{f150}] +% \definesymbol [caret-square-o-left] [\FontAwesomeSymbol{f191}] +% \definesymbol [caret-square-o-right] [\FontAwesomeSymbol{f152}] +% \definesymbol [caret-square-o-up] [\FontAwesomeSymbol{f151}] +% \definesymbol [caret-up] [\FontAwesomeSymbol{f0d8}] +% \definesymbol [cart-arrow-down] [\FontAwesomeSymbol{f218}] +% \definesymbol [cart-plus] [\FontAwesomeSymbol{f217}] +% \definesymbol [cc] [\FontAwesomeSymbol{f20a}] +% \definesymbol [cc-amex] [\FontAwesomeSymbol{f1f3}] +% \definesymbol [cc-diners-club] [\FontAwesomeSymbol{f24c}] +% \definesymbol [cc-discover] [\FontAwesomeSymbol{f1f2}] +% \definesymbol [cc-jcb] [\FontAwesomeSymbol{f24b}] +% \definesymbol [cc-mastercard] [\FontAwesomeSymbol{f1f1}] +% \definesymbol [cc-paypal] [\FontAwesomeSymbol{f1f4}] +% \definesymbol [cc-stripe] [\FontAwesomeSymbol{f1f5}] +% \definesymbol [cc-visa] [\FontAwesomeSymbol{f1f0}] +% \definesymbol [certificate] [\FontAwesomeSymbol{f0a3}] +% \definesymbol [chain] [\FontAwesomeSymbol{f0c1}] +% \definesymbol [chain-broken] [\FontAwesomeSymbol{f127}] +% \definesymbol [check] [\FontAwesomeSymbol{f00c}] +% \definesymbol [check-circle] [\FontAwesomeSymbol{f058}] +% \definesymbol [check-circle-o] [\FontAwesomeSymbol{f05d}] +% \definesymbol [check-square] [\FontAwesomeSymbol{f14a}] +% \definesymbol [check-square-o] [\FontAwesomeSymbol{f046}] +% \definesymbol [chevron-circle-down] [\FontAwesomeSymbol{f13a}] +% \definesymbol [chevron-circle-left] [\FontAwesomeSymbol{f137}] +% \definesymbol [chevron-circle-right] [\FontAwesomeSymbol{f138}] +% \definesymbol [chevron-circle-up] [\FontAwesomeSymbol{f139}] +% \definesymbol [chevron-down] [\FontAwesomeSymbol{f078}] +% \definesymbol [chevron-left] [\FontAwesomeSymbol{f053}] +% \definesymbol [chevron-right] [\FontAwesomeSymbol{f054}] +% \definesymbol [chevron-up] [\FontAwesomeSymbol{f077}] +% \definesymbol [child] [\FontAwesomeSymbol{f1ae}] +% \definesymbol [chrome] [\FontAwesomeSymbol{f268}] +% \definesymbol [circle] [\FontAwesomeSymbol{f111}] +% \definesymbol [circle-o] [\FontAwesomeSymbol{f10c}] +% \definesymbol [circle-o-notch] [\FontAwesomeSymbol{f1ce}] +% \definesymbol [circle-thin] [\FontAwesomeSymbol{f1db}] +% \definesymbol [clipboard] [\FontAwesomeSymbol{f0ea}] +% \definesymbol [clock-o] [\FontAwesomeSymbol{f017}] +% \definesymbol [clone] [\FontAwesomeSymbol{f24d}] +% \definesymbol [close] [\FontAwesomeSymbol{f00d}] +% \definesymbol [cloud] [\FontAwesomeSymbol{f0c2}] +% \definesymbol [cloud-download] [\FontAwesomeSymbol{f0ed}] +% \definesymbol [cloud-upload] [\FontAwesomeSymbol{f0ee}] +% \definesymbol [cny] [\FontAwesomeSymbol{f157}] +% \definesymbol [code] [\FontAwesomeSymbol{f121}] +% \definesymbol [code-fork] [\FontAwesomeSymbol{f126}] +% \definesymbol [codepen] [\FontAwesomeSymbol{f1cb}] +% \definesymbol [codiepie] [\FontAwesomeSymbol{f284}] +% \definesymbol [coffee] [\FontAwesomeSymbol{f0f4}] +% \definesymbol [cog] [\FontAwesomeSymbol{f013}] +% \definesymbol [cogs] [\FontAwesomeSymbol{f085}] +% \definesymbol [columns] [\FontAwesomeSymbol{f0db}] +% \definesymbol [comment] [\FontAwesomeSymbol{f075}] +% \definesymbol [comment-o] [\FontAwesomeSymbol{f0e5}] +% \definesymbol [commenting] [\FontAwesomeSymbol{f27a}] +% \definesymbol [commenting-o] [\FontAwesomeSymbol{f27b}] +% \definesymbol [comments] [\FontAwesomeSymbol{f086}] +% \definesymbol [comments-o] [\FontAwesomeSymbol{f0e6}] +% \definesymbol [compass] [\FontAwesomeSymbol{f14e}] +% \definesymbol [compress] [\FontAwesomeSymbol{f066}] +% \definesymbol [connectdevelop] [\FontAwesomeSymbol{f20e}] +% \definesymbol [contao] [\FontAwesomeSymbol{f26d}] +% \definesymbol [copy] [\FontAwesomeSymbol{f0c5}] +% \definesymbol [copyright] [\FontAwesomeSymbol{f1f9}] +% \definesymbol [creative-commons] [\FontAwesomeSymbol{f25e}] +% \definesymbol [credit-card] [\FontAwesomeSymbol{f09d}] +% \definesymbol [credit-card-alt] [\FontAwesomeSymbol{f283}] +% \definesymbol [crop] [\FontAwesomeSymbol{f125}] +% \definesymbol [crosshairs] [\FontAwesomeSymbol{f05b}] +% \definesymbol [css3] [\FontAwesomeSymbol{f13c}] +% \definesymbol [cube] [\FontAwesomeSymbol{f1b2}] +% \definesymbol [cubes] [\FontAwesomeSymbol{f1b3}] +% \definesymbol [cut] [\FontAwesomeSymbol{f0c4}] +% \definesymbol [cutlery] [\FontAwesomeSymbol{f0f5}] +% \definesymbol [dashboard] [\FontAwesomeSymbol{f0e4}] +% \definesymbol [dashcube] [\FontAwesomeSymbol{f210}] +% \definesymbol [database] [\FontAwesomeSymbol{f1c0}] +% \definesymbol [deaf] [\FontAwesomeSymbol{f2a4}] +% \definesymbol [deafness] [\FontAwesomeSymbol{f2a4}] +% \definesymbol [dedent] [\FontAwesomeSymbol{f03b}] +% \definesymbol [delicious] [\FontAwesomeSymbol{f1a5}] +% \definesymbol [desktop] [\FontAwesomeSymbol{f108}] +% \definesymbol [deviantart] [\FontAwesomeSymbol{f1bd}] +% \definesymbol [diamond] [\FontAwesomeSymbol{f219}] +% \definesymbol [digg] [\FontAwesomeSymbol{f1a6}] +% \definesymbol [dollar] [\FontAwesomeSymbol{f155}] +% \definesymbol [dot-circle-o] [\FontAwesomeSymbol{f192}] +% \definesymbol [download] [\FontAwesomeSymbol{f019}] +% \definesymbol [dribbble] [\FontAwesomeSymbol{f17d}] +% \definesymbol [dropbox] [\FontAwesomeSymbol{f16b}] +% \definesymbol [drupal] [\FontAwesomeSymbol{f1a9}] +% \definesymbol [edge] [\FontAwesomeSymbol{f282}] +% \definesymbol [edit] [\FontAwesomeSymbol{f044}] +% \definesymbol [eject] [\FontAwesomeSymbol{f052}] +% \definesymbol [ellipsis-h] [\FontAwesomeSymbol{f141}] +% \definesymbol [ellipsis-v] [\FontAwesomeSymbol{f142}] +% \definesymbol [empire] [\FontAwesomeSymbol{f1d1}] +% \definesymbol [envelope] [\FontAwesomeSymbol{f0e0}] +% \definesymbol [envelope-o] [\FontAwesomeSymbol{f003}] +% \definesymbol [envelope-square] [\FontAwesomeSymbol{f199}] +% \definesymbol [envira] [\FontAwesomeSymbol{f299}] +% \definesymbol [eraser] [\FontAwesomeSymbol{f12d}] +% \definesymbol [eur] [\FontAwesomeSymbol{f153}] +% \definesymbol [euro] [\FontAwesomeSymbol{f153}] +% \definesymbol [exchange] [\FontAwesomeSymbol{f0ec}] +% \definesymbol [exclamation] [\FontAwesomeSymbol{f12a}] +% \definesymbol [exclamation-circle] [\FontAwesomeSymbol{f06a}] +% \definesymbol [exclamation-triangle] [\FontAwesomeSymbol{f071}] +% \definesymbol [expand] [\FontAwesomeSymbol{f065}] +% \definesymbol [expeditedssl] [\FontAwesomeSymbol{f23e}] +% \definesymbol [external-link] [\FontAwesomeSymbol{f08e}] +% \definesymbol [external-link-square] [\FontAwesomeSymbol{f14c}] +% \definesymbol [eye] [\FontAwesomeSymbol{f06e}] +% \definesymbol [eye-slash] [\FontAwesomeSymbol{f070}] +% \definesymbol [eyedropper] [\FontAwesomeSymbol{f1fb}] +% \definesymbol [fa] [\FontAwesomeSymbol{f2b4}] +% \definesymbol [facebook] [\FontAwesomeSymbol{f09a}] +% \definesymbol [facebook-f] [\FontAwesomeSymbol{f09a}] +% \definesymbol [facebook-official] [\FontAwesomeSymbol{f230}] +% \definesymbol [facebook-square] [\FontAwesomeSymbol{f082}] +% \definesymbol [fast-backward] [\FontAwesomeSymbol{f049}] +% \definesymbol [fast-forward] [\FontAwesomeSymbol{f050}] +% \definesymbol [fax] [\FontAwesomeSymbol{f1ac}] +% \definesymbol [feed] [\FontAwesomeSymbol{f09e}] +% \definesymbol [female] [\FontAwesomeSymbol{f182}] +% \definesymbol [fighter-jet] [\FontAwesomeSymbol{f0fb}] +% \definesymbol [file] [\FontAwesomeSymbol{f15b}] +% \definesymbol [file-archive-o] [\FontAwesomeSymbol{f1c6}] +% \definesymbol [file-audio-o] [\FontAwesomeSymbol{f1c7}] +% \definesymbol [file-code-o] [\FontAwesomeSymbol{f1c9}] +% \definesymbol [file-excel-o] [\FontAwesomeSymbol{f1c3}] +% \definesymbol [file-image-o] [\FontAwesomeSymbol{f1c5}] +% \definesymbol [file-movie-o] [\FontAwesomeSymbol{f1c8}] +% \definesymbol [file-o] [\FontAwesomeSymbol{f016}] +% \definesymbol [file-pdf-o] [\FontAwesomeSymbol{f1c1}] +% \definesymbol [file-photo-o] [\FontAwesomeSymbol{f1c5}] +% \definesymbol [file-picture-o] [\FontAwesomeSymbol{f1c5}] +% \definesymbol [file-powerpoint-o] [\FontAwesomeSymbol{f1c4}] +% \definesymbol [file-sound-o] [\FontAwesomeSymbol{f1c7}] +% \definesymbol [file-text] [\FontAwesomeSymbol{f15c}] +% \definesymbol [file-text-o] [\FontAwesomeSymbol{f0f6}] +% \definesymbol [file-video-o] [\FontAwesomeSymbol{f1c8}] +% \definesymbol [file-word-o] [\FontAwesomeSymbol{f1c2}] +% \definesymbol [file-zip-o] [\FontAwesomeSymbol{f1c6}] +% \definesymbol [files-o] [\FontAwesomeSymbol{f0c5}] +% \definesymbol [film] [\FontAwesomeSymbol{f008}] +% \definesymbol [filter] [\FontAwesomeSymbol{f0b0}] +% \definesymbol [fire] [\FontAwesomeSymbol{f06d}] +% \definesymbol [fire-extinguisher] [\FontAwesomeSymbol{f134}] +% \definesymbol [firefox] [\FontAwesomeSymbol{f269}] +% \definesymbol [first-order] [\FontAwesomeSymbol{f2b0}] +% \definesymbol [flag] [\FontAwesomeSymbol{f024}] +% \definesymbol [flag-checkered] [\FontAwesomeSymbol{f11e}] +% \definesymbol [flag-o] [\FontAwesomeSymbol{f11d}] +% \definesymbol [flash] [\FontAwesomeSymbol{f0e7}] +% \definesymbol [flask] [\FontAwesomeSymbol{f0c3}] +% \definesymbol [flickr] [\FontAwesomeSymbol{f16e}] +% \definesymbol [floppy-o] [\FontAwesomeSymbol{f0c7}] +% \definesymbol [folder] [\FontAwesomeSymbol{f07b}] +% \definesymbol [folder-o] [\FontAwesomeSymbol{f114}] +% \definesymbol [folder-open] [\FontAwesomeSymbol{f07c}] +% \definesymbol [folder-open-o] [\FontAwesomeSymbol{f115}] +% \definesymbol [font] [\FontAwesomeSymbol{f031}] +% \definesymbol [font-awesome] [\FontAwesomeSymbol{f2b4}] +% \definesymbol [fonticons] [\FontAwesomeSymbol{f280}] +% \definesymbol [fort-awesome] [\FontAwesomeSymbol{f286}] +% \definesymbol [forumbee] [\FontAwesomeSymbol{f211}] +% \definesymbol [forward] [\FontAwesomeSymbol{f04e}] +% \definesymbol [foursquare] [\FontAwesomeSymbol{f180}] +% \definesymbol [frown-o] [\FontAwesomeSymbol{f119}] +% \definesymbol [futbol-o] [\FontAwesomeSymbol{f1e3}] +% \definesymbol [gamepad] [\FontAwesomeSymbol{f11b}] +% \definesymbol [gavel] [\FontAwesomeSymbol{f0e3}] +% \definesymbol [gbp] [\FontAwesomeSymbol{f154}] +% \definesymbol [ge] [\FontAwesomeSymbol{f1d1}] +% \definesymbol [gear] [\FontAwesomeSymbol{f013}] +% \definesymbol [gears] [\FontAwesomeSymbol{f085}] +% \definesymbol [genderless] [\FontAwesomeSymbol{f22d}] +% \definesymbol [get-pocket] [\FontAwesomeSymbol{f265}] +% \definesymbol [gg] [\FontAwesomeSymbol{f260}] +% \definesymbol [gg-circle] [\FontAwesomeSymbol{f261}] +% \definesymbol [gift] [\FontAwesomeSymbol{f06b}] +% \definesymbol [git] [\FontAwesomeSymbol{f1d3}] +% \definesymbol [git-square] [\FontAwesomeSymbol{f1d2}] +% \definesymbol [github] [\FontAwesomeSymbol{f09b}] +% \definesymbol [github-alt] [\FontAwesomeSymbol{f113}] +% \definesymbol [github-square] [\FontAwesomeSymbol{f092}] +% \definesymbol [gitlab] [\FontAwesomeSymbol{f296}] +% \definesymbol [gittip] [\FontAwesomeSymbol{f184}] +% \definesymbol [glass] [\FontAwesomeSymbol{f000}] +% \definesymbol [glide] [\FontAwesomeSymbol{f2a5}] +% \definesymbol [glide-g] [\FontAwesomeSymbol{f2a6}] +% \definesymbol [globe] [\FontAwesomeSymbol{f0ac}] +% \definesymbol [google] [\FontAwesomeSymbol{f1a0}] +% \definesymbol [google-plus] [\FontAwesomeSymbol{f0d5}] +% \definesymbol [google-plus-circle] [\FontAwesomeSymbol{f2b3}] +% \definesymbol [google-plus-official] [\FontAwesomeSymbol{f2b3}] +% \definesymbol [google-plus-square] [\FontAwesomeSymbol{f0d4}] +% \definesymbol [google-wallet] [\FontAwesomeSymbol{f1ee}] +% \definesymbol [graduation-cap] [\FontAwesomeSymbol{f19d}] +% \definesymbol [gratipay] [\FontAwesomeSymbol{f184}] +% \definesymbol [group] [\FontAwesomeSymbol{f0c0}] +% \definesymbol [h-square] [\FontAwesomeSymbol{f0fd}] +% \definesymbol [hacker-news] [\FontAwesomeSymbol{f1d4}] +% \definesymbol [hand-grab-o] [\FontAwesomeSymbol{f255}] +% \definesymbol [hand-lizard-o] [\FontAwesomeSymbol{f258}] +% \definesymbol [hand-o-down] [\FontAwesomeSymbol{f0a7}] +% \definesymbol [hand-o-left] [\FontAwesomeSymbol{f0a5}] +% \definesymbol [hand-o-right] [\FontAwesomeSymbol{f0a4}] +% \definesymbol [hand-o-up] [\FontAwesomeSymbol{f0a6}] +% \definesymbol [hand-paper-o] [\FontAwesomeSymbol{f256}] +% \definesymbol [hand-peace-o] [\FontAwesomeSymbol{f25b}] +% \definesymbol [hand-pointer-o] [\FontAwesomeSymbol{f25a}] +% \definesymbol [hand-rock-o] [\FontAwesomeSymbol{f255}] +% \definesymbol [hand-scissors-o] [\FontAwesomeSymbol{f257}] +% \definesymbol [hand-spock-o] [\FontAwesomeSymbol{f259}] +% \definesymbol [hand-stop-o] [\FontAwesomeSymbol{f256}] +% \definesymbol [hard-of-hearing] [\FontAwesomeSymbol{f2a4}] +% \definesymbol [hashtag] [\FontAwesomeSymbol{f292}] +% \definesymbol [hdd-o] [\FontAwesomeSymbol{f0a0}] +% \definesymbol [header] [\FontAwesomeSymbol{f1dc}] +% \definesymbol [headphones] [\FontAwesomeSymbol{f025}] +% \definesymbol [heart] [\FontAwesomeSymbol{f004}] +% \definesymbol [heart-o] [\FontAwesomeSymbol{f08a}] +% \definesymbol [heartbeat] [\FontAwesomeSymbol{f21e}] +% \definesymbol [history] [\FontAwesomeSymbol{f1da}] +% \definesymbol [home] [\FontAwesomeSymbol{f015}] +% \definesymbol [hospital-o] [\FontAwesomeSymbol{f0f8}] +% \definesymbol [hotel] [\FontAwesomeSymbol{f236}] +% \definesymbol [hourglass] [\FontAwesomeSymbol{f254}] +% \definesymbol [hourglass-1] [\FontAwesomeSymbol{f251}] +% \definesymbol [hourglass-2] [\FontAwesomeSymbol{f252}] +% \definesymbol [hourglass-3] [\FontAwesomeSymbol{f253}] +% \definesymbol [hourglass-end] [\FontAwesomeSymbol{f253}] +% \definesymbol [hourglass-half] [\FontAwesomeSymbol{f252}] +% \definesymbol [hourglass-o] [\FontAwesomeSymbol{f250}] +% \definesymbol [hourglass-start] [\FontAwesomeSymbol{f251}] +% \definesymbol [houzz] [\FontAwesomeSymbol{f27c}] +% \definesymbol [html5] [\FontAwesomeSymbol{f13b}] +% \definesymbol [i-cursor] [\FontAwesomeSymbol{f246}] +% \definesymbol [ils] [\FontAwesomeSymbol{f20b}] +% \definesymbol [image] [\FontAwesomeSymbol{f03e}] +% \definesymbol [inbox] [\FontAwesomeSymbol{f01c}] +% \definesymbol [indent] [\FontAwesomeSymbol{f03c}] +% \definesymbol [industry] [\FontAwesomeSymbol{f275}] +% \definesymbol [info] [\FontAwesomeSymbol{f129}] +% \definesymbol [info-circle] [\FontAwesomeSymbol{f05a}] +% \definesymbol [inr] [\FontAwesomeSymbol{f156}] +% \definesymbol [instagram] [\FontAwesomeSymbol{f16d}] +% \definesymbol [institution] [\FontAwesomeSymbol{f19c}] +% \definesymbol [internet-explorer] [\FontAwesomeSymbol{f26b}] +% \definesymbol [intersex] [\FontAwesomeSymbol{f224}] +% \definesymbol [ioxhost] [\FontAwesomeSymbol{f208}] +% \definesymbol [italic] [\FontAwesomeSymbol{f033}] +% \definesymbol [joomla] [\FontAwesomeSymbol{f1aa}] +% \definesymbol [jpy] [\FontAwesomeSymbol{f157}] +% \definesymbol [jsfiddle] [\FontAwesomeSymbol{f1cc}] +% \definesymbol [key] [\FontAwesomeSymbol{f084}] +% \definesymbol [keyboard-o] [\FontAwesomeSymbol{f11c}] +% \definesymbol [krw] [\FontAwesomeSymbol{f159}] +% \definesymbol [language] [\FontAwesomeSymbol{f1ab}] +% \definesymbol [laptop] [\FontAwesomeSymbol{f109}] +% \definesymbol [lastfm] [\FontAwesomeSymbol{f202}] +% \definesymbol [lastfm-square] [\FontAwesomeSymbol{f203}] +% \definesymbol [leaf] [\FontAwesomeSymbol{f06c}] +% \definesymbol [leanpub] [\FontAwesomeSymbol{f212}] +% \definesymbol [legal] [\FontAwesomeSymbol{f0e3}] +% \definesymbol [lemon-o] [\FontAwesomeSymbol{f094}] +% \definesymbol [level-down] [\FontAwesomeSymbol{f149}] +% \definesymbol [level-up] [\FontAwesomeSymbol{f148}] +% \definesymbol [life-bouy] [\FontAwesomeSymbol{f1cd}] +% \definesymbol [life-buoy] [\FontAwesomeSymbol{f1cd}] +% \definesymbol [life-ring] [\FontAwesomeSymbol{f1cd}] +% \definesymbol [life-saver] [\FontAwesomeSymbol{f1cd}] +% \definesymbol [lightbulb-o] [\FontAwesomeSymbol{f0eb}] +% \definesymbol [line-chart] [\FontAwesomeSymbol{f201}] +% \definesymbol [link] [\FontAwesomeSymbol{f0c1}] +% \definesymbol [linkedin] [\FontAwesomeSymbol{f0e1}] +% \definesymbol [linkedin-square] [\FontAwesomeSymbol{f08c}] +% \definesymbol [linux] [\FontAwesomeSymbol{f17c}] +% \definesymbol [list] [\FontAwesomeSymbol{f03a}] +% \definesymbol [list-alt] [\FontAwesomeSymbol{f022}] +% \definesymbol [list-ol] [\FontAwesomeSymbol{f0cb}] +% \definesymbol [list-ul] [\FontAwesomeSymbol{f0ca}] +% \definesymbol [location-arrow] [\FontAwesomeSymbol{f124}] +% \definesymbol [lock] [\FontAwesomeSymbol{f023}] +% \definesymbol [long-arrow-down] [\FontAwesomeSymbol{f175}] +% \definesymbol [long-arrow-left] [\FontAwesomeSymbol{f177}] +% \definesymbol [long-arrow-right] [\FontAwesomeSymbol{f178}] +% \definesymbol [long-arrow-up] [\FontAwesomeSymbol{f176}] +% \definesymbol [low-vision] [\FontAwesomeSymbol{f2a8}] +% \definesymbol [magic] [\FontAwesomeSymbol{f0d0}] +% \definesymbol [magnet] [\FontAwesomeSymbol{f076}] +% \definesymbol [mail-forward] [\FontAwesomeSymbol{f064}] +% \definesymbol [mail-reply] [\FontAwesomeSymbol{f112}] +% \definesymbol [mail-reply-all] [\FontAwesomeSymbol{f122}] +% \definesymbol [male] [\FontAwesomeSymbol{f183}] +% \definesymbol [map] [\FontAwesomeSymbol{f279}] +% \definesymbol [map-marker] [\FontAwesomeSymbol{f041}] +% \definesymbol [map-o] [\FontAwesomeSymbol{f278}] +% \definesymbol [map-pin] [\FontAwesomeSymbol{f276}] +% \definesymbol [map-signs] [\FontAwesomeSymbol{f277}] +% \definesymbol [mars] [\FontAwesomeSymbol{f222}] +% \definesymbol [mars-double] [\FontAwesomeSymbol{f227}] +% \definesymbol [mars-stroke] [\FontAwesomeSymbol{f229}] +% \definesymbol [mars-stroke-h] [\FontAwesomeSymbol{f22b}] +% \definesymbol [mars-stroke-v] [\FontAwesomeSymbol{f22a}] +% \definesymbol [maxcdn] [\FontAwesomeSymbol{f136}] +% \definesymbol [meanpath] [\FontAwesomeSymbol{f20c}] +% \definesymbol [medium] [\FontAwesomeSymbol{f23a}] +% \definesymbol [medkit] [\FontAwesomeSymbol{f0fa}] +% \definesymbol [meh-o] [\FontAwesomeSymbol{f11a}] +% \definesymbol [mercury] [\FontAwesomeSymbol{f223}] +% \definesymbol [microphone] [\FontAwesomeSymbol{f130}] +% \definesymbol [microphone-slash] [\FontAwesomeSymbol{f131}] +% \definesymbol [minus] [\FontAwesomeSymbol{f068}] +% \definesymbol [minus-circle] [\FontAwesomeSymbol{f056}] +% \definesymbol [minus-square] [\FontAwesomeSymbol{f146}] +% \definesymbol [minus-square-o] [\FontAwesomeSymbol{f147}] +% \definesymbol [mixcloud] [\FontAwesomeSymbol{f289}] +% \definesymbol [mobile] [\FontAwesomeSymbol{f10b}] +% \definesymbol [mobile-phone] [\FontAwesomeSymbol{f10b}] +% \definesymbol [modx] [\FontAwesomeSymbol{f285}] +% \definesymbol [money] [\FontAwesomeSymbol{f0d6}] +% \definesymbol [moon-o] [\FontAwesomeSymbol{f186}] +% \definesymbol [mortar-board] [\FontAwesomeSymbol{f19d}] +% \definesymbol [motorcycle] [\FontAwesomeSymbol{f21c}] +% \definesymbol [mouse-pointer] [\FontAwesomeSymbol{f245}] +% \definesymbol [music] [\FontAwesomeSymbol{f001}] +% \definesymbol [navicon] [\FontAwesomeSymbol{f0c9}] +% \definesymbol [neuter] [\FontAwesomeSymbol{f22c}] +% \definesymbol [newspaper-o] [\FontAwesomeSymbol{f1ea}] +% \definesymbol [object-group] [\FontAwesomeSymbol{f247}] +% \definesymbol [object-ungroup] [\FontAwesomeSymbol{f248}] +% \definesymbol [odnoklassniki] [\FontAwesomeSymbol{f263}] +% \definesymbol [odnoklassniki-square] [\FontAwesomeSymbol{f264}] +% \definesymbol [opencart] [\FontAwesomeSymbol{f23d}] +% \definesymbol [openid] [\FontAwesomeSymbol{f19b}] +% \definesymbol [opera] [\FontAwesomeSymbol{f26a}] +% \definesymbol [optin-monster] [\FontAwesomeSymbol{f23c}] +% \definesymbol [outdent] [\FontAwesomeSymbol{f03b}] +% \definesymbol [pagelines] [\FontAwesomeSymbol{f18c}] +% \definesymbol [paint-brush] [\FontAwesomeSymbol{f1fc}] +% \definesymbol [paper-plane] [\FontAwesomeSymbol{f1d8}] +% \definesymbol [paper-plane-o] [\FontAwesomeSymbol{f1d9}] +% \definesymbol [paperclip] [\FontAwesomeSymbol{f0c6}] +% \definesymbol [paragraph] [\FontAwesomeSymbol{f1dd}] +% \definesymbol [paste] [\FontAwesomeSymbol{f0ea}] +% \definesymbol [pause] [\FontAwesomeSymbol{f04c}] +% \definesymbol [pause-circle] [\FontAwesomeSymbol{f28b}] +% \definesymbol [pause-circle-o] [\FontAwesomeSymbol{f28c}] +% \definesymbol [paw] [\FontAwesomeSymbol{f1b0}] +% \definesymbol [paypal] [\FontAwesomeSymbol{f1ed}] +% \definesymbol [pencil] [\FontAwesomeSymbol{f040}] +% \definesymbol [pencil-square] [\FontAwesomeSymbol{f14b}] +% \definesymbol [pencil-square-o] [\FontAwesomeSymbol{f044}] +% \definesymbol [percent] [\FontAwesomeSymbol{f295}] +% \definesymbol [phone] [\FontAwesomeSymbol{f095}] +% \definesymbol [phone-square] [\FontAwesomeSymbol{f098}] +% \definesymbol [photo] [\FontAwesomeSymbol{f03e}] +% \definesymbol [picture-o] [\FontAwesomeSymbol{f03e}] +% \definesymbol [pie-chart] [\FontAwesomeSymbol{f200}] +% \definesymbol [pied-piper] [\FontAwesomeSymbol{f2ae}] +% \definesymbol [pied-piper-alt] [\FontAwesomeSymbol{f1a8}] +% \definesymbol [pied-piper-pp] [\FontAwesomeSymbol{f1a7}] +% \definesymbol [pinterest] [\FontAwesomeSymbol{f0d2}] +% \definesymbol [pinterest-p] [\FontAwesomeSymbol{f231}] +% \definesymbol [pinterest-square] [\FontAwesomeSymbol{f0d3}] +% \definesymbol [plane] [\FontAwesomeSymbol{f072}] +% \definesymbol [play] [\FontAwesomeSymbol{f04b}] +% \definesymbol [play-circle] [\FontAwesomeSymbol{f144}] +% \definesymbol [play-circle-o] [\FontAwesomeSymbol{f01d}] +% \definesymbol [plug] [\FontAwesomeSymbol{f1e6}] +% \definesymbol [plus] [\FontAwesomeSymbol{f067}] +% \definesymbol [plus-circle] [\FontAwesomeSymbol{f055}] +% \definesymbol [plus-square] [\FontAwesomeSymbol{f0fe}] +% \definesymbol [plus-square-o] [\FontAwesomeSymbol{f196}] +% \definesymbol [power-off] [\FontAwesomeSymbol{f011}] +% \definesymbol [print] [\FontAwesomeSymbol{f02f}] +% \definesymbol [product-hunt] [\FontAwesomeSymbol{f288}] +% \definesymbol [puzzle-piece] [\FontAwesomeSymbol{f12e}] +% \definesymbol [qq] [\FontAwesomeSymbol{f1d6}] +% \definesymbol [qrcode] [\FontAwesomeSymbol{f029}] +% \definesymbol [question] [\FontAwesomeSymbol{f128}] +% \definesymbol [question-circle] [\FontAwesomeSymbol{f059}] +% \definesymbol [question-circle-o] [\FontAwesomeSymbol{f29c}] +% \definesymbol [quote-left] [\FontAwesomeSymbol{f10d}] +% \definesymbol [quote-right] [\FontAwesomeSymbol{f10e}] +% \definesymbol [ra] [\FontAwesomeSymbol{f1d0}] +% \definesymbol [random] [\FontAwesomeSymbol{f074}] +% \definesymbol [rebel] [\FontAwesomeSymbol{f1d0}] +% \definesymbol [recycle] [\FontAwesomeSymbol{f1b8}] +% \definesymbol [reddit] [\FontAwesomeSymbol{f1a1}] +% \definesymbol [reddit-alien] [\FontAwesomeSymbol{f281}] +% \definesymbol [reddit-square] [\FontAwesomeSymbol{f1a2}] +% \definesymbol [refresh] [\FontAwesomeSymbol{f021}] +% \definesymbol [registered] [\FontAwesomeSymbol{f25d}] +% \definesymbol [remove] [\FontAwesomeSymbol{f00d}] +% \definesymbol [renren] [\FontAwesomeSymbol{f18b}] +% \definesymbol [reorder] [\FontAwesomeSymbol{f0c9}] +% \definesymbol [repeat] [\FontAwesomeSymbol{f01e}] +% \definesymbol [reply] [\FontAwesomeSymbol{f112}] +% \definesymbol [reply-all] [\FontAwesomeSymbol{f122}] +% \definesymbol [resistance] [\FontAwesomeSymbol{f1d0}] +% \definesymbol [retweet] [\FontAwesomeSymbol{f079}] +% \definesymbol [rmb] [\FontAwesomeSymbol{f157}] +% \definesymbol [road] [\FontAwesomeSymbol{f018}] +% \definesymbol [rocket] [\FontAwesomeSymbol{f135}] +% \definesymbol [rotate-left] [\FontAwesomeSymbol{f0e2}] +% \definesymbol [rotate-right] [\FontAwesomeSymbol{f01e}] +% \definesymbol [rouble] [\FontAwesomeSymbol{f158}] +% \definesymbol [rss] [\FontAwesomeSymbol{f09e}] +% \definesymbol [rss-square] [\FontAwesomeSymbol{f143}] +% \definesymbol [rub] [\FontAwesomeSymbol{f158}] +% \definesymbol [ruble] [\FontAwesomeSymbol{f158}] +% \definesymbol [rupee] [\FontAwesomeSymbol{f156}] +% \definesymbol [safari] [\FontAwesomeSymbol{f267}] +% \definesymbol [save] [\FontAwesomeSymbol{f0c7}] +% \definesymbol [scissors] [\FontAwesomeSymbol{f0c4}] +% \definesymbol [scribd] [\FontAwesomeSymbol{f28a}] +% \definesymbol [search] [\FontAwesomeSymbol{f002}] +% \definesymbol [search-minus] [\FontAwesomeSymbol{f010}] +% \definesymbol [search-plus] [\FontAwesomeSymbol{f00e}] +% \definesymbol [sellsy] [\FontAwesomeSymbol{f213}] +% \definesymbol [send] [\FontAwesomeSymbol{f1d8}] +% \definesymbol [send-o] [\FontAwesomeSymbol{f1d9}] +% \definesymbol [server] [\FontAwesomeSymbol{f233}] +% \definesymbol [share] [\FontAwesomeSymbol{f064}] +% \definesymbol [share-alt] [\FontAwesomeSymbol{f1e0}] +% \definesymbol [share-alt-square] [\FontAwesomeSymbol{f1e1}] +% \definesymbol [share-square] [\FontAwesomeSymbol{f14d}] +% \definesymbol [share-square-o] [\FontAwesomeSymbol{f045}] +% \definesymbol [shekel] [\FontAwesomeSymbol{f20b}] +% \definesymbol [sheqel] [\FontAwesomeSymbol{f20b}] +% \definesymbol [shield] [\FontAwesomeSymbol{f132}] +% \definesymbol [ship] [\FontAwesomeSymbol{f21a}] +% \definesymbol [shirtsinbulk] [\FontAwesomeSymbol{f214}] +% \definesymbol [shopping-bag] [\FontAwesomeSymbol{f290}] +% \definesymbol [shopping-basket] [\FontAwesomeSymbol{f291}] +% \definesymbol [shopping-cart] [\FontAwesomeSymbol{f07a}] +% \definesymbol [sign-in] [\FontAwesomeSymbol{f090}] +% \definesymbol [sign-language] [\FontAwesomeSymbol{f2a7}] +% \definesymbol [sign-out] [\FontAwesomeSymbol{f08b}] +% \definesymbol [signal] [\FontAwesomeSymbol{f012}] +% \definesymbol [signing] [\FontAwesomeSymbol{f2a7}] +% \definesymbol [simplybuilt] [\FontAwesomeSymbol{f215}] +% \definesymbol [sitemap] [\FontAwesomeSymbol{f0e8}] +% \definesymbol [skyatlas] [\FontAwesomeSymbol{f216}] +% \definesymbol [skype] [\FontAwesomeSymbol{f17e}] +% \definesymbol [slack] [\FontAwesomeSymbol{f198}] +% \definesymbol [sliders] [\FontAwesomeSymbol{f1de}] +% \definesymbol [slideshare] [\FontAwesomeSymbol{f1e7}] +% \definesymbol [smile-o] [\FontAwesomeSymbol{f118}] +% \definesymbol [snapchat] [\FontAwesomeSymbol{f2ab}] +% \definesymbol [snapchat-ghost] [\FontAwesomeSymbol{f2ac}] +% \definesymbol [snapchat-square] [\FontAwesomeSymbol{f2ad}] +% \definesymbol [soccer-ball-o] [\FontAwesomeSymbol{f1e3}] +% \definesymbol [sort] [\FontAwesomeSymbol{f0dc}] +% \definesymbol [sort-alpha-asc] [\FontAwesomeSymbol{f15d}] +% \definesymbol [sort-alpha-desc] [\FontAwesomeSymbol{f15e}] +% \definesymbol [sort-amount-asc] [\FontAwesomeSymbol{f160}] +% \definesymbol [sort-amount-desc] [\FontAwesomeSymbol{f161}] +% \definesymbol [sort-asc] [\FontAwesomeSymbol{f0de}] +% \definesymbol [sort-desc] [\FontAwesomeSymbol{f0dd}] +% \definesymbol [sort-down] [\FontAwesomeSymbol{f0dd}] +% \definesymbol [sort-numeric-asc] [\FontAwesomeSymbol{f162}] +% \definesymbol [sort-numeric-desc] [\FontAwesomeSymbol{f163}] +% \definesymbol [sort-up] [\FontAwesomeSymbol{f0de}] +% \definesymbol [soundcloud] [\FontAwesomeSymbol{f1be}] +% \definesymbol [space-shuttle] [\FontAwesomeSymbol{f197}] +% \definesymbol [spinner] [\FontAwesomeSymbol{f110}] +% \definesymbol [spoon] [\FontAwesomeSymbol{f1b1}] +% \definesymbol [spotify] [\FontAwesomeSymbol{f1bc}] +% \definesymbol [square] [\FontAwesomeSymbol{f0c8}] +% \definesymbol [square-o] [\FontAwesomeSymbol{f096}] +% \definesymbol [stack-exchange] [\FontAwesomeSymbol{f18d}] +% \definesymbol [stack-overflow] [\FontAwesomeSymbol{f16c}] +% \definesymbol [star] [\FontAwesomeSymbol{f005}] +% \definesymbol [star-half] [\FontAwesomeSymbol{f089}] +% \definesymbol [star-half-empty] [\FontAwesomeSymbol{f123}] +% \definesymbol [star-half-full] [\FontAwesomeSymbol{f123}] +% \definesymbol [star-half-o] [\FontAwesomeSymbol{f123}] +% \definesymbol [star-o] [\FontAwesomeSymbol{f006}] +% \definesymbol [steam] [\FontAwesomeSymbol{f1b6}] +% \definesymbol [steam-square] [\FontAwesomeSymbol{f1b7}] +% \definesymbol [step-backward] [\FontAwesomeSymbol{f048}] +% \definesymbol [step-forward] [\FontAwesomeSymbol{f051}] +% \definesymbol [stethoscope] [\FontAwesomeSymbol{f0f1}] +% \definesymbol [sticky-note] [\FontAwesomeSymbol{f249}] +% \definesymbol [sticky-note-o] [\FontAwesomeSymbol{f24a}] +% \definesymbol [stop] [\FontAwesomeSymbol{f04d}] +% \definesymbol [stop-circle] [\FontAwesomeSymbol{f28d}] +% \definesymbol [stop-circle-o] [\FontAwesomeSymbol{f28e}] +% \definesymbol [street-view] [\FontAwesomeSymbol{f21d}] +% \definesymbol [strikethrough] [\FontAwesomeSymbol{f0cc}] +% \definesymbol [stumbleupon] [\FontAwesomeSymbol{f1a4}] +% \definesymbol [stumbleupon-circle] [\FontAwesomeSymbol{f1a3}] +% \definesymbol [subscript] [\FontAwesomeSymbol{f12c}] +% \definesymbol [subway] [\FontAwesomeSymbol{f239}] +% \definesymbol [suitcase] [\FontAwesomeSymbol{f0f2}] +% \definesymbol [sun-o] [\FontAwesomeSymbol{f185}] +% \definesymbol [superscript] [\FontAwesomeSymbol{f12b}] +% \definesymbol [support] [\FontAwesomeSymbol{f1cd}] +% \definesymbol [table] [\FontAwesomeSymbol{f0ce}] +% \definesymbol [tablet] [\FontAwesomeSymbol{f10a}] +% \definesymbol [tachometer] [\FontAwesomeSymbol{f0e4}] +% \definesymbol [tag] [\FontAwesomeSymbol{f02b}] +% \definesymbol [tags] [\FontAwesomeSymbol{f02c}] +% \definesymbol [tasks] [\FontAwesomeSymbol{f0ae}] +% \definesymbol [taxi] [\FontAwesomeSymbol{f1ba}] +% \definesymbol [television] [\FontAwesomeSymbol{f26c}] +% \definesymbol [tencent-weibo] [\FontAwesomeSymbol{f1d5}] +% \definesymbol [terminal] [\FontAwesomeSymbol{f120}] +% \definesymbol [text-height] [\FontAwesomeSymbol{f034}] +% \definesymbol [text-width] [\FontAwesomeSymbol{f035}] +% \definesymbol [th] [\FontAwesomeSymbol{f00a}] +% \definesymbol [th-large] [\FontAwesomeSymbol{f009}] +% \definesymbol [th-list] [\FontAwesomeSymbol{f00b}] +% \definesymbol [themeisle] [\FontAwesomeSymbol{f2b2}] +% \definesymbol [thumb-tack] [\FontAwesomeSymbol{f08d}] +% \definesymbol [thumbs-down] [\FontAwesomeSymbol{f165}] +% \definesymbol [thumbs-o-down] [\FontAwesomeSymbol{f088}] +% \definesymbol [thumbs-o-up] [\FontAwesomeSymbol{f087}] +% \definesymbol [thumbs-up] [\FontAwesomeSymbol{f164}] +% \definesymbol [ticket] [\FontAwesomeSymbol{f145}] +% \definesymbol [times] [\FontAwesomeSymbol{f00d}] +% \definesymbol [times-circle] [\FontAwesomeSymbol{f057}] +% \definesymbol [times-circle-o] [\FontAwesomeSymbol{f05c}] +% \definesymbol [tint] [\FontAwesomeSymbol{f043}] +% \definesymbol [toggle-down] [\FontAwesomeSymbol{f150}] +% \definesymbol [toggle-left] [\FontAwesomeSymbol{f191}] +% \definesymbol [toggle-off] [\FontAwesomeSymbol{f204}] +% \definesymbol [toggle-on] [\FontAwesomeSymbol{f205}] +% \definesymbol [toggle-right] [\FontAwesomeSymbol{f152}] +% \definesymbol [toggle-up] [\FontAwesomeSymbol{f151}] +% \definesymbol [trademark] [\FontAwesomeSymbol{f25c}] +% \definesymbol [train] [\FontAwesomeSymbol{f238}] +% \definesymbol [transgender] [\FontAwesomeSymbol{f224}] +% \definesymbol [transgender-alt] [\FontAwesomeSymbol{f225}] +% \definesymbol [trash] [\FontAwesomeSymbol{f1f8}] +% \definesymbol [trash-o] [\FontAwesomeSymbol{f014}] +% \definesymbol [tree] [\FontAwesomeSymbol{f1bb}] +% \definesymbol [trello] [\FontAwesomeSymbol{f181}] +% \definesymbol [tripadvisor] [\FontAwesomeSymbol{f262}] +% \definesymbol [trophy] [\FontAwesomeSymbol{f091}] +% \definesymbol [truck] [\FontAwesomeSymbol{f0d1}] +% \definesymbol [try] [\FontAwesomeSymbol{f195}] +% \definesymbol [tty] [\FontAwesomeSymbol{f1e4}] +% \definesymbol [tumblr] [\FontAwesomeSymbol{f173}] +% \definesymbol [tumblr-square] [\FontAwesomeSymbol{f174}] +% \definesymbol [turkish-lira] [\FontAwesomeSymbol{f195}] +% \definesymbol [tv] [\FontAwesomeSymbol{f26c}] +% \definesymbol [twitch] [\FontAwesomeSymbol{f1e8}] +% \definesymbol [twitter] [\FontAwesomeSymbol{f099}] +% \definesymbol [twitter-square] [\FontAwesomeSymbol{f081}] +% \definesymbol [umbrella] [\FontAwesomeSymbol{f0e9}] +% \definesymbol [underline] [\FontAwesomeSymbol{f0cd}] +% \definesymbol [undo] [\FontAwesomeSymbol{f0e2}] +% \definesymbol [universal-access] [\FontAwesomeSymbol{f29a}] +% \definesymbol [university] [\FontAwesomeSymbol{f19c}] +% \definesymbol [unlink] [\FontAwesomeSymbol{f127}] +% \definesymbol [unlock] [\FontAwesomeSymbol{f09c}] +% \definesymbol [unlock-alt] [\FontAwesomeSymbol{f13e}] +% \definesymbol [unsorted] [\FontAwesomeSymbol{f0dc}] +% \definesymbol [upload] [\FontAwesomeSymbol{f093}] +% \definesymbol [usb] [\FontAwesomeSymbol{f287}] +% \definesymbol [usd] [\FontAwesomeSymbol{f155}] +% \definesymbol [user] [\FontAwesomeSymbol{f007}] +% \definesymbol [user-md] [\FontAwesomeSymbol{f0f0}] +% \definesymbol [user-plus] [\FontAwesomeSymbol{f234}] +% \definesymbol [user-secret] [\FontAwesomeSymbol{f21b}] +% \definesymbol [user-times] [\FontAwesomeSymbol{f235}] +% \definesymbol [users] [\FontAwesomeSymbol{f0c0}] +% \definesymbol [venus] [\FontAwesomeSymbol{f221}] +% \definesymbol [venus-double] [\FontAwesomeSymbol{f226}] +% \definesymbol [venus-mars] [\FontAwesomeSymbol{f228}] +% \definesymbol [viacoin] [\FontAwesomeSymbol{f237}] +% \definesymbol [viadeo] [\FontAwesomeSymbol{f2a9}] +% \definesymbol [viadeo-square] [\FontAwesomeSymbol{f2aa}] +% \definesymbol [video-camera] [\FontAwesomeSymbol{f03d}] +% \definesymbol [vimeo] [\FontAwesomeSymbol{f27d}] +% \definesymbol [vimeo-square] [\FontAwesomeSymbol{f194}] +% \definesymbol [vine] [\FontAwesomeSymbol{f1ca}] +% \definesymbol [vk] [\FontAwesomeSymbol{f189}] +% \definesymbol [volume-control-phone] [\FontAwesomeSymbol{f2a0}] +% \definesymbol [volume-down] [\FontAwesomeSymbol{f027}] +% \definesymbol [volume-off] [\FontAwesomeSymbol{f026}] +% \definesymbol [volume-up] [\FontAwesomeSymbol{f028}] +% \definesymbol [warning] [\FontAwesomeSymbol{f071}] +% \definesymbol [wechat] [\FontAwesomeSymbol{f1d7}] +% \definesymbol [weibo] [\FontAwesomeSymbol{f18a}] +% \definesymbol [weixin] [\FontAwesomeSymbol{f1d7}] +% \definesymbol [whatsapp] [\FontAwesomeSymbol{f232}] +% \definesymbol [wheelchair] [\FontAwesomeSymbol{f193}] +% \definesymbol [wheelchair-alt] [\FontAwesomeSymbol{f29b}] +% \definesymbol [wifi] [\FontAwesomeSymbol{f1eb}] +% \definesymbol [wikipedia-w] [\FontAwesomeSymbol{f266}] +% \definesymbol [windows] [\FontAwesomeSymbol{f17a}] +% \definesymbol [won] [\FontAwesomeSymbol{f159}] +% \definesymbol [wordpress] [\FontAwesomeSymbol{f19a}] +% \definesymbol [wpbeginner] [\FontAwesomeSymbol{f297}] +% \definesymbol [wpforms] [\FontAwesomeSymbol{f298}] +% \definesymbol [wrench] [\FontAwesomeSymbol{f0ad}] +% \definesymbol [xing] [\FontAwesomeSymbol{f168}] +% \definesymbol [xing-square] [\FontAwesomeSymbol{f169}] +% \definesymbol [y-combinator] [\FontAwesomeSymbol{f23b}] +% \definesymbol [y-combinator-square] [\FontAwesomeSymbol{f1d4}] +% \definesymbol [yahoo] [\FontAwesomeSymbol{f19e}] +% \definesymbol [yc] [\FontAwesomeSymbol{f23b}] +% \definesymbol [yc-square] [\FontAwesomeSymbol{f1d4}] +% \definesymbol [yelp] [\FontAwesomeSymbol{f1e9}] +% \definesymbol [yen] [\FontAwesomeSymbol{f157}] +% \definesymbol [yoast] [\FontAwesomeSymbol{f2b1}] +% \definesymbol [youtube] [\FontAwesomeSymbol{f167}] +% \definesymbol [youtube-play] [\FontAwesomeSymbol{f16a}] +% \definesymbol [youtube-square] [\FontAwesomeSymbol{f166}] \stopsymbolset \continueifinputfile{symb-imp-fontawesome.mkiv} -% \usesymbols[fontawesome] - \starttext + % \usesymbols[fontawesome] + % + % \symbol[fontawesome][wheelchair] + % \symbol[fontawesome][angle-right] + % \symbol[fontawesome][angle right] + % \symbol[fontawesome][angle_right] + \showsymbolset[fontawesome] \stoptext diff --git a/tex/context/base/mkiv/symb-ini.mkiv b/tex/context/base/mkiv/symb-ini.mkiv index e4950e09d..ae1a2a711 100644 --- a/tex/context/base/mkiv/symb-ini.mkiv +++ b/tex/context/base/mkiv/symb-ini.mkiv @@ -45,6 +45,7 @@ \installcorenamespace{symbol} \installcorenamespace{symbolset} +\installcorenamespace{symboldefault} \let\currentsymbol \empty \let\currentsymbolset\empty @@ -95,8 +96,9 @@ % Test test \symbol[whatever]\ test \symbol[whatever]. % Test test \symbol{whatever} test \symbol{whatever}. -\unexpanded\def\symbol % This one always gobbles spaces, - {\dodoubleempty\symb_place} % so never change it again! +\unexpanded\def\symbol + {\dontleavehmode % so we can start a paragraph with it + \dodoubleempty\symb_place} \def\symb_place % so we also handle \symbol{name} {\iffirstargument % which is nicer with following spaces @@ -160,11 +162,47 @@ \expandafter\symb_fetch_indeed \fi} +% \def\symb_fetch_indeed#1% +% {\ifcsname\??symbol#1:\currentsymbol\endcsname +% \symb_place_indeed{#1:\currentsymbol}% +% \fi} + \def\symb_fetch_indeed#1% {\ifcsname\??symbol#1:\currentsymbol\endcsname \symb_place_indeed{#1:\currentsymbol}% + \else\ifcsname\??symboldefault#1\endcsname + \symb_place_named{#1}% + \fi\fi} + +\def\symb_place_named#1% \relax's prevent lookahead problems + {\begingroup + \setbox\scratchbox\hbox\bgroup + \the\everysymbol + \getglyphstyled + {\csname\??symboldefault#1\endcsname}% + {\tochar{n:\currentsymbol}}% + \relax + \egroup + \ifdim\wd\scratchbox>\zeropoint + \unhbox\scratchbox + \endgroup + \setxvalue{\??symbol#1:\currentsymbol}% + {\symb_place_named_indeed{#1}{\currentsymbol}}% + \settrue\c_symb_found + \else + \endgroup \fi} +\unexpanded\def\symb_place_named_indeed#1#2% \relax's prevent lookahead problems + {\settrue\c_symb_found + \begingroup + \the\everysymbol + \getglyphstyled + {\csname\??symboldefault#1\endcsname}% + {\tochar{n:#2}}% + \relax + \endgroup} + \def\symb_place_retry#1% {\ifcsname\??symbol:#1\endcsname \symb_place_indeed{:#1}% @@ -273,9 +311,25 @@ \installcorenamespace{symbolsets} -\unexpanded\def\startsymbolset[#1]% +% \unexpanded\def\startsymbolset[#1]% +% {\pushmacro\m_symb_current_set +% \def\m_symb_current_set{#1}} + +% maybe a parameterhandler: + +\unexpanded\def\startsymbolset + {\dodoubleargument\symb_start_set} + +\def\symb_start_set[#1][#2]% {\pushmacro\m_symb_current_set - \def\m_symb_current_set{#1}} + \def\m_symb_current_set{#1}% + \ifsecondargument + \getdummyparameters[\s!font=,#2]% + \edef\p_font{\dummyparameter\s!font}% + \ifx\p_font\empty\else + \letvalue{\??symboldefault#1}\p_font + \fi + \fi} \unexpanded\def\stopsymbolset {\popmacro\m_symb_current_set} diff --git a/tex/context/base/mkiv/symb-run.mkiv b/tex/context/base/mkiv/symb-run.mkiv index ed4d90861..c25d13d48 100644 --- a/tex/context/base/mkiv/symb-run.mkiv +++ b/tex/context/base/mkiv/symb-run.mkiv @@ -12,23 +12,55 @@ %C details. \startluacode - function commands.showsymbolset(collection,symbols) + function commands.showsymbolset(collection,symbols,fontid) if type(symbols) == "string" then symbols = utilities.parsers.settings_to_array(symbols) end + local options = { framecolor = "orange", rulethickness = ".8pt", offset = interfaces.variables.overlay } + local list = table.tohash(symbols) + local alsofont = fontid > 0 + local defined = #symbols > 0 + local byname = false + if alsofont then + local is_symbol = characters.is_symbol + local chardata = characters.data + local resources = fonts.hashes.resources [fontid] + local characters = fonts.hashes.characters[fontid] + if resources and characters then + local unicodes = resources.unicodes + if unicodes then + for name, unicode in next, unicodes do + if not list[name] and name ~= ".notdef" then + local c = rawget(chardata,unicode) + if not c or is_symbol[c.category] then + list[name] = false + byname = true + end + end + end + end + end + end + local detail = defined and byname context.start() context.forcesymbolset { collection } - context.starttabulate { "|lT|l|l|" } - local options = { framecolor = "orange", rulethickness = ".8pt", offset = interfaces.variables.overlay } - for i=1,#symbols do - local symbol = symbols[i] + context.starttabulate { detail and "|lT|l|l|lT|" or "|lT|l|l|"} + for symbol, how in table.sortedhash(list) do context.NC() - context(symbol) + if detail and how then + context.bold(symbol) + else + context(symbol) + end context.NC() context.symbol(symbol) context.NC() context.framed(options,context.nested.symbol(symbol)) context.NC() + if detail and how then + context.bold("defined") + context.NC() + end context.NR() end context.stoptabulate() @@ -42,7 +74,23 @@ {\dosingleargument\symb_show_set} \gdef\symb_show_set[#1]% - {\ctxcommand{showsymbolset("#1","\symbolset{#1}")}} + {\begingroup + \edef\p_font{\begincsname\??symboldefault#1\endcsname}% + \begingroup + \ifx\p_font\empty + \global\globalscratchcounter\zerocount + \else + \definedfont[\p_font]% + \global\globalscratchcounter\fontid\font\relax + \fi + \endgroup + \ctxcommand { + showsymbolset ( + "#1", + "\symbolset{#1}", + \the\globalscratchcounter + ) }% + \endgroup} \protect diff --git a/tex/context/base/mkiv/trac-par.lua b/tex/context/base/mkiv/trac-par.lua index f16078483..78548afbb 100644 --- a/tex/context/base/mkiv/trac-par.lua +++ b/tex/context/base/mkiv/trac-par.lua @@ -22,6 +22,7 @@ local getlist = nuts.getlist local getfont = nuts.getfont local getchar = nuts.getchar local getwidth = nuts.getwidth +local getexpansion = nuts.getexpansion local nodecodes = nodes.nodecodes local hlist_code = nodecodes.hlist @@ -65,7 +66,7 @@ local function colorize(n) while n do local id = getid(n) if id == glyph_code then - local ne = getfield(n,"expansion_factor") + local ne = getexpansion(n) if ne == 0 then if length > 0 then flush() end setnodecolor(n,"hz:zero") diff --git a/tex/context/base/mkiv/trac-set.lua b/tex/context/base/mkiv/trac-set.lua index 530915fe0..6311d6382 100644 --- a/tex/context/base/mkiv/trac-set.lua +++ b/tex/context/base/mkiv/trac-set.lua @@ -396,3 +396,20 @@ if texconfig then directives.register("luatex.stacksize", function(v) set("stack_size",v) end) end + +-- for now here: + +local data = table.setmetatableindex("table") + +updaters = { + register = function(what,f) + local d = data[what] + d[#d+1] = f + end, + apply = function(what,...) + local d = data[what] + for i=1,#d do + d[i](...) + end + end, +} diff --git a/tex/context/base/mkiv/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua index 35c27cb57..242363238 100644 --- a/tex/context/base/mkiv/trac-vis.lua +++ b/tex/context/base/mkiv/trac-vis.lua @@ -67,6 +67,7 @@ local getpenalty = nuts.getpenalty local getwidth = nuts.getwidth local getdepth = nuts.getdepth local getshift = nuts.getshift +local getexpansion = nuts.getexpansion local hpack_nodes = nuts.hpack local vpack_nodes = nuts.vpack @@ -474,7 +475,7 @@ local fontkern, italickern do local function somekern(head,current,cache,color,layer) local width = getkern(current) - local extra = getfield(current,"expansion_factor") + local extra = getexpansion(current) local kern = width + extra local info = cache[kern] if not info then @@ -515,7 +516,7 @@ local glyphexpansion do local f_cache = caches["glyphexpansion"] glyphexpansion = function(head,current) - local extra = getfield(current,"expansion_factor") + local extra = getexpansion(current) if extra ~= 0 then extra = extra / 1000 local info = f_cache[extra] @@ -549,7 +550,7 @@ local kernexpansion do local f_cache = caches["kernexpansion"] kernexpansion = function(head,current) - local extra = getfield(current,"expansion_factor") + local extra = getexpansion(current) if extra ~= 0 then extra = extra / 1000 local info = f_cache[extra] diff --git a/tex/context/base/mkiv/typo-chr.lua b/tex/context/base/mkiv/typo-chr.lua index ecde8f000..fe70ec6de 100644 --- a/tex/context/base/mkiv/typo-chr.lua +++ b/tex/context/base/mkiv/typo-chr.lua @@ -22,6 +22,7 @@ if not modules then modules = { } end modules ['typo-chr'] = { -- local getid = nuts.getid -- local getprev = nuts.getprev -- local getchar = nuts.getchar +-- local getdata = nuts.getdata -- local getfield = nuts.getfield -- -- local remove_node = nuts.remove @@ -51,7 +52,7 @@ if not modules then modules = { } end modules ['typo-chr'] = { -- local done = false -- for n, subtype in nextwhatsit, head do -- if subtype == user_code and getfield(n,"user_id") == signal and getfield(n,"type") == 115 then --- local action = actions[getfield(n,"value")] +-- local action = actions[getdata(n)] -- if action then -- head = action(h,n) -- end diff --git a/tex/context/base/mkiv/typo-mar.lua b/tex/context/base/mkiv/typo-mar.lua index 4254d7604..ab39f1808 100644 --- a/tex/context/base/mkiv/typo-mar.lua +++ b/tex/context/base/mkiv/typo-mar.lua @@ -83,6 +83,7 @@ local setshift = nuts.setshift local getwidth = nuts.getwidth local setwidth = nuts.setwidth local getheight = nuts.getheight +local getdata = nuts.getdata local currentattr = nuts.current_attr local setattrlist = nuts.setattrlist @@ -722,7 +723,7 @@ local function flushinline(parent,head) local id = getid(current) if id == whatsit_code then if getsubtype(current) == userdefined_code and getfield(current,"user_id") == inline_mark then - local n = getfield(current,"value") + local n = getdata(current) local candidate = inlinestore[n] if candidate then -- no vpack, as we want to realign inlinestore[n] = nil diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index a1e2c4941..1df8eee8b 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -780,6 +780,7 @@ <cd:constant type="global"/> <cd:constant default="yes" type="public"/> <cd:constant type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -793,6 +794,7 @@ <cd:constant type="global"/> <cd:constant type="public"/> <cd:constant default="yes" type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -2976,7 +2978,7 @@ <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="strip"> - <cd:constant type="yes"/> + <cd:constant default="yes" type="yes"/> <cd:constant type="no"/> </cd:parameter> </cd:assignments> @@ -2997,7 +2999,7 @@ </cd:command> <cd:command category="buffer" file="buff-ini.mkiv" level="document" name="getbuffer"> <cd:arguments> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:buffer"/> </cd:keywords> </cd:arguments> @@ -3807,9 +3809,35 @@ </cd:arguments> </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="resetcharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="nocharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setcharacteraligndetail"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:number"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:dimension"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="alignmentcharacter"/> <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment"> <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupcharacteralign"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="characteralign" type="environment" variant="argument"> + <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant method="apply" prefix="number" type="cd:text"/> @@ -3822,6 +3850,31 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="style" name="setupcharacteralign"> + <cd:arguments> + <cd:assignments list="yes"> + <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="leftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="rightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="character"> + <cd:constant type="cd:text"/> + <cd:constant method="apply" prefix="number" type="cd:text"/> + <cd:constant method="apply" prefix="text" type="cd:text"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setfirstpasscharacteralign"/> + <cd:command category="alignment" file="typo-tal.mkiv" level="system" name="setsecondpasscharacteralign"/> </cd:interface> <cd:interface file="i-characterspacing.xml"> <cd:command category="fonts" file="typo-spa.mkiv" level="style" name="definecharacterspacing"> @@ -7479,6 +7532,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -7562,6 +7616,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -8075,7 +8133,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant type="cd:number"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="alternative"> <cd:constant default="yes" type="normal"/> @@ -8212,6 +8270,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant default="yes" type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -8295,6 +8354,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -10167,7 +10230,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupfloatcaption"> + <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -10229,6 +10292,13 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="headstyle"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> @@ -10287,23 +10357,13 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaption"> - <cd:arguments> - <cd:keywords list="yes" optional="yes"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> - </cd:assignments> - </cd:arguments> - </cd:command> <cd:command category="structure fonts counter" file="strc-flt.mkvi" level="style" name="setupcaptions"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> + <cd:inherit name="setupcaption"/> </cd:assignments> </cd:arguments> </cd:command> @@ -10967,6 +11027,52 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="definefacingfloat"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfacingfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="style" name="setupfacingfloat"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:constant type="cd:style"/> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure" file="page-ffl.mkiv" level="document" name="facingfloat" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-fontfamily.xml"> <cd:command category="fonts" file="font-sel.mkvi" level="style" name="definefontfamily"> @@ -13349,6 +13455,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placeformula" type="environment"> @@ -13387,6 +13496,9 @@ <cd:keywords delimiters="braces"> <cd:constant type="cd:text"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat.mkiv" level="document" name="placesubformula"> @@ -13396,6 +13508,9 @@ <cd:constant type="-"/> <cd:constant type="cd:reference"/> </cd:keywords> + <cd:keywords delimiters="braces" optional="yes"> + <cd:constant type="cd:text"/> + </cd:keywords> </cd:arguments> </cd:command> <cd:command category="mathematics" file="strc-mat" level="document" name="formulanumber"> @@ -14419,12 +14534,6 @@ <cd:parameter name="cache"> <cd:constant type="cd:path"/> </cd:parameter> - <cd:parameter name="userpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> - <cd:parameter name="ownerpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> <cd:parameter name="resources"> <cd:constant type="cd:path"/> </cd:parameter> @@ -14442,6 +14551,16 @@ <cd:constant type="no"/> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="transform"> + <cd:constant default="yes" type="auto"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="userpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="ownerpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -14760,6 +14879,20 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="overlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="graphics" file="pack-box.mkiv" level="style" name="clippedoverlayimage"> + <cd:arguments> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:file"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-grid.xml"> <cd:command category="layout" file="page-grd.mkiv" level="document" name="showgrid"> @@ -15006,6 +15139,12 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="rulecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -17975,6 +18114,40 @@ </cd:assignments> </cd:arguments> </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="defineperiodkerning"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupperiodkerning"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setupperiodkerning"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="setperiodkerning"> + <cd:arguments> + <cd:keywords> + <cd:constant type="reset"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command catgeory="fonts whitespace" file="typo-pnc.mkic" level="style" name="resetperiodkerning"/> </cd:interface> <cd:interface file="i-label.xml"> <cd:command category="structure" file="strc-lab.mkiv" level="style" name="definelabel"> @@ -18079,6 +18252,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant default="yes" type="intext"/> <cd:constant type="cd:name"/> @@ -18163,6 +18337,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -19205,6 +19383,7 @@ </cd:parameter> <cd:parameter name="cropoffset"> <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="trimoffset"> <cd:constant type="cd:dimension"/> @@ -19398,7 +19577,7 @@ </cd:command> <cd:command category="layout" file="page-run.mkiv" level="document" name="showmargins"/> <cd:command category="layout" file="page-spr.mkiv" level="document" name="spread" type="environment"/> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doifelsetopofpage"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doifelsetopofpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19408,7 +19587,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout conditional" file="page-lay.mkiv" level="system" name="doiftopofpageelse"> + <cd:command category="layout conditional" file="page-ini.mkiv" level="system" name="doiftopofpageelse"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:true"/> @@ -19420,7 +19599,7 @@ </cd:command> </cd:interface> <cd:interface file="i-linefiller.xml"> - <cd:command file="node-rul.mkiv" name="definelinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="definelinefiller"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -19433,7 +19612,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="setuplinefiller"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefiller"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -19490,9 +19669,33 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command file="node-rul.mkiv" name="filler"> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setuplinefillers"> <cd:arguments> - <cd:content/> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="linefiller" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="rules metapost" file="node-rul.mkiv" level="style" name="setlinefiller"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> </cd:interface> @@ -19987,7 +20190,6 @@ <cd:parameter name="width"> <cd:constant type="fit"/> <cd:constant type="broad"/> - <cd:constant type="auto"/> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="height"> @@ -20314,7 +20516,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20324,7 +20526,55 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:parameter name="criterium"> + <cd:constant default="yes" type="local"/> + <cd:constant type="intro"/> + <cd:constant type="reference"/> + <cd:constant method="range" prefix="cd:sectionblock" type="reference"/> + <cd:constant type="all"/> + <cd:constant method="range" prefix="cd:sectionblock" type="all"/> + <cd:constant type="text"/> + <cd:constant method="range" prefix="cd:sectionblock" type="text"/> + <cd:constant type="current"/> + <cd:constant method="range" prefix="cd:sectionblock" type="current"/> + <cd:constant type="here"/> + <cd:constant type="previous"/> + <cd:constant method="range" prefix="cd:sectionblock" type="previous"/> + <cd:constant type="component"/> + <cd:constant type="cd:section"/> + <cd:constant method="range" prefix="cd:sectionblock" type="cd:section"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="extras"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="order"> + <cd:constant type="command"/> + <cd:constant type="all"/> + <cd:constant type="title"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant default="yes" type="b"/> + <cd:constant type="c"/> + <cd:constant type="d"/> + <cd:constant type="e"/> + <cd:constant type="f"/> + <cd:constant type="g"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="command"/> + <cd:constant type="none"/> + <cd:constant type="interactive"/> + <cd:constant type="paragraph"/> + <cd:constant type="horizontal"/> + <cd:constant type="vertical"/> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -20334,7 +20584,7 @@ <cd:constant type="cd:list"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -20345,7 +20595,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20359,7 +20609,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -20373,7 +20623,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -21779,6 +22029,7 @@ <cd:parameter name="align"> <cd:constant default="yes" type="l2r"/> <cd:constant type="r2l"/> + <cd:constant type="righttoleft"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="yes"/> @@ -21854,6 +22105,17 @@ <cd:parameter name="ampersand"> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="collapsing"> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant default="yes" type="3"/> + <cd:constant type="none"/> + <cd:constant type="reset"/> + </cd:parameter> + <cd:parameter name="kernpairs"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -22723,6 +22985,14 @@ <cd:constant value="mathmatrix"/> </cd:instances> </cd:command> + <cd:command category="mathematics tables" file="math-ali.mkiv" generated="yes" level="document" name="mathmatrix"> + <cd:sequence> + <cd:variable value="mathmatrix"/> + </cd:sequence> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> <cd:command category="mathematics tables" file="math-ali.mkiv" level="document" name="matrices" type="environment"> <cd:arguments> <cd:assignments list="yes" optional="yes"> @@ -24972,6 +25242,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:inherit name="setupcounter"/> </cd:assignments> </cd:arguments> @@ -25330,6 +25604,7 @@ </cd:command> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="postponenotes"/> <cd:command category="structure notes" file="strc-not.mkvi" level="style" name="flushnotes"/> + <cd:command category="structure notes" file="strc-not.mkvi" name="postponingnotes" type="environment"/> <cd:command category="structure notes conditional" file="strc-not.mkvi" level="system" name="doifelsenoteonsamepage"> <cd:arguments> <cd:keywords delimiters="braces"> @@ -26217,6 +26492,78 @@ </cd:arguments> </cd:command> </cd:interface> + <cd:interface file="i-pagecolumns.xml"> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="definepagecolumns"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="style" name="setuppagecolumns"> + <cd:arguments> + <cd:keywords list="yes" optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:parameter name="separator"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant default="yes" type="normal"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment" variant="name"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" level="document" name="pagecolumns" type="environment"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + <cd:command category="structure layout" file="page-pcl.mkiv" generated="yes" level="document" name="pagecolumns" type="environment" variant="instance"> + <cd:sequence> + <cd:instance value="pagecolumns"/> + </cd:sequence> + </cd:command> + </cd:interface> <cd:interface file="i-pagecomment.xml"> <cd:command category="pdf" file="page-com.mkiv" level="style" name="setuppagecomment"> <cd:arguments> @@ -26283,7 +26630,7 @@ </cd:command> </cd:interface> <cd:interface file="i-pagegrid.xml"> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnset"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26292,11 +26639,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegrid"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnset"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26338,43 +26685,27 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="pagegrid" type="environment" variant="example"> + <cd:command category="layout" file="page-cst.mkiv" generated="yes" level="document" name="columnset" type="environment" variant="example"> <cd:sequence> - <cd:variable value="pagegrid"/> + <cd:variable value="columnset"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegrid" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnset" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="setpagegrid"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="c"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="r"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="option"> - <cd:constant default="yes" type="none"/> - </cd:parameter> + <cd:inherit name="setupcolumnset"/> </cd:assignments> - <cd:content/> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetspan"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26383,11 +26714,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridspan"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetspan"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26413,24 +26744,24 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="document" name="pagegridspan" type="environment"> + <cd:command category="layout" file="page-cst.mkiv" level="document" name="columnsetspan" type="environment"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="pagegridspanwidth"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="columnsetspanwidth"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="definepagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="definecolumnsetarea"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26439,11 +26770,11 @@ <cd:constant type="cd:name"/> </cd:keywords> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridarea"/> + <cd:inherit name="setupcolumnsetarea"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridarea"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetarea"> <cd:arguments> <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:name"/> @@ -26483,7 +26814,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridareatext"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetareatext"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26493,7 +26824,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridlines"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetlines"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -26509,7 +26840,7 @@ </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="layout" file="page-cst.mkiv" level="style" name="setuppagegridstart"> + <cd:command category="layout" file="page-cst.mkiv" level="style" name="setupcolumnsetstart"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> @@ -27066,17 +27397,31 @@ </cd:command> </cd:interface> <cd:interface file="i-pagemarks.xml"> - <cd:command file="page-lay.mkiv" level="style" name="markpage"> + <cd:command file="page-ini.mkiv" level="style" name="markpage"> <cd:arguments> <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant method="none" prefix="cd:sign" type="cd:number"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command category="conditional" file="page-lay.mkiv" level="style" name="doifelsemarkedpage"> + <cd:command file="page-ini.mkiv" level="style" name="markedpages"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="page-ini.mkiv" level="style" name="markpages" type="environment"> + <cd:arguments> + <cd:keywords> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="conditional" file="page-ini.mkiv" level="style" name="doifelsemarkedpage"> <cd:arguments> <cd:keywords delimiters="braces"> <cd:constant type="cd:name"/> @@ -33140,7 +33485,7 @@ <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="pageleft"> - <cd:resolve name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="pageright"> <cd:constant type="cd:command"/> @@ -33209,6 +33554,10 @@ <cd:constant default="yes" type="no"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant default="yes" type="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -33348,6 +33697,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> @@ -34043,6 +34398,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34050,6 +34406,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34057,6 +34414,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -34182,6 +34540,32 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setlocalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="language" file="scrp-ini.mkvi" level="style" name="setglobalscript"> + <cd:arguments> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command category="language" file="scrp-ini.mkvi" level="system" name="resetscript"/> <cd:command category="language" file="scrp-ini.mkvi" name="script" type="environment"> <cd:arguments> @@ -35955,10 +36339,7 @@ <cd:variable value="startstop"/> </cd:sequence> </cd:command> - <cd:command category="structure" file="core-sys.mkiv" level="document" name="startstop" type="environment"> - <cd:sequence> - <cd:string value=""/> - </cd:sequence> + <cd:command category="structure" file="core-sys.mkiv" level="document" name="" type="environment"> <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:name"/> @@ -36351,6 +36732,11 @@ <cd:keywords> <cd:constant type="cd:name"/> </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="font"> + <cd:constant type="cd:font"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> <cd:command category="symbols" file="symb-ini.mkiv" level="style" name="setupsymbolset"> @@ -38920,7 +39306,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="increment" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -38933,7 +39319,7 @@ </cd:command> <cd:command file="syst-aux.mkiv" level="system" name="decrement" variant="argument"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -41379,6 +41765,36 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoif"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifnot"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command file="syst-lua.mkiv" level="system" name="expandeddoifelse"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:true"/> + </cd:keywords> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:false"/> + </cd:keywords> + </cd:arguments> + </cd:command> <cd:command file="syst-lua.mkiv" level="system" name="expdoifelsecommon"> <cd:arguments> <cd:keywords delimiters="braces" list="yes"> @@ -41710,16 +42126,22 @@ <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> - <cd:parameter name="backgroundcolor"> + <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="foregroundcolor"> + <cd:parameter name="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="foregroundstyle"> <cd:constant type="cd:style"/> <cd:constant type="cd:command"/> </cd:parameter> + <cd:parameter name="foregroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> @@ -41960,7 +42382,7 @@ </cd:assignments> </cd:arguments> </cd:command> - <cd:command category="xml" file="strc-tag.mkiv" level="document" name="ignoretagsinexport"> + <cd:command category="xml" file="strc-tag.mkiv" level="style" name="ignoretagsinexport"> <cd:arguments> <cd:keywords list="yes"> <cd:constant type="cd:name"/> @@ -42379,7 +42801,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42391,7 +42813,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42403,7 +42825,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42415,7 +42837,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -42427,7 +42849,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -44992,6 +45414,20 @@ <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="smallskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="medskip"/> <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="bigskip"/> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="checkedblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="prerollblank"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> </cd:interface> <cd:interface file="i-whitespace.xml"> <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupwhitespace"> @@ -45042,6 +45478,7 @@ </cd:keywords> </cd:arguments> </cd:command> + <cd:command category="alignment" file="spac-ver.mkiv" level="system" name="forgetparskip"/> </cd:interface> <cd:interface file="i-xml.xml"> <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlmain"> @@ -46435,6 +46872,25 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="aligncharacter"> + <cd:constant type="yes"/> + <cd:constant default="yes" type="no"/> + </cd:parameter> + <cd:parameter name="alignmentleftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentrightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentleftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentrightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentcharacter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-attribute.xml b/tex/context/interface/mkiv/i-attribute.xml index 96a680e19..0ea4ce7c0 100644 --- a/tex/context/interface/mkiv/i-attribute.xml +++ b/tex/context/interface/mkiv/i-attribute.xml @@ -30,6 +30,7 @@ <cd:constant type="global"/> <cd:constant type="public" default="yes"/> <cd:constant type="private"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> @@ -42,6 +43,7 @@ <cd:constant type="global"/> <cd:constant type="public"/> <cd:constant type="private" default="yes"/> + <cd:constant type="pickup"/> </cd:keywords> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-backend.xml b/tex/context/interface/mkiv/i-backend.xml index 5db77b5bd..ff52eed7d 100644 --- a/tex/context/interface/mkiv/i-backend.xml +++ b/tex/context/interface/mkiv/i-backend.xml @@ -86,4 +86,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-buffer.xml b/tex/context/interface/mkiv/i-buffer.xml index 6dda83b64..0c94b7828 100644 --- a/tex/context/interface/mkiv/i-buffer.xml +++ b/tex/context/interface/mkiv/i-buffer.xml @@ -66,7 +66,7 @@ <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="strip"> - <cd:constant type="yes"/> + <cd:constant type="yes" default="yes"/> <cd:constant type="no"/> </cd:parameter> </cd:assignments> @@ -85,7 +85,7 @@ <cd:command name="getbuffer" level="document" category="buffer" file="buff-ini.mkiv"> <cd:arguments> - <cd:resolve name="keyword-buffer-optional"/> + <cd:resolve name="keyword-buffer-list-optional"/> </cd:arguments> </cd:command> @@ -168,7 +168,7 @@ </cd:arguments> </cd:command> - <cd:command name="getbufferdata" level="style" category="buffer" file="buff-ini.mkiv"> + <cd:command name="getbufferdata" level="style" category="buffer" file="buff-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-buffer-optional"/> </cd:arguments> @@ -231,4 +231,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-characteralign.xml b/tex/context/interface/mkiv/i-characteralign.xml index 3e9f81722..b95ff8487 100644 --- a/tex/context/interface/mkiv/i-characteralign.xml +++ b/tex/context/interface/mkiv/i-characteralign.xml @@ -24,10 +24,33 @@ <cd:command name="resetcharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + <cd:command name="nocharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + + <cd:command name="setcharacteraligndetail" level="system" category="alignment" file="typo-tal.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + <cd:keywords delimiters="braces"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:text" prefix="number" method="apply"/> + <cd:constant type="cd:text" prefix="text" method="apply"/> + </cd:keywords> + <cd:resolve name="argument-dimension"/> + <cd:resolve name="argument-dimension"/> + </cd:arguments> + </cd:command> + <cd:command name="alignmentcharacter" level="system" category="alignment" file="typo-tal.mkiv"/> <cd:command name="characteralign" type="environment" category="alignment" level="system" file="typo-tal.mkiv"> <cd:arguments> + <cd:assignments list="yes"> + <cd:inherit name="setupcharacteralign"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="characteralign" type="environment" variant="argument" category="alignment" level="system" file="typo-tal.mkiv"> + <cd:arguments> <cd:keywords optional="yes"> <cd:constant type="cd:text"/> <cd:constant type="cd:text" prefix="number" method="apply"/> @@ -42,4 +65,32 @@ </cd:arguments> </cd:command> + <cd:command name="setupcharacteralign" level="style" category="alignment" file="typo-tal.mkiv"> + <cd:arguments> + <cd:assignments list="yes"> + <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="leftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="rightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="character"> + <cd:constant type="cd:text"/> + <cd:constant type="cd:text" prefix="number" method="apply"/> + <cd:constant type="cd:text" prefix="text" method="apply"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setfirstpasscharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + + <cd:command name="setsecondpasscharacteralign" level="system" category="alignment" file="typo-tal.mkiv"/> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-common-keyword.xml b/tex/context/interface/mkiv/i-common-keyword.xml index 74a02890d..8469dab2f 100644 --- a/tex/context/interface/mkiv/i-common-keyword.xml +++ b/tex/context/interface/mkiv/i-common-keyword.xml @@ -792,4 +792,21 @@ </cd:keywords> </cd:define> -</cd:interface> + <!-- * --> + <!-- \... [...] --> + <!-- --> + <!-- * SCRIPT --> + + <cd:define name="keyword-script"> + <cd:keywords> + <cd:constant type="hangul"/> + <cd:constant type="hanzi"/> + <cd:constant type="nihongo"/> + <cd:constant type="ethiopic"/> + <cd:constant type="thai"/> + <cd:constant type="test"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:define> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 73e966d22..96e7b9c5a 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml index a328b6772..da34d4517 100644 --- a/tex/context/interface/mkiv/i-context.xml +++ b/tex/context/interface/mkiv/i-context.xml @@ -152,6 +152,7 @@ <cd:interfacefile filename="i-output.xml"/> <cd:interfacefile filename="i-overlay.xml"/> <cd:interfacefile filename="i-pagebreak.xml"/> + <cd:interfacefile filename="i-pagecolumns.xml"/> <cd:interfacefile filename="i-pagecomment.xml"/> <cd:interfacefile filename="i-pagefigure.xml"/> <cd:interfacefile filename="i-pagegrid.xml"/> diff --git a/tex/context/interface/mkiv/i-contextname.xml b/tex/context/interface/mkiv/i-contextname.xml new file mode 100644 index 000000000..3e289f3f5 --- /dev/null +++ b/tex/context/interface/mkiv/i-contextname.xml @@ -0,0 +1,2353 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="quotedbl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdollar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textpercent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textampersand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotesingle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcomma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthyphen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textperiod" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textslash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textat" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessJ" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbackslash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textasciicircum" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textunderscore" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbraceleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbraceright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textasciitilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="nobreakspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="exclamdown" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textsterling" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcurrency" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textyen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbrokenbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sectionmark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="copyright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ordfeminine" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="leftguillemot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textlognot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="softhyphen" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="registered" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdegree" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textpm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twosuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threesuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="paragraphmark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="periodcentered" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onesuperior" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ordmasculine" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rightguillemot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onequarter" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onehalf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threequarter" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="questiondown" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Agrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Atilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Egrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Igrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Icircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ograve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Otilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmultiply" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ostroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ugrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ucircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Thorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ssharp" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="agrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="atilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aeligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="egrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="eacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="igrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="icircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idiaeresis" level="document" category="characters" file="char-def.lua"/> + + comment="contextname=eth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ograve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="otilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdiv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ostroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ugrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ucircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="thorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ydiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Amacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="amacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ccaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Emacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Eogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="eogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Itilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="itilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Imacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="imacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ibreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ibreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="IJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ijligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Jcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="jcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Kcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kkra" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ldotmiddle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ldotmiddle" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Nacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="nacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ncommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ncaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="napostrophe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Neng" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="neng" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Omacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="omacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Obreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="obreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="OEligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oeligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Racute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="racute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Sacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Utilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="utilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Umacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="umacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ubreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ubreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Wcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="wcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ycircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ycircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ydiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="slong" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="bstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Bhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Chook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="chook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dafrican" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Schwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Fhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ghook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Istroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Khook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="khook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Phook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="phook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Thook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="thook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="DZcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dzcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dzcaronligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="LJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ljligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ljligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="NJligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Njligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="njligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Icaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="icaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ucaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ucaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresisacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresisacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresiscaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresiscaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udiaeresisgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udiaeresisgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Kcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="kcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oogonekmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oogonekmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="jcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="DZligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Dzligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dzligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Gacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="gacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Aringacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aringacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="AEacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="aeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ostrokeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ostrokeacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ainvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ainvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Einvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="einvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Iinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="iinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Oinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Rinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="rinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uinvertedbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Scommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="scommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Tcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcommaaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Hcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Zhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecedilla" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odiaeresismacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Otildemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="otildemacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotaccentmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ymacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ymacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="lcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ncurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="tcurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Astroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Cstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Lbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="bhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ccurl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="schwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="schwahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="dotlessjstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcircumflex" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcaron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdotaccent" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textring" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textogonek" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texttilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthungarumlaut" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbottomdot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbottomcomma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlpha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekBeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekGamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekDelta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekZeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekTheta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIota" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekKappa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekLambda" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekMu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekNu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekXi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekRho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekSigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekTau" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPhi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekChi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekPsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalpha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekbeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekgamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdelta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekzeta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektheta" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiota" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekkappa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeklambda" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekmu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeknu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekxi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekfinalsigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greektau" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilon" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekphi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekchi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytika" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekthetaalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekphialt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpialt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekkoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekstigma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdigamma" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeknumkoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksampi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhoalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeksigmalunate" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonalt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekSigmalunate" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicNJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTSHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKJE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUSHRT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicB" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicG" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicD" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZ" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicISHRT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicK" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicL" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicM" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicP" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicR" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicU" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicF" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSHCH" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHRDSN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicERY" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSFTSN" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEREV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYU" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillica" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicb" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicg" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicd" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillice" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicz" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillici" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicishrt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillico" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicp" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillics" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillict" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillich" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicch" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicshch" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillichrdsn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicery" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsftsn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicerev" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyu" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicya" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicgje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicie" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdze" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicnje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictshe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickje" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicigrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicushrt" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdzhe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomega" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYAT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyat" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliceiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLITTLEYUS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclittleyus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicLITTLEYUSiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliclittleyusiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicBIGYUS" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicbigyus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicBIGYUSiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicbigyusiotified" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKSI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicksi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPSI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicpsi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicFITA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicfita" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIZHITSA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicizhitsa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIZHITSAdoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicizhitsadoublegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUK" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicuk" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGAround" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomegaround" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOMEGAtitlo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicomegatitlo" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicot" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKOPPA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickoppa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTITLO" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPALATALIZATION" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDASIAPNEUMATA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPSILIPNEUMATA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicISHRTtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicishrttail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSEMISOFT" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsemisoft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicERtick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicertick" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEupturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicgheupturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicghestroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicGHEmidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicghemidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEdescender" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhedescender" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZDSC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczdsc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKADC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickadc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAvertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickavertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickastroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAbashkir" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickabashkir" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicendc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENGHE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicenghe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPEmidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicpemidhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSDSC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicsdsc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTEDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictedc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYstr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicystr" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYstrstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicystrstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicHADC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillichadc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicTETSE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillictetse" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEDC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchedc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEvertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchevertstroke" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSHHA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicshha" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliccheabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEDCabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchedcabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicPALOCHKA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicKAhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillickahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicELtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliceltail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicenhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicENtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicentail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEkhakassian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchekhakassian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEMtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicemtail" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicabreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicadiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicAE" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicae" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEbreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicebreve" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSCHWA" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicschwa" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicSCHWAdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicschwadiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZHEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczhediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicZEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrilliczediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicDZEabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicdzeabkhasian" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicImacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicimacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicIdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicidiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicOdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicodiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicObarred" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicobarred" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicObarreddiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicobarreddiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicumacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicudiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicUdoubleacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicudoubleacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicCHEdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicchediaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicYERUdiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="cyrillicyerudiaeresis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewAlef" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewBet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewGimel" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewDalet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewHe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewVav" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewZayin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewHet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewYod" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewKaffinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewKaf" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewLamed" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewMemfinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewMem" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewNunfinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewNun" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewSamekh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewAyin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewPefinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewPe" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTsadifinal" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTsadi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewQof" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewResh" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewShin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hebrewTav" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Adotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="adotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ahook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Acircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="acircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abreveacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abreveacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevegrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevetilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevetilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Abrevedotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="abrevedotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Edotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="edotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ehook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Etilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="etilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ecircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ecircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ihook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ihook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Idotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="idotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Odotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="odotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexgrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflextilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ocircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ocircumflexdotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ohorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ohorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Udotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="udotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhornacute" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorngrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhornhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorntilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Uhorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="uhorndotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ygrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ygrave" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ydotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ydotbelow" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="yhook" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="Ytilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ytilde" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicrondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilondasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegapsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegadasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekepsilonoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomicronoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasubdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekalphaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekAlphaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekCoronis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekprosgegrammeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greeketaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekEtaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsilivaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsilitonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekpsiliperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekiotadialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotavrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotamacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekIotatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasiaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonvrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhopsili" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekrhodasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilonperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekupsilondialytikaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonvrachy" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonmacron" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilonvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekUpsilontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekRhodasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdialytikatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubtonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekomegaiotasubperispomeni" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicronvaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmicrontonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegavaria" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegatonos" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekOmegaiotasub" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekoxia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="greekdasia" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="enspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threeperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fourperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="sixperemspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="figurespace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="punctuationspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="breakablethinspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="hairspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zerowidthspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zwnj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zwj" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textminus" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="endash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="emdash" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texthorizontalbar" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quoteleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quoteright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotesinglebase" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="quotedblbase" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdag" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textddag" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textbullet" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textellipsis" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="narrownobreakspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="perthousand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="guilsingleleft" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="guilsingleright" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textfraction" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="medspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textdong" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="texteuro" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcelsius" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textnumero" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textcircledP" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="trademark" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textounce" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textohm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textmho" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textkelvin" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="textAngstrom" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onethird" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twothirds" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onefifth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="twofifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threefifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fourfifths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="onesixth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fivesixths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="oneeighth" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="threeeighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fiveeighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="seveneighths" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanV" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanVIII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanIX" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanX" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanXI" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanXII" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanL" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanC" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanD" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanM" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romani" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romaniii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romaniv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanv" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanvi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanvii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanviii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanix" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanx" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanxi" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanxii" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanl" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanc" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romand" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="romanm" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="carriagereturn" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ideographicspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ideographichalffillspace" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ffligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="filigature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="flligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="ffiligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="fflligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="stligature" level="document" category="characters" file="char-def.lua"/> + + <cd:command name="zerowidthnobreakspace" level="document" category="characters" file="char-def.lua"/> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-description.xml b/tex/context/interface/mkiv/i-description.xml index f2cf33e82..9d71bd1a1 100644 --- a/tex/context/interface/mkiv/i-description.xml +++ b/tex/context/interface/mkiv/i-description.xml @@ -55,6 +55,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -129,6 +130,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> </cd:assignments> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-effect.xml b/tex/context/interface/mkiv/i-effect.xml index d20a62cd4..b71306fff 100644 --- a/tex/context/interface/mkiv/i-effect.xml +++ b/tex/context/interface/mkiv/i-effect.xml @@ -26,7 +26,7 @@ <cd:constant type="cd:number"/> </cd:parameter> <cd:parameter name="rulethickness"> - <cd:constant type="cd:number"/> + <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="alternative"> <cd:constant type="normal" default="yes"/> diff --git a/tex/context/interface/mkiv/i-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml index 149f4f613..0f286b8b5 100644 --- a/tex/context/interface/mkiv/i-enumeration.xml +++ b/tex/context/interface/mkiv/i-enumeration.xml @@ -101,6 +101,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top" default="yes"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="cd:name"/> </cd:parameter> @@ -175,6 +176,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> diff --git a/tex/context/interface/mkiv/i-file.xml b/tex/context/interface/mkiv/i-file.xml index df649e8e0..bf12e5825 100644 --- a/tex/context/interface/mkiv/i-file.xml +++ b/tex/context/interface/mkiv/i-file.xml @@ -407,4 +407,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-fittingpage.xml b/tex/context/interface/mkiv/i-fittingpage.xml index 8c2003568..7fc3a6cff 100644 --- a/tex/context/interface/mkiv/i-fittingpage.xml +++ b/tex/context/interface/mkiv/i-fittingpage.xml @@ -100,4 +100,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml index ef68fe985..2b25adf49 100644 --- a/tex/context/interface/mkiv/i-floats.xml +++ b/tex/context/interface/mkiv/i-floats.xml @@ -231,9 +231,151 @@ </cd:arguments> </cd:command> + <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="suffix"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixseparator"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="suffixstopper"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="location"> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="middle"/> + <cd:constant type="low"/> + <cd:constant type="high"/> + <cd:constant type="grid"/> + <cd:constant type="lines"/> + <cd:constant type="overlay"/> + <cd:constant type="inner"/> + <cd:constant type="outer"/> + <cd:constant type="innermargin"/> + <cd:constant type="outermargin"/> + <cd:constant type="leftmargin"/> + <cd:constant type="rightmargin"/> + <cd:constant type="lefthanging"/> + <cd:constant type="righthanging"/> + <cd:constant type="hang"/> + <cd:constant type="top"/> + <cd:constant type="bottom" default="yes"/> + <cd:constant type="stretch"/> + <cd:constant type="tolerant"/> + <cd:constant type="verytolerant"/> + <cd:constant type="none"/> + <cd:constant type="default"/> + </cd:parameter> + <cd:parameter name="command"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="numbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="textcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="spacebefore"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="spaceafter"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="headseparator"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="topoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="bottomoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="number"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + <cd:constant type="none"/> + </cd:parameter> + <cd:parameter name="group"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="leftmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightmargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="innermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="outermargin"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="max"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="minwidth"> + <cd:constant type="fit" default="yes"/> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupcounter"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupfloatcaption"/> + </cd:assignments> + </cd:arguments> + </cd:command> + --> - <cd:command name="setupfloatcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> + <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -293,7 +435,12 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> - <!-- headstyle headcolor headseparator --> + <cd:parameter name="headstyle"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="headcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="headseparator"> <cd:constant type="cd:text"/> </cd:parameter> @@ -352,20 +499,11 @@ </cd:arguments> </cd:command> - <cd:command name="setupcaption" level="style" category="structure fonts counter" file="strc-flt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> - </cd:assignments> - </cd:arguments> - </cd:command> - <cd:command name="setupcaptions" level="style" category="structure fonts counter" file="strc-flt.mkvi"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> - <cd:inherit name="setupfloatcaption"/> + <cd:inherit name="setupcaption"/> </cd:assignments> </cd:arguments> </cd:command> @@ -797,4 +935,44 @@ </cd:arguments> </cd:command> + <cd:command name="definefacingfloat" level="style" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupfacingfloat"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupfacingfloat" level="style" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="inbetween"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:parameter name="spaceinbetween"> + <cd:inherit name="blank"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="facingfloat" type="environment" level="document" category="structure" file="page-ffl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-formula.xml b/tex/context/interface/mkiv/i-formula.xml index 07127a629..72693fb6c 100644 --- a/tex/context/interface/mkiv/i-formula.xml +++ b/tex/context/interface/mkiv/i-formula.xml @@ -274,6 +274,7 @@ <cd:command name="placeformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> @@ -303,12 +304,14 @@ <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> <cd:resolve name="argument-text"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> <cd:command name="placesubformula" level="document" category="mathematics" file="strc-mat.mkiv"> <cd:arguments> <cd:resolve name="keyword-formulareference-list-optional"/> + <cd:resolve name="argument-text-optional"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml index e026465a1..a4667dd2e 100644 --- a/tex/context/interface/mkiv/i-framed.xml +++ b/tex/context/interface/mkiv/i-framed.xml @@ -627,4 +627,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-graphics.xml b/tex/context/interface/mkiv/i-graphics.xml index b848b0e5e..a71291a2a 100644 --- a/tex/context/interface/mkiv/i-graphics.xml +++ b/tex/context/interface/mkiv/i-graphics.xml @@ -218,12 +218,6 @@ <cd:parameter name="cache"> <cd:constant type="cd:path"/> </cd:parameter> - <cd:parameter name="userpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> - <cd:parameter name="ownerpassword"> - <cd:constant type="cd:string"/> - </cd:parameter> <cd:parameter name="resources"> <cd:constant type="cd:path"/> </cd:parameter> @@ -242,6 +236,16 @@ <!-- only passed by the system: --> <cd:constant type="cd:number"/> </cd:parameter> + <cd:parameter name="transform"> + <cd:constant type="auto" default="yes"/> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="userpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="ownerpassword"> + <cd:constant type="cd:text"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -530,4 +534,16 @@ </cd:arguments> </cd:command> -</cd:interface> + <cd:command name="overlayimage" level="style" category="graphics" file="pack-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + + <cd:command name="clippedoverlayimage" level="style" category="graphics" file="pack-box.mkiv"> + <cd:arguments> + <cd:resolve name="argument-file"/> + </cd:arguments> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-grid.xml b/tex/context/interface/mkiv/i-grid.xml index bd96388f3..cb70fa416 100644 --- a/tex/context/interface/mkiv/i-grid.xml +++ b/tex/context/interface/mkiv/i-grid.xml @@ -174,6 +174,12 @@ <cd:parameter name="color"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="rulecolor"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="rulethickness"> + <cd:constant type="cd:dimension"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index 5926d864d..cc3c32f3d 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -91,6 +91,7 @@ <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="negenspace" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="enskip" level="style" category="whitespace" file="spac-hor.mkiv"/> @@ -100,6 +101,7 @@ <cd:command name="qquad" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="emspace" level="style" category="whitespace" file="spac-hor.mkiv"/> + <cd:command name="negemspace" level="style" category="whitespace" file="spac-hor.mkiv"/> <cd:command name="dotfskip" level="system" category="whitespace" file="spac-hor.mkiv"> diff --git a/tex/context/interface/mkiv/i-kerning.xml b/tex/context/interface/mkiv/i-kerning.xml index b45e916f2..64a2513b9 100644 --- a/tex/context/interface/mkiv/i-kerning.xml +++ b/tex/context/interface/mkiv/i-kerning.xml @@ -90,4 +90,36 @@ </cd:arguments> </cd:command> + <cd:command name="defineperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setupperiodkerning"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="factor"> + <cd:constant type="cd:number"/> + </cd:parameter> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"> + <cd:arguments> + <cd:keywords> + <cd:constant type="reset"/> + <cd:constant type="cd:name"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="resetperiodkerning" level="style" catgeory="fonts whitespace" file="typo-pnc.mkic"/> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-label.xml b/tex/context/interface/mkiv/i-label.xml index a09360aa7..a1d36ef43 100644 --- a/tex/context/interface/mkiv/i-label.xml +++ b/tex/context/interface/mkiv/i-label.xml @@ -101,6 +101,7 @@ <cd:constant type="serried"/> <cd:constant type="hanging"/> <cd:constant type="top"/> + <cd:constant type="empty"/> <cd:constant type="command"/> <cd:constant type="intext" default="yes"/> <cd:constant type="cd:name"/> @@ -176,6 +177,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> diff --git a/tex/context/interface/mkiv/i-layout.xml b/tex/context/interface/mkiv/i-layout.xml index 19b233988..4370cc4f5 100644 --- a/tex/context/interface/mkiv/i-layout.xml +++ b/tex/context/interface/mkiv/i-layout.xml @@ -197,6 +197,7 @@ </cd:parameter> <cd:parameter name="cropoffset"> <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> </cd:parameter> <cd:parameter name="trimoffset"> <cd:constant type="cd:dimension"/> @@ -367,14 +368,14 @@ <cd:command name="spread" type="environment" level="document" category="layout" file="page-spr.mkiv"/> - <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doifelsetopofpage" level="system" category="layout conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> </cd:arguments> </cd:command> - <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-lay.mkiv"> + <cd:command name="doiftopofpageelse" level="system" category="layout conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-true"/> <cd:resolve name="argument-false"/> diff --git a/tex/context/interface/mkiv/i-linefiller.xml b/tex/context/interface/mkiv/i-linefiller.xml index d3d98f446..ab53e64b0 100644 --- a/tex/context/interface/mkiv/i-linefiller.xml +++ b/tex/context/interface/mkiv/i-linefiller.xml @@ -4,7 +4,7 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definelinefiller" file="node-rul.mkiv"> + <cd:command name="definelinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> @@ -14,7 +14,7 @@ </cd:arguments> </cd:command> - <cd:command name="setuplinefiller" file="node-rul.mkiv"> + <cd:command name="setuplinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -72,9 +72,33 @@ </cd:arguments> </cd:command> - <cd:command name="filler" file="node-rul.mkiv"> + <cd:command name="setuplinefillers" level="style" category="rules metapost" file="node-rul.mkiv"> <cd:arguments> - <cd:content/> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="linefiller" type="environment" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuplinefiller"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setlinefiller" level="style" category="rules metapost" file="node-rul.mkiv"> + <cd:arguments> + <cd:keywords> + <cd:constant type="filler"/> + <cd:constant type="cd:name"/> + </cd:keywords> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-list.xml b/tex/context/interface/mkiv/i-list.xml index 8d4863dd2..a3ae22676 100644 --- a/tex/context/interface/mkiv/i-list.xml +++ b/tex/context/interface/mkiv/i-list.xml @@ -55,7 +55,9 @@ <cd:parameter name="width"> <cd:constant type="fit"/> <cd:constant type="broad"/> - <cd:constant type="auto"/> + <!-- + <cd:constant type="auto"/> + --> <cd:constant type="cd:dimension"/> </cd:parameter> <cd:parameter name="height"> @@ -386,7 +388,7 @@ <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-list-list"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -395,7 +397,55 @@ <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:parameter name="criterium"> + <cd:constant type="local" default="yes"/> + <cd:constant type="intro"/> + <cd:constant type="reference"/> + <cd:constant type="reference" prefix="cd:sectionblock" method="range"/> + <cd:constant type="all"/> + <cd:constant type="all" prefix="cd:sectionblock" method="range"/> + <cd:constant type="text"/> + <cd:constant type="text" prefix="cd:sectionblock" method="range"/> + <cd:constant type="current"/> + <cd:constant type="current" prefix="cd:sectionblock" method="range"/> + <cd:constant type="here"/> + <cd:constant type="previous"/> + <cd:constant type="previous" prefix="cd:sectionblock" method="range"/> + <cd:constant type="component"/> + <cd:constant type="cd:section"/> + <cd:constant type="cd:section" prefix="cd:sectionblock" method="range"/> + </cd:parameter> + <cd:parameter name="reference"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="extras"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="order"> + <cd:constant type="command"/> + <cd:constant type="all"/> + <cd:constant type="title"/> + </cd:parameter> + <cd:parameter name="alternative"> + <cd:constant type="a"/> + <cd:constant type="b" default="yes"/> + <cd:constant type="c"/> + <cd:constant type="d"/> + <cd:constant type="e"/> + <cd:constant type="f"/> + <cd:constant type="g"/> + <cd:constant type="left"/> + <cd:constant type="right"/> + <cd:constant type="top"/> + <cd:constant type="bottom"/> + <cd:constant type="command"/> + <cd:constant type="none"/> + <cd:constant type="interactive"/> + <cd:constant type="paragraph"/> + <cd:constant type="horizontal"/> + <cd:constant type="vertical"/> + <cd:constant type="cd:name"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -404,7 +454,7 @@ <cd:arguments> <cd:resolve name="keyword-list"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> </cd:command> @@ -416,7 +466,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -431,7 +481,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> @@ -446,7 +496,7 @@ </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuplist"/> + <cd:inherit name="setupcombinedlist"/> </cd:assignments> </cd:arguments> <cd:instances> diff --git a/tex/context/interface/mkiv/i-math.xml b/tex/context/interface/mkiv/i-math.xml index af9d87cb8..ae8fa1c3e 100644 --- a/tex/context/interface/mkiv/i-math.xml +++ b/tex/context/interface/mkiv/i-math.xml @@ -35,6 +35,7 @@ <cd:parameter name="align"> <cd:constant type="l2r" default="yes"/> <cd:constant type="r2l"/> + <cd:constant type="righttoleft"/> </cd:parameter> <cd:parameter name="bidi"> <cd:constant type="yes"/> @@ -109,6 +110,17 @@ <cd:parameter name="ampersand"> <cd:constant type="normal"/> </cd:parameter> + <cd:parameter name="collapsing"> + <cd:constant type="1"/> + <cd:constant type="2"/> + <cd:constant type="3" default="yes"/> + <cd:constant type="none"/> + <cd:constant type="reset"/> + </cd:parameter> + <cd:parameter name="kernpairs"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> </cd:assignments> </cd:arguments> </cd:command> @@ -499,4 +511,4 @@ </cd:arguments> </cd:command> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml index bd1452cdc..581a6928a 100644 --- a/tex/context/interface/mkiv/i-mathmatrix.xml +++ b/tex/context/interface/mkiv/i-mathmatrix.xml @@ -90,6 +90,15 @@ --> + <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics tables" file="math-ali.mkiv"> + <cd:sequence> + <cd:variable value="mathmatrix"/> + </cd:sequence> + <cd:arguments> + <cd:content/> + </cd:arguments> + </cd:command> + <cd:command name="matrices" type="environment" level="document" category="mathematics tables" file="math-ali.mkiv"> <cd:arguments> <cd:assignments list="yes" optional="yes"> diff --git a/tex/context/interface/mkiv/i-mathname.xml b/tex/context/interface/mkiv/i-mathname.xml new file mode 100644 index 000000000..63dab0991 --- /dev/null +++ b/tex/context/interface/mkiv/i-mathname.xml @@ -0,0 +1,1091 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="mathhash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathdollar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathpercent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathampersand" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mathhyphen" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lt" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gt" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backslash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Hat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="grave" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="yen" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="S" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ddot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pm" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="acute" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="P" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="centerdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="times" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="div" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lambdabar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="check" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="breve" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ring" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tilde" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="widehat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="widetilde" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="not" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Alpha" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Beta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Gamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Delta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Epsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Zeta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Eta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Theta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Iota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Kappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lambda" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Xi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Omicron" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Pi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Sigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Tau" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Upsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Phi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Chi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Psi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Omega" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="alpha" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="beta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="delta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varepsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="zeta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="theta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="iota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="kappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lambda" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nu" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="xi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="omicron" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varsigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sigma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tau" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varphi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="chi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="psi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="omega" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varTheta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="phi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varpi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="digamma" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="epsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backepsilon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bullet" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="doubleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="tripleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reversedprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reverseddoubleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reversedtripleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="quadrupleprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="invisibletimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="positivesign" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="negativesign" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dddot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsquare" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigdiamond" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="actuarial" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="complexes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Eulerconst" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Plankconst" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Im" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ell" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="naturalnumbers" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="primes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rationals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Re" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="reals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="integers" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ohm" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mho" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="turnediota" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Angstrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Finv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="aleph" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="beth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gimel" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="daleth" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Game" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sansLturned" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sansLmirrored" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Yup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="differentialD" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="differentiald" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="exponentiale" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imaginaryi" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imaginaryj" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="PropertyLine" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upand" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="uparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="searrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="swarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightwavearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheaduparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheaddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mapsdown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hookleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="hookrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="looparrowleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="looparrowright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downzigzagarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Ldsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rdsh" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="linefeed" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="carriagereturn" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curvearrowleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curvearrowright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barovernorthwestarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barleftarrowrightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightharpoonup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightharpoondown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downharpoonright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downharpoonleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updownarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftleftarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upuparrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightrightarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downdownarrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightharpoons" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightleftharpoons" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nLeftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nLeftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nRightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Leftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Uparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Downarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Leftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Updownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Nearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Searrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Swarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Lleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Rrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nHuparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nHdownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="updasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downdasharrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowbar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="upwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downwhitearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="whitearrowupfrombar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circleonrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="downuparrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightthreearrows" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftrightarrowtriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="forall" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="complement" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="partial" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="exists" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nexists" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="emptyset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nabla" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="in" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prod" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="coprod" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sum" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="mp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dotplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diagup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diagdown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circ" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="propto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="infty" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="angle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="measuredangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sphericalangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="divides" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nparallel" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oiint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oiiint" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="intclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ointclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ointctrclockwise" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="therefore" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="because" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="squaredots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dotminus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="minuscolon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="simeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsimeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approxnEq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approx" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="napprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="approxeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="asymp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Bumpeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="doteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="fallingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="risingdotseq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="colonequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="equalscolon" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="wedgeeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="veeeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="stareq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="definedeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="measuredeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="questionedeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="equiv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nequiv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="geqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ll" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gg" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="between" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nasymp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nleq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesssim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nlesssim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtrsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nlessgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ngtrless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="prec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succ" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succcurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nprec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsucc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsubset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsupset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="uplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ominus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="otimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="oslash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="odot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledast" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circleddash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxminus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="boxdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashv" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="top" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="models" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Vdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Vvdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="VDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nvDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVdash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nVDash" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="multimap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="intercal" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="veebar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="barwedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigwedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigvee" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diamond" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="star" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="divideontimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ltimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leftthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rightthreetimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyvee" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlywedge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Subset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Supset" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="pitchfork" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrdot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesseqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtreqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyeqprec" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="curlyeqsucc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="npreccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsucccurlyeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsqsubseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nsqsupseteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsubsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sqsupsetneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succnsim" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntriangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntrianglelefteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ntrianglerighteq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vdots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="cdots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="udots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ddots" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lceil" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rceil" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lfloor" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rfloor" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="ulcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="urcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lrcorner" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="frown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="smile" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lmoustache" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rmoustache" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underparent" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="overbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="underbrace" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledR" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="circledS" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacksquare" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleright" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangledown" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacktriangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="triangleleft" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lozenge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigcirc" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigstar" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="spadesuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="heartsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="diamondsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="clubsuit" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="blacklozenge" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="flat" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="natural" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="sharp" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="checkmark" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="maltese" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rrbracket" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="langle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="llangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rrangle" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lgroup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rgroup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longleftrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longmapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Longmapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="longrightsquigarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mapsfrom" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Mapsto" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Uuparrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="Ddownarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashedleftarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dashedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="dottedrightarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="twoheadrightarrowtail" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="nwsearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="neswarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lhooknwarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rhooknearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lhooksearrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rhookswarrow" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigodot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigoplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigotimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigudot" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="biguplus" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsqcap" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigsqcup" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="bigtimes" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="amalg" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="coloncolonequals" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqeqeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="leqslant" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="geqslant" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lessapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtrapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="rneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="lesseqqgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="gtreqqless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqslantless" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="eqslantgtr" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preceq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succeq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succneq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="preceqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succeqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="precnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="succnapprox" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subseteqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supseteqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="subsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="supsetneqq" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="backprime" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="imath" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="jmath" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="vartheta" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varkappa" level="document" category="character mathematics" file="char-def.lua"/> + + <cd:command name="varrho" level="document" category="character mathematics" file="char-def.lua"/> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-narrow.xml b/tex/context/interface/mkiv/i-narrow.xml index 5133b6302..a229a2112 100644 --- a/tex/context/interface/mkiv/i-narrow.xml +++ b/tex/context/interface/mkiv/i-narrow.xml @@ -75,7 +75,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> @@ -100,7 +100,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> @@ -118,7 +118,7 @@ <cd:constant type="right" prefix="cd:number" method="factor"/> <cd:constant type="reset"/> <cd:constant type="reverse"/> - </cd:keywords> + </cd:keywords> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index 9bcf43d5b..03e53a0e3 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -183,6 +183,10 @@ <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="aligntitle"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <!-- end construction values --> <cd:inherit name="setupcounter"/> </cd:assignments> @@ -467,6 +471,8 @@ <cd:command name="flushnotes" level="style" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="postponingnotes" type="environment" category="structure notes" file="strc-not.mkvi"/> + <cd:command name="doifelsenoteonsamepage" level="system" category="structure notes conditional" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="argument-name"/> diff --git a/tex/context/interface/mkiv/i-pagecolumns.xml b/tex/context/interface/mkiv/i-pagecolumns.xml new file mode 100644 index 000000000..493f9c1dc --- /dev/null +++ b/tex/context/interface/mkiv/i-pagecolumns.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?context-directive job ctxfile x-setups.ctx ?> + +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> + + <cd:command name="definepagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuppagecolumns" level="style" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="separator"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="direction"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="maxwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <!-- + <cd:parameter name="maxheight"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="step"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + --> + <cd:parameter name="align"> + <cd:inherit name="setupalign"/> + </cd:parameter> + <cd:parameter name="blank"> + <cd:inherit name="blank"/> + </cd:parameter> + <!-- + <cd:parameter name="profile"> + <cd:inherit name="setprofile"/> + </cd:parameter> + --> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="setups"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" variant="name" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagecolumns"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="pagecolumns" type="environment" generated="yes" variant="instance" level="document" category="structure layout" file="page-pcl.mkiv"> + <cd:sequence> + <cd:instance value="pagecolumns"/> + </cd:sequence> + </cd:command> + +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-pagegrid.xml b/tex/context/interface/mkiv/i-pagegrid.xml index 8e53ef8fc..3d08d8b8d 100644 --- a/tex/context/interface/mkiv/i-pagegrid.xml +++ b/tex/context/interface/mkiv/i-pagegrid.xml @@ -4,17 +4,76 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="definepagegrid" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definecolumnset" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegrid" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="nleft"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="nright"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="width"> + <cd:constant type="cd:dimension"/> + <cd:constant type="auto"/> + </cd:parameter> + <cd:parameter name="distance"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="lines"> + <cd:constant type="cd:number"/> + </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="direction"> + <cd:constant type="normal" default="yes"/> + <cd:constant type="reverse"/> + </cd:parameter> + <cd:parameter name="page"> + <cd:inherit name="page"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnset" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -55,57 +114,121 @@ </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="pagegrid" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> + <cd:sequence> + <cd:variable value="pagegrid"/> + </cd:sequence> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegrid"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="columnset" type="environment" generated="yes" variant="example" level="document" category="layout" file="page-cst.mkiv"> <cd:sequence> - <cd:variable value="pagegrid"/> + <cd:variable value="columnset"/> </cd:sequence> <cd:arguments> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagegrid" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:command name="columnset" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegrid"/> + <cd:inherit name="setupcolumnset"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> - <cd:arguments> - <cd:assignments list="yes" optional="yes"> - <cd:parameter name="c"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="r"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="option"> - <cd:constant type="none" default="yes"/> - <!-- + <!-- + + <cd:command name="setpagegrid" level="document" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="c"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="r"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="option"> + <cd:constant type="none" default="yes"/> <cd:constant type="wide"/> - --> - </cd:parameter> - </cd:assignments> - <cd:content/> - </cd:arguments> - </cd:command> + </cd:parameter> + </cd:assignments> + <cd:content/> + </cd:arguments> + </cd:command> - <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:command name="definepagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegridspan"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definecolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegridspan" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="n"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="before"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="after"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetspan" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -129,32 +252,111 @@ </cd:arguments> </cd:command> - <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="pagegridspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegridspan"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="columnsetspan" type="environment" level="document" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridspan"/> + <cd:inherit name="setupcolumnsetspan"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="pagegridspanwidth" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="argument-number"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="columnsetspanwidth" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="argument-number"/> </cd:arguments> </cd:command> - <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="definepagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-name-optional"/> + <cd:assignments list="yes" optional="yes"> + <cd:inherit name="setuppagegridarea"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="definecolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-name-optional"/> <cd:assignments list="yes" optional="yes"> - <cd:inherit name="setuppagegridarea"/> + <cd:inherit name="setupcolumnsetarea"/> </cd:assignments> </cd:arguments> </cd:command> - <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegridarea" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:parameter name="state"> + <cd:constant type="start"/> + <cd:constant type="stop" default="yes"/> + <cd:constant type="repeat"/> + </cd:parameter> + <cd:parameter name="x"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="y"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="nx"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="ny"> + <cd:constant type="cd:number"/> + </cd:parameter> + <cd:parameter name="style"> + <cd:resolve name="value-style"/> + </cd:parameter> + <cd:parameter name="color"> + <cd:constant type="cd:color"/> + </cd:parameter> + <cd:parameter name="clipoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="rightoffset"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:inherit name="setupframed"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetarea" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list-optional"/> <cd:assignments list="yes"> @@ -192,14 +394,38 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegridareatext" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-text"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetareatext" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-text"/> </cd:arguments> </cd:command> - <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegridlines" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetlines" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> @@ -208,7 +434,20 @@ </cd:arguments> </cd:command> - <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv"> + <!-- + + <cd:command name="setuppagegridstart" level="style" category="layout" file="page-cst.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + <cd:resolve name="keyword-number"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="setupcolumnsetstart" level="style" category="layout" file="page-cst.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-number"/> diff --git a/tex/context/interface/mkiv/i-pagemarks.xml b/tex/context/interface/mkiv/i-pagemarks.xml index 036f518b9..4d41bbfdd 100644 --- a/tex/context/interface/mkiv/i-pagemarks.xml +++ b/tex/context/interface/mkiv/i-pagemarks.xml @@ -4,16 +4,28 @@ <cd:interface xmlns:cd="http://www.pragma-ade.com/commands"> - <cd:command name="markpage" level="style" file="page-lay.mkiv"> + <cd:command name="markpage" level="style" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> - <cd:keywords optional="yes"> + <cd:keywords list="yes" optional="yes"> <cd:constant type="cd:number" prefix="cd:sign" method="none"/> </cd:keywords> </cd:arguments> </cd:command> - <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-lay.mkiv"> + <cd:command name="markedpages" level="style" file="page-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="markpages" type="environment" level="style" file="page-ini.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name"/> + </cd:arguments> + </cd:command> + + <cd:command name="doifelsemarkedpage" level="style" category="conditional" file="page-ini.mkiv"> <cd:arguments> <cd:resolve name="argument-name"/> <cd:resolve name="argument-true"/> diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex 87725c503..afe48ba5a 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/interface/mkiv/i-register.xml b/tex/context/interface/mkiv/i-register.xml index 668781213..7ba3a0f7c 100644 --- a/tex/context/interface/mkiv/i-register.xml +++ b/tex/context/interface/mkiv/i-register.xml @@ -167,7 +167,7 @@ <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="pageleft"> - <cd:resolve name="cd:command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="pageright"> <cd:constant type="cd:command"/> @@ -225,6 +225,10 @@ <cd:constant type="no" default="yes"/> <cd:constant type="all"/> </cd:parameter> + <cd:parameter name="check"> + <cd:constant type="yes" default="yes"/> + <cd:constant type="no"/> + </cd:parameter> <cd:parameter name="criterium"> <cd:constant type="local"/> <cd:constant type="text"/> @@ -338,6 +342,12 @@ <cd:parameter name="pagecolor"> <cd:constant type="cd:color"/> </cd:parameter> + <cd:parameter name="pageleft"> + <cd:constant type="cd:command"/> + </cd:parameter> + <cd:parameter name="pageright"> + <cd:constant type="cd:command"/> + </cd:parameter> <cd:parameter name="n"> <cd:constant type="cd:number"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-scale.xml b/tex/context/interface/mkiv/i-scale.xml index 3d26ed76f..36a46479e 100644 --- a/tex/context/interface/mkiv/i-scale.xml +++ b/tex/context/interface/mkiv/i-scale.xml @@ -44,6 +44,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -51,6 +52,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> @@ -58,6 +60,7 @@ <cd:constant type="fit"/> <cd:constant type="broad"/> <cd:constant type="max"/> + <cd:constant type="min"/> <cd:constant type="auto"/> <cd:constant type="default"/> </cd:parameter> diff --git a/tex/context/interface/mkiv/i-script.xml b/tex/context/interface/mkiv/i-script.xml index 9af017492..affa2658b 100644 --- a/tex/context/interface/mkiv/i-script.xml +++ b/tex/context/interface/mkiv/i-script.xml @@ -47,15 +47,19 @@ <cd:command name="setscript" level="style" category="language" file="scrp-ini.mkvi"> <cd:arguments> - <cd:keywords> - <cd:constant type="hangul"/> - <cd:constant type="hanzi"/> - <cd:constant type="nihongo"/> - <cd:constant type="ethiopic"/> - <cd:constant type="thai"/> - <cd:constant type="test"/> - <cd:constant type="cd:name"/> - </cd:keywords> + <cd:resolve name="keyword-script"/> + </cd:arguments> + </cd:command> + + <cd:command name="setlocalscript" level="style" category="language" file="scrp-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-script"/> + </cd:arguments> + </cd:command> + + <cd:command name="setglobalscript" level="style" category="language" file="scrp-ini.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-script"/> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-section.xml b/tex/context/interface/mkiv/i-section.xml index f3cf13d3e..b4229d5fd 100644 --- a/tex/context/interface/mkiv/i-section.xml +++ b/tex/context/interface/mkiv/i-section.xml @@ -518,4 +518,4 @@ <cd:command name="headsetupspacing" level="system" category="structure" file="strc-ren.mkiv"/> -</cd:interface> +</cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-startstop.xml b/tex/context/interface/mkiv/i-startstop.xml index c7780488c..ba0abb0b7 100644 --- a/tex/context/interface/mkiv/i-startstop.xml +++ b/tex/context/interface/mkiv/i-startstop.xml @@ -57,10 +57,32 @@ </cd:sequence> </cd:command> - <cd:command name="startstop" type="environment" level="document" category="structure" file="core-sys.mkiv"> - <cd:sequence> - <cd:string value=""/><!-- value="zero width space --> - </cd:sequence> + <!-- + + Variant 1: <cd:string value="zero width space"/> + + <cd:command name="startstop" type="environment" level="document" category="structure" file="core-sys.mkiv"> + <cd:sequence> + <cd:string value=""/> + </cd:sequence> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + </cd:arguments> + </cd:command> + + Variant 2: <cd:delimiter name="stop"/> + + <cd:command name="start" level="document" category="structure" file="core-sys.mkiv"> + <cd:arguments> + <cd:resolve name="keyword-name-optional"/> + <cd:resolve name="string-content"/> + <cd:delimiter name="stop"/> + </cd:arguments> + </cd:command> + + --> + + <cd:command name="" type="environment" level="document" category="structure" file="core-sys.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-optional"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-symbol.xml b/tex/context/interface/mkiv/i-symbol.xml index 123e98cbf..498684cad 100644 --- a/tex/context/interface/mkiv/i-symbol.xml +++ b/tex/context/interface/mkiv/i-symbol.xml @@ -119,6 +119,11 @@ <cd:command name="symbolset" type="environment" level="style" category="symbols" file="symb-ini.mkiv"> <cd:arguments> <cd:resolve name="keyword-name"/> + <cd:assignments list="yes" optional="yes"> + <cd:parameter name="font"> + <cd:constant type="cd:font"/> + </cd:parameter> + </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml index 44def10e0..b06add710 100644 --- a/tex/context/interface/mkiv/i-system.xml +++ b/tex/context/interface/mkiv/i-system.xml @@ -1641,7 +1641,7 @@ <cd:command name="increment" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -1656,7 +1656,7 @@ <cd:command name="decrement" variant="argument" level="system" file="syst-aux.mkiv"> <cd:arguments> - <cd:keywords delimiters="parentheses" list="yes"> + <cd:keywords delimiters="parenthesis" list="yes"> <cd:constant type="cd:csname"/> <cd:constant type="cd:number"/> </cd:keywords> @@ -3601,6 +3601,31 @@ </cd:arguments> </cd:command> + <cd:command name="expandeddoif" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expandeddoifnot" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + </cd:arguments> + </cd:command> + + <cd:command name="expandeddoifelse" level="system" file="syst-lua.mkiv"> + <cd:arguments> + <cd:content/> + <cd:content/> + <cd:resolve name="argument-true"/> + <cd:resolve name="argument-false"/> + </cd:arguments> + </cd:command> + <cd:command name="expdoifelsecommon" level="system" file="syst-lua.mkiv"> <cd:arguments> <cd:resolve name="argument-text-list"/> diff --git a/tex/context/interface/mkiv/i-tabulation.xml b/tex/context/interface/mkiv/i-tabulation.xml index 8dc0f1d2c..6768b9b4c 100644 --- a/tex/context/interface/mkiv/i-tabulation.xml +++ b/tex/context/interface/mkiv/i-tabulation.xml @@ -44,15 +44,21 @@ <cd:parameter name="headstyle"> <cd:resolve name="value-style"/> </cd:parameter> - <cd:parameter name="backgroundcolor"> + <cd:parameter name="headcolor"> <cd:constant type="cd:color"/> </cd:parameter> - <cd:parameter name="foregroundcolor"> + <cd:parameter name="background"> + <cd:constant type="cd:name"/> + </cd:parameter> + <cd:parameter name="backgroundcolor"> <cd:constant type="cd:color"/> </cd:parameter> <cd:parameter name="foregroundstyle"> <cd:resolve name="value-style"/> </cd:parameter> + <cd:parameter name="foregroundcolor"> + <cd:constant type="cd:color"/> + </cd:parameter> <cd:parameter name="align"> <cd:constant type="left"/> <cd:constant type="middle"/> diff --git a/tex/context/interface/mkiv/i-tagging.xml b/tex/context/interface/mkiv/i-tagging.xml index bbf794284..a7f94fcd2 100644 --- a/tex/context/interface/mkiv/i-tagging.xml +++ b/tex/context/interface/mkiv/i-tagging.xml @@ -72,7 +72,7 @@ </cd:arguments> </cd:command> - <cd:command name="ignoretagsinexport" level="document" category="xml" file="strc-tag.mkiv"> + <cd:command name="ignoretagsinexport" level="style" category="xml" file="strc-tag.mkiv"> <cd:arguments> <cd:resolve name="keyword-name-list"/> </cd:arguments> diff --git a/tex/context/interface/mkiv/i-texts.xml b/tex/context/interface/mkiv/i-texts.xml index bd1b128b3..f0f515fbc 100644 --- a/tex/context/interface/mkiv/i-texts.xml +++ b/tex/context/interface/mkiv/i-texts.xml @@ -165,6 +165,75 @@ </cd:arguments> </cd:command> + <!-- + + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupheader" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setuptext" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupfooter" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + <cd:command name="setupbottom" level="style" category="layout" file="page-txt.mkvi"> + <cd:arguments> + <cd:keywords optional="yes"> + <cd:constant type="text"/> + <cd:constant type="margin"/> + <cd:constant type="edge"/> + </cd:keywords> + <cd:assignments list="yes"> + <cd:inherit name="setuplayoutelement"/> + </cd:assignments> + </cd:arguments> + </cd:command> + + --> + <cd:command name="setuptop" level="style" category="layout" file="page-txt.mkvi"> <cd:arguments> <cd:keywords optional="yes"> @@ -173,7 +242,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -186,7 +255,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -199,7 +268,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -212,7 +281,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> @@ -225,7 +294,7 @@ <cd:constant type="edge"/> </cd:keywords> <cd:assignments list="yes"> - <cd:inherit name="setuplayoutelement"/> + <cd:inherit name="setuplayouttext"/> </cd:assignments> </cd:arguments> </cd:command> diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml index 249ed10ab..5e970d317 100644 --- a/tex/context/interface/mkiv/i-vspace.xml +++ b/tex/context/interface/mkiv/i-vspace.xml @@ -124,4 +124,20 @@ <cd:command name="bigskip" level="system" category="whitespace" file="spac-ver.mkiv"/> + <cd:command name="checkedblank" level="system" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + + <cd:command name="prerollblank" level="system" category="whitespace" file="spac-ver.mkiv"> + <cd:arguments> + <cd:keywords list="yes"> + <cd:inherit name="blank"/> + </cd:keywords> + </cd:arguments> + </cd:command> + </cd:interface> diff --git a/tex/context/interface/mkiv/i-whitespace.xml b/tex/context/interface/mkiv/i-whitespace.xml index f1a8ce84e..83547fea5 100644 --- a/tex/context/interface/mkiv/i-whitespace.xml +++ b/tex/context/interface/mkiv/i-whitespace.xml @@ -59,4 +59,6 @@ </cd:arguments> </cd:command> + <cd:command name="forgetparskip" category="alignment" level="system" file="spac-ver.mkiv"/> + </cd:interface>
\ No newline at end of file diff --git a/tex/context/interface/mkiv/i-xtable.xml b/tex/context/interface/mkiv/i-xtable.xml index c921e1a8d..0fae28e2e 100644 --- a/tex/context/interface/mkiv/i-xtable.xml +++ b/tex/context/interface/mkiv/i-xtable.xml @@ -77,6 +77,25 @@ <cd:parameter name="distance"> <cd:constant type="cd:dimension"/> </cd:parameter> + <cd:parameter name="aligncharacter"> + <cd:constant type="yes"/> + <cd:constant type="no" default="yes"/> + </cd:parameter> + <cd:parameter name="alignmentleftsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentrightsample"> + <cd:constant type="cd:text"/> + </cd:parameter> + <cd:parameter name="alignmentleftwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentrightwidth"> + <cd:constant type="cd:dimension"/> + </cd:parameter> + <cd:parameter name="alignmentcharacter"> + <cd:constant type="cd:text"/> + </cd:parameter> <cd:inherit name="setupframed"/> </cd:assignments> </cd:arguments> diff --git a/tex/context/modules/common/s-abbreviations-logos.tex b/tex/context/modules/common/s-abbreviations-logos.tex index c14265cc0..668dbc015 100644 --- a/tex/context/modules/common/s-abbreviations-logos.tex +++ b/tex/context/modules/common/s-abbreviations-logos.tex @@ -233,6 +233,7 @@ \logo [PSTOPAGE] {pstopage} \logo [PSTOPDF] {pstopdf} \logo [PSTRICKS] {pstricks} +\logo [PYTHON] {Python} \logo [RAID] {raid} \logo [RAM] {ram} \logo [RCA] {RCA} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index bacd3bb91..2cbb670ce 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 : 07/27/18 19:12:09 +-- merge date : 08/10/18 16:51:00 do -- begin closure to overcome local limits and interference @@ -10748,7 +10748,7 @@ local hash=table.setmetatableindex(function(t,k) elseif k<0xD7FF or (k>0xDFFF and k<=0xFFFF) then v=f_single(k) else - v=k-0x10000 + k=k-0x10000 v=f_double(rshift(k,10)+0xD800,k%1024+0xDC00) end t[k]=v |