diff options
Diffstat (limited to 'tex/context/base/font-col.lua')
| -rw-r--r-- | tex/context/base/font-col.lua | 92 |
1 files changed, 69 insertions, 23 deletions
diff --git a/tex/context/base/font-col.lua b/tex/context/base/font-col.lua index 473e658d0..0bafea708 100644 --- a/tex/context/base/font-col.lua +++ b/tex/context/base/font-col.lua @@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['font-col'] = { license = "see context related readme files" } +-- possible optimization: delayed initialization of vectors + fonts = fonts or { } nodes = nodes or { } @@ -41,39 +43,64 @@ end function fonts.collections.define(name,font,ranges,details) -- todo: details -> method=force|conditional rscale= -- todo: remap=name + local trace = fonts.collections.trace local d = definitions[name] - if not d then + if d then + if name and trace then + logs.report("fonts","def: extending set %s using %s",name, font) + end + else + if name and trace then + logs.report("fonts","def: defining set %s using %s",name, font) + end d = { } definitions[name] = d end details = aux.settings_to_hash(details) + -- todo, combine per font start/stop as arrays for s in ranges:gmatch("([^, ]+)") do - local start, stop = characters.getrange(s) + local start, stop, description = characters.getrange(s) if start and stop then + if trace then + if description then + logs.report("fonts","def: using range %s (0x%04x-0x%04X, %s)",s,start,stop,description) + end + for i=1,#d do + local di = d[i] + if (start >= di.start and start <= di.stop) or (stop >= di.start and stop <= di.stop) then + logs.report("fonts","def: overlapping ranges 0x%04x-0x%04X and 0x%04x-0x%04X",start,stop,di.start,di.stop) + end + end + end details.font, details.start, details.stop = font, start, stop - d[#d+1] = details + d[#d+1] = table.fastcopy(details) end end end function fonts.collections.stage_1(name) - local last = font.current() -- fonts.define.last + input.starttiming(fonts) + local last = font.current() if fonts.collections.trace then - logs.report("fonts","registering font %s as id %s",name,last) + logs.report("fonts","def: registering font %s with name %s",last,name) end - list[name] = last + list[#list+1] = last end function fonts.collections.stage_2(name) local d = definitions[name] local t = { } local ids = fonts.tfm.id + local trace = fonts.collections.trace + if trace then + logs.report("fonts","def: process collection %s",name) + end for i=1,#d do local f = d[i] - local id = list[f.font] + local id = list[i] local start, stop = f.start, f.stop - if fonts.collections.trace then - logs.report("fonts","remapping font %s to %s for range 0x%04X - 0x%04X",current,id,start,stop) + if trace then + logs.report("fonts","def: remapping font %s to %s for range 0x%04X - 0x%04X",current,id,start,stop) end local check = toboolean(f.check or "false") local force = toboolean(f.force or "true") @@ -105,38 +132,57 @@ function fonts.collections.stage_2(name) end end vectors[current] = t + if trace then + logs.report("fonts","def: activating collection %s for font %s",name,current) + end active = true + input.stoptiming(fonts) end local P, Cc = lpeg.P, lpeg.Cc local spec = (P("sa") + P("at") + P("scaled") + P("at") + P("mo")) * P(" ")^1 * (1-P(" "))^1 * P(" ")^0 * -1 local okay = ((1-spec)^1 * spec * Cc(true)) + Cc(false) +-- todo: check for already done + function fonts.collections.prepare(name) + current = font.current() + if vectors[current] then + return + end + local ids = fonts.tfm.id + local trace = fonts.collections.trace local d = definitions[name] if d then - list, current = { }, fonts.define.last + if trace then + local filename = file.basename(ids[current].filename or "?") + logs.report("fonts","def: applying collection %s to %s (file: %s)",name,current,filename) + end + list = { } texsprint(tex.ctxcatcodes,"\\dostartcloningfonts") -- move this to tex \dostart... for i=1,#d do local f = d[i] local name = f.font - if not list[name] then - local scale = f.rscale or 1 - if okay:match(name) then - texsprint(tex.ctxcatcodes,format("\\doclonefonta{%s}{%s}",name,scale)) -- define with unique specs - else - texsprint(tex.ctxcatcodes,format("\\doclonefontb{%s}{%s}",name,scale)) -- define with inherited specs - end - texsprint(tex.ctxcatcodes,format("\\ctxlua{fonts.collections.stage_1('%s')}",name)) -- registering main font - list[name] = true + local scale = f.rscale or 1 + if okay:match(name) then + texsprint(tex.ctxcatcodes,format("\\doclonefonta{%s}{%s}",name,scale)) -- define with unique specs + else + texsprint(tex.ctxcatcodes,format("\\doclonefontb{%s}{%s}",name,scale)) -- define with inherited specs end + texsprint(tex.ctxcatcodes,format("\\ctxlua{fonts.collections.stage_1('%s')}",name)) -- registering main font end texsprint(tex.ctxcatcodes,format("\\ctxlua{fonts.collections.stage_2('%s')}",name)) -- preparing clone vectors texsprint(tex.ctxcatcodes,"\\dostopcloningfonts") end end -function fonts.collections.normalize(head) +function fonts.collections.message(message) + if fonts.collections.trace then + logs.report("fonts","tex: %s",message) + end +end + +function fonts.collections.normalize(head,tail) if active then local done = false local trace = fonts.collections.trace @@ -148,12 +194,12 @@ function fonts.collections.normalize(head) if type(id) == "table" then local newid, newchar = id[1], id[2] if trace then - logs.report("fonts","remapping character %s in font %s to character %s in font %s",n.char,n.font,newchar,newid) + logs.report("fonts","lst: remapping character %s in font %s to character %s in font %s",n.char,n.font,newchar,newid) end n.font, n.char = newid, newchar else if trace then - logs.report("fonts","remapping font %s to %s for character %s",n.font,id,n.char) + logs.report("fonts","lst: remapping font %s to %s for character %s",n.font,id,n.char) end n.font = id end @@ -161,7 +207,7 @@ function fonts.collections.normalize(head) end end end - return head, done + return head, tail, done end nodes.normalize_fonts = fonts.collections.normalize |