diff options
Diffstat (limited to 'tex/context/base/mkxl/font-col.lmt')
| -rw-r--r-- | tex/context/base/mkxl/font-col.lmt | 108 |
1 files changed, 63 insertions, 45 deletions
diff --git a/tex/context/base/mkxl/font-col.lmt b/tex/context/base/mkxl/font-col.lmt index 12603a0dd..1bce9b3a9 100644 --- a/tex/context/base/mkxl/font-col.lmt +++ b/tex/context/base/mkxl/font-col.lmt @@ -26,6 +26,7 @@ local nextchar = nuts.traversers.char local getscales = nuts.getscales local setscales = nuts.setscales local setprop = nuts.setprop +local getcharspec = nuts.getcharspec local settings_to_hash = utilities.parsers.settings_to_hash @@ -411,63 +412,80 @@ end -- todo: also general one for missing +local function apply(n,char,font,vector,vect) + local kind = type(vect) + local newfont, newchar + if kind == "table" then + newfont = vect[1] + newchar = vect[2] + if trace_collecting then + report_fonts("remapping character %C in font %a to character %C in font %a%s", + char,font,newchar,newfont,not chardata[newfont][newchar] and " (missing)" or "" + ) + end + elseif kind == "function" then + newfont, newchar = vect(font,char,vector) + if not newfont then + newfont = font + end + if not newchar then + newchar = char + end + if trace_collecting then + report_fonts("remapping character %C in font %a to character %C in font %a%s", + char,font,newchar,newfont,not chardata[newfont][newchar] and " (missing)" or "" + ) + end + vector[char] = { newfont, newchar } + else + local fakemono = vector.factor + if trace_collecting then + report_fonts("remapping font %a to %a for character %C%s", + font,vect,char,not chardata[vect][char] and " (missing)" or "" + ) + end + newfont = vect + if fakemono then + newchar = monoslot(vect,char,font,fakemono) + else + newchar = char + end + end + local rscale = vector.rscale + if rscale and rscale ~= 1 then + local s, x, y = getscales(n) + setscales(n,s*rscale,x*rscale,y*rscale) + end + setfont(n,newfont,newchar) + setprop(n, "original", { font = font, char = char }) +end + function collections.process(head) -- this way we keep feature processing for n, char, font in nextchar, head do local vector = validvectors[font] if vector then local vect = vector[char] if vect then - local kind = type(vect) - local newfont, newchar - if kind == "table" then - newfont = vect[1] - newchar = vect[2] - if trace_collecting then - report_fonts("remapping character %C in font %a to character %C in font %a%s", - char,font,newchar,newfont,not chardata[newfont][newchar] and " (missing)" or "" - ) - end - elseif kind == "function" then - newfont, newchar = vect(font,char,vector) - if not newfont then - newfont = font - end - if not newchar then - newchar = char - end - if trace_collecting then - report_fonts("remapping character %C in font %a to character %C in font %a%s", - char,font,newchar,newfont,not chardata[newfont][newchar] and " (missing)" or "" - ) - end - vector[char] = { newfont, newchar } - else - local fakemono = vector.factor - if trace_collecting then - report_fonts("remapping font %a to %a for character %C%s", - font,vect,char,not chardata[vect][char] and " (missing)" or "" - ) - end - newfont = vect - if fakemono then - newchar = monoslot(vect,char,font,fakemono) - else - newchar = char - end - end - local rscale = vector.rscale - if rscale and rscale ~= 1 then - local s, x, y = getscales(n) - setscales(n,s*rscale,x*rscale,y*rscale) - end - setfont(n,newfont,newchar) - setprop(n, "original", { font = font, char = char }) + apply(n,char,font,vector,vect) end end end return head end +function collections.direct(n) + local char, font = getcharspec(n) + if font and char then + local vector = validvectors[font] + if vector then + local vect = vector[char] + if vect then + apply(n,char,font,vector,vect) + end + end + end +end + function collections.found(font,char) -- this way we keep feature processing if not char then font, char = currentfont(), font |