Skip to content

Fix CFF2 stem and hint mask stripping #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
basil wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix CFF2 stem and hint mask stripping #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdde835
Fix vstemhm dispatch in CFF2 stream conversion
basil Sep 15, 2026
695944d
Strip CFF2 hint masks with their stems
basil Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/auto/fontloader-2023-12-28.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11292,7 +11292,7 @@ end
elseif t==16 then
local s=p_blend() or 0
i=i+s+1
elseif t==1 or t==3 or t==18 or operation==23 then
elseif t==1 or t==3 or t==18 or t==23 then
p_getstem()
if version=="cff" then
if top>0 then
Expand All @@ -11308,7 +11308,7 @@ end
i=i+1
elseif t==19 or t==20 then
local s=p_getmask() or 0
if true then
if version=="cff" then
if top>0 then
for i=1,top do
r=r+1;result[r]=encode[stack[i]]
Expand Down
6 changes: 3 additions & 3 deletions src/auto/luaotfload-status.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return {
["hashes"]={
{ "fontloader-2023-12-28.lua", "f33a8946b4d6a005e76276706db83059" },
{ "fontloader-2023-12-28.lua", "6b94d55c7ad74693d375b7afab0475fc" },
{ "fontloader-util-fil.lua", "d0accf4180201efd567816a25ad5e037" },
{ "fontloader-util-str.lua", "f9cf43057eb25bbf466821908686fc3d" },
{ "fontloader-l-unicode.lua", "f368874f11f3c525de5864fd413e4b24" },
Expand Down Expand Up @@ -45,15 +45,15 @@ return {
{ "fontloader-font-oti.lua", "309a75f9c14b77d87e94eba827dc4e71" },
{ "fontloader-font-dsp.lua", "d07a0663bafeb7603c5456639afaf2e8" },
{ "fontloader-font-ttf.lua", "ff94e130d7c71edd899c4bae7745b7db" },
{ "fontloader-font-cff.lua", "999da544079698ce70178fd84bcdd67a" },
{ "fontloader-font-cff.lua", "3bd11ac2d0768dcf642a83aa3e30a717" },
{ "fontloader-font-otr.lua", "2958a21bebcf0579f4e11f0646d1b402" },
{ "fontloader-font-vfc.lua", "a81c29eda98cd62cbebdb6c93544b50d" },
{ "fontloader-font-map.lua", "b1444428c238a17d2a998ff1a4769183" },
{ "fontloader-font-cid.lua", "22b0367742fb253deef84ef7ccf5e8de" },
{ "fontloader-font-con.lua", "ebdd0ca857deafdc0152c7a4f1ed2490" },
{ "fontloader-font-ini.lua", "16b855c98602e4a3e9df39512916a427" },
{ "fontloader-data-con.lua", "b4ab51aaeab872d86d827f3e216bf05e" },
{ "fontloader-reference.lua", "23d03b682af6417aa08995f2ec10de22" },
{ "fontloader-reference.lua", "1385774015c18a39fc0d415b6a0f944e" },
{ "fontloader-basics-gen.lua", "a506fcee90c14e628036968f82aa3b56" },
{ "luaotfload-glyphlist.lua", "318f90335db5b786ea0454d973ed5460" },
{ "luaotfload-characters.lua", "76415ca3ede312cad6e09038323489ae" },
Expand Down
5 changes: 2 additions & 3 deletions src/fontloader/misc/fontloader-font-cff.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,7 @@ end
local s = p_blend() or 0
i = i + s + 1
-- cff 1: (when cff2 strip them)
elseif t == 1 or t == 3 or t == 18 or operation == 23 then
elseif t == 1 or t == 3 or t == 18 or t == 23 then
p_getstem() -- at the start
if version == "cff" then
-- if true then
Expand All @@ -1988,8 +1988,7 @@ end
-- cff 1: (when cff2 strip them)
elseif t == 19 or t == 20 then
local s = p_getmask() or 0 -- after the stems
-- if version == "cff" then
if true then
if version == "cff" then
if top > 0 then
for i=1,top do
r = r + 1 ; result[r] = encode[stack[i]]
Expand Down
4 changes: 2 additions & 2 deletions src/fontloader/runtime/fontloader-reference.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14849,7 +14849,7 @@ end
elseif t==16 then
local s=p_blend() or 0
i=i+s+1
elseif t==1 or t==3 or t==18 or operation==23 then
elseif t==1 or t==3 or t==18 or t==23 then
p_getstem()
if version=="cff" then
if top>0 then
Expand All @@ -14865,7 +14865,7 @@ end
i=i+1
elseif t==19 or t==20 then
local s=p_getmask() or 0
if true then
if version=="cff" then
if top>0 then
for i=1,top do
r=r+1;result[r]=encode[stack[i]]
Expand Down