From 4cd2103d17907dc8ed188c19ae67382519dbcbb2 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Fri, 9 Oct 2026 00:35:37 +0200 Subject: [PATCH 1/2] Update glyphsets --- requirements.in | 2 +- requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index a0beb3a6f0..91c8ac5055 100644 --- a/requirements.in +++ b/requirements.in @@ -3,5 +3,5 @@ pcpp opentype-sanitizer ufo2ft[pathops] ufoLib2 -glyphsets==0.6.18 +glyphsets glyphsLib diff --git a/requirements.txt b/requirements.txt index afe6193741..06e95244b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,9 +26,9 @@ fonttools[lxml,ufo,unicode]==4.43.1 # ufolib2 fs==2.4.16 # via fonttools -glyphsets==0.6.4 +glyphsets==1.1.3 # via -r requirements.in -glyphslib==6.4.1 +glyphslib==6.9.5 # via # -r requirements.in # glyphsets From ecc78e1c2fe6a55b305611e1932ccac993fdea08 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Thu, 2 Apr 2026 00:03:54 +0200 Subject: [PATCH 2/2] Fix build with glyphsets v1 --- scripts/build.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/build.py b/scripts/build.py index 5b8484be42..42b4206812 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -313,7 +313,7 @@ def scaleGlyph(font, glyph, scale): def makeQuran(options): from fontTools import subset - from glyphsets import GFGlyphData + from glyphsets import glyphs_in_glyphset, get_glyph font = makeDesktop(options, False) mergeLatin(font) @@ -375,8 +375,9 @@ def makeQuran(options): 0x202B, 0x202C, 0x202D, 0x202E, 0x202F, 0x25CC, 0xFD3E, 0xFD3F, 0xFDFA, 0xFDFD] - gf_latin_kernel = GFGlyphData.glyphs_in_glyphsets(["GF_Latin_Kernel"]) - unicodes += [g["unicode"] for g in gf_latin_kernel if g["nice_name"] != ".notdef"] + gf_latin_kernel = glyphs_in_glyphset("GF_Latin_Kernel") + unicodes += [int(get_glyph(n).unicode, 16) for n in gf_latin_kernel + if n != ".notdef" and get_glyph(n) and get_glyph(n).unicode] unicodes = [isinstance(u, str) and ord(u) or u for u in unicodes]