fontisan 0.4.19 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec589024241926918e56eb58fbe63cd2b14cc0d82fd92908337f7f2f7ef5c076
-  data.tar.gz: f3ef0a193655de4790717559c7bce5722f5d9e7b5548bc5b313cf400a3b2121d
+  metadata.gz: 55632b625474e82c1cf9573ad6fce2de32f5636823701023abee87fc8817d8fc
+  data.tar.gz: 5a26b3428874b792c101484dbed0468c25eb9f8eb7644a2c0ffff61c8f2baf6a
 SHA512:
-  metadata.gz: b83304cf80e5f7a55ee98717b0f3bec987ad81cef329d0f1d2ab9ab91ecd66db58f6e2ed5eada8c3b4049665e3a37240a26477dbd25405a586d1f9ca7fc7dd61
-  data.tar.gz: ebc0f3e2c752e7752452280d83e4220aabb12c23a4766e431dbc3e13b480b85b0259a929656919da42e9993a8bd2354a9283fbef21a95ba49b666c54c8d0812b
+  metadata.gz: e7334f4be856d9a86712a0215c3671c7148d623649d4b81d232aa5f70b8aee71e1e55047a2780f48a7018721026e13dc99f0fff6dcbeda49801f88a832cbf99e
+  data.tar.gz: a6432a0a4db97bdfedd597f5f79f40be36b0fd5d450f21e43319023a85b3e331377b2ee7e002fceb9f90c2e9e9a9ee4c1489ebd25e295058e5605d5be0482f57

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-07-07 11:03:20 UTC using RuboCop version 1.86.1.
+# on 2026-07-08 06:50:36 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,7 +12,7 @@ Gemspec/RequiredRubyVersion:
     - 'docs/node_modules/speakingurl/speakingurl-rails.gemspec'
     - 'fontisan.gemspec'
 
-# Offense count: 2090
+# Offense count: 2110
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -95,7 +95,7 @@ Lint/UselessConstantScoping:
     - 'lib/fontisan/conversion_options.rb'
     - 'lib/fontisan/type1/charstrings.rb'
 
-# Offense count: 703
+# Offense count: 704
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
@@ -123,7 +123,7 @@ Metrics/CollectionLiteralLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 977
+# Offense count: 978
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 135
@@ -221,7 +221,7 @@ RSpec/DescribeMethod:
     - 'spec/fontisan/type1/seac_expander_spec.rb'
     - 'spec/fontisan/type1_real_fonts_spec.rb'
 
-# Offense count: 1660
+# Offense count: 1666
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 66
@@ -298,7 +298,7 @@ RSpec/MultipleDescribes:
     - 'spec/fontisan/utils/thread_pool_spec.rb'
     - 'spec/fontisan/variation/cache_spec.rb'
 
-# Offense count: 2097
+# Offense count: 2103
 RSpec/MultipleExpectations:
   Max: 19
 
@@ -330,7 +330,7 @@ RSpec/RepeatedExample:
     - 'spec/fontisan/metrics_calculator_spec.rb'
     - 'spec/fontisan/tables/os2_spec.rb'
 
-# Offense count: 47
+# Offense count: 48
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:

data/lib/fontisan/stitcher.rb

@@ -139,6 +139,15 @@ module Fontisan
       cbdts.first
     end
 
+    # Safe variant of #cbdt_source: returns nil instead of raising when
+    # the project has multiple CBDT sources. Used inside the per-subfont
+    # glyph-copy pass where raising mid-compile would leave partial state.
+    def safe_cbdt_source
+      cbdt_source
+    rescue MultipleCbdtSourcesError
+      nil
+    end
+
     def build_target_for(subfont_name)
       bindings = @subfonts[subfont_name] || []
       target = Ufo::Font.new
@@ -171,15 +180,22 @@ module Fontisan
     def assign_gids_and_copy_glyphs(bindings, target, deduplicator)
       cbdt = safe_cbdt_source
 
-      if cbdt
-        add_all_cbdt_glyphs(cbdt, target)
-      else
-        add_notdef_from(bindings, target, deduplicator)
-      end
+      # Glyph ordering matters: Cmap.build uses first-wins semantics
+      # (Cmap.build docstring), so outline donors must be stitched
+      # before CBDT placeholders. Otherwise the empty CBDT placeholder
+      # would land at a lower GID and win the cp→gid mapping for any
+      # codepoint covered by both donors, hiding the real outline glyph.
+      # CBDT bitmap data still propagates via propagate_cbdt_tables.
+      add_notdef_from(bindings, target, deduplicator)
+      add_outline_glyphs(bindings, target, deduplicator,
+                         skip_sources: cbdt ? [cbdt] : [])
+      add_all_cbdt_glyphs(cbdt, target) if cbdt
+    end
 
+    def add_outline_glyphs(bindings, target, deduplicator, skip_sources:)
       sorted_bindings(bindings).each do |binding|
         next if binding[:donor_gid].zero?
-        next if cbdt && binding[:source].equal?(cbdt)
+        next if skip_sources.any? { |s| s.equal?(binding[:source]) }
 
         glyph = binding[:source].glyph_for_gid(binding[:donor_gid])
         next unless glyph
@@ -197,13 +213,6 @@ module Fontisan
       end
     end
 
-    def safe_cbdt_source
-      cbdts = @sources.values.select { |s| s.bitmap_mode == :cbdt }
-      cbdts.size == 1 ? cbdts.first : nil
-    rescue MultipleCbdtSourcesError
-      nil
-    end
-
     def sorted_bindings(bindings)
       bindings.sort_by { |b| [b[:codepoint] || Float::INFINITY, b[:donor_gid]] }
     end
@@ -273,9 +282,14 @@ module Fontisan
 
       compiled = Fontisan::FontLoader.load(path)
 
+      # Read every table as raw bytes straight from the file's table
+      # directory. We deliberately bypass #table (which parses via
+      # BinData) because some tables — notably CFF2 — don't yet have
+      # round-trippable BinData models; calling #table on them returns
+      # nil and would silently drop them from the rewritten font.
       tables = {}
       compiled.table_names.each do |tag|
-        raw = extract_raw_table(compiled, tag)
+        raw = compiled.table_data[tag]
         tables[tag] = raw if raw
       end
 
@@ -288,15 +302,6 @@ module Fontisan
       Fontisan::FontWriter.write_to_file(tables, path, sfnt_version: sfnt)
     end
 
-    def extract_raw_table(font, tag)
-      sfnt_table = font.table(tag)
-      return nil unless sfnt_table
-
-      sfnt_table.raw_data
-    rescue StandardError
-      nil
-    end
-
     def add_all_cbdt_glyphs(source, target)
       ufo = source.font.is_a?(Ufo::Font) ? source.font : nil
       if ufo

data/lib/fontisan/tables/cff2/index_builder.rb

@@ -66,7 +66,7 @@ module Fontisan
           case off_size
           when 1 then [value].pack("C")
           when 2 then [value].pack("n")
-          when 3 then [value].pack("C3")
+          when 3 then [(value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF].pack("CCC")
           when 4 then [value].pack("N")
           else raise ArgumentError, "invalid off_size: #{off_size}"
           end

data/lib/fontisan/ufo/cli.rb

@@ -55,7 +55,11 @@ module Fontisan
         issues << "no glyphs in default layer" if font.glyphs.empty?
         issues << "no family name" unless font.info.family_name
         issues << "unitsPerEm not set" unless font.info.units_per_em
-        issues << "missing .notdef glyph" unless font.glyph(".notdef")
+        # The compiler auto-injects an empty .notdef at GID 0 when the
+        # UFO source omits it (OpenType requires GID 0 to be .notdef).
+        # Surface this as a warning, not a failure — compilation will
+        # still succeed.
+        warn "NOTE  missing .notdef glyph — compiler will inject one at GID 0" unless font.glyph(".notdef")
 
         if issues.empty?
           puts "OK  #{ufo}"

data/lib/fontisan/ufo/compile/base_compiler.rb

@@ -43,7 +43,7 @@ module Fontisan
         # All tables every OTF/TTF must have, plus optional feature
         # tables (GPOS for kerning) when the UFO source has kerning data.
         def build_tables
-          glyphs = font.glyphs.values
+          glyphs = glyphs_with_notdef
           tables = {
             "head" => Head.build(font, glyphs: glyphs),
             "hhea" => Hhea.build(font, glyphs: glyphs),
@@ -62,6 +62,31 @@ module Fontisan
           tables.merge(build_outline_tables)
         end
 
+        # OpenType requires GID 0 to be `.notdef`. Normalize the source
+        # glyph list so that:
+        #   - if `.notdef` is already at GID 0, the list is unchanged;
+        #   - if `.notdef` exists elsewhere, it's moved to GID 0;
+        #   - if no `.notdef` exists, an empty one is prepended.
+        #
+        # Without this, the alphabetically-first source glyph lands at
+        # GID 0 and the cmap parser (which treats GID 0 as `.notdef` per
+        # spec) silently drops it from the cmap.
+        def glyphs_with_notdef
+          source = font.glyphs.values
+          return source if source.empty?
+
+          existing = source.find { |g| g.name == ".notdef" }
+          return source if existing == source.first
+
+          rest = source - [existing]
+          notdef = existing || Ufo::Glyph.notdef(units_per_em: default_units_per_em)
+          [notdef, *rest]
+        end
+
+        def default_units_per_em
+          font.info&.units_per_em&.to_i || Ufo::Glyph::DEFAULT_UNITS_PER_EM
+        end
+
         def write(tables_hash, output_path)
           dir = File.dirname(output_path)
           FileUtils.mkpath(dir) unless dir == "."

data/lib/fontisan/ufo/compile/cmap.rb

@@ -11,6 +11,14 @@ module Fontisan
       # Both subtables share the same segment list (capped to BMP for
       # format 4); format 4 is required by Windows even though format
       # 12 is more capable.
+      #
+      # Contract — first-wins: when multiple glyphs declare the same
+      # codepoint, the glyph at the LOWER GID wins the cp→gid mapping.
+      # Callers that want one donor to outrank another for a shared
+      # codepoint (e.g. outline donor vs. CBDT placeholder) MUST order
+      # the higher-priority glyphs earlier in the `glyphs:` array.
+      # Stitcher relies on this for outline-first stitching.
+      #
       # @see https://learn.microsoft.com/en-us/typography/opentype/spec/cmap
       module Cmap
         PLATFORM_WINDOWS = 3

data/lib/fontisan/ufo/compile/gvar.rb

@@ -195,7 +195,7 @@ module Fontisan
 
         def self.build_empty(glyph_count)
           # Minimal gvar with no variation data
-          header = [VERSION_MAJOR, VERSION_MINOR, 0, 0, 0, glyph_count, 1, glyph_count * 1 + 16].pack("nnnnnnNN")
+          header = [VERSION_MAJOR, VERSION_MINOR, 0, 0, 0, glyph_count, 1, glyph_count + 16].pack("nnnnnnNN")
           offsets = Array.new(glyph_count + 1, 0).pack("C*")
           header + offsets
         end

data/lib/fontisan/ufo/compile/head.rb

@@ -27,7 +27,7 @@ module Fontisan
             checksum_adjustment: 0, # patched by FontWriter
             magic_number: MAGIC_NUMBER,
             flags: DEFAULT_FLAGS,
-            units_per_em: units_per_em || font.info.units_per_em || 1000,
+            units_per_em: units_per_em || font.info.units_per_em || Glyph::DEFAULT_UNITS_PER_EM,
             created_raw: time_to_longdatetime(font.info.created),
             modified_raw: time_to_longdatetime(font.info.modified),
             x_min: bbox[:x_min].to_i,

data/lib/fontisan/ufo/compile/otf2_compiler.rb

@@ -16,14 +16,8 @@ module Fontisan
       class Otf2Compiler < BaseCompiler
         SFNT_VERSION = SFNT_VERSION_OPEN_TYPE
 
-        def build_outline_tables
-          {
-            "CFF2" => Cff2.build(font, glyphs: font.glyphs.values),
-          }
-        end
-
         def compile(output_path:)
-          glyphs = font.glyphs.values
+          glyphs = glyphs_with_notdef
 
           tables = {
             "head" => Head.build(font, glyphs: glyphs, loca_format: Head::LOCA_FORMAT_LONG),

data/lib/fontisan/ufo/compile/otf_compiler.rb

@@ -13,14 +13,8 @@ module Fontisan
       class OtfCompiler < BaseCompiler
         SFNT_VERSION = SFNT_VERSION_OPEN_TYPE
 
-        def build_outline_tables
-          {
-            "CFF " => Cff.build(font, glyphs: font.glyphs.values),
-          }
-        end
-
         def compile(output_path:)
-          glyphs = font.glyphs.values
+          glyphs = glyphs_with_notdef
 
           tables = {
             "head" => Head.build(font, glyphs: glyphs, loca_format: Head::LOCA_FORMAT_LONG),

data/lib/fontisan/ufo/compile/ttf_compiler.rb

@@ -14,7 +14,7 @@ module Fontisan
 
         # @return [Hash<String, #to_binary_s>] all TTF tables, not yet written
         def build_tables
-          glyphs = font.glyphs.values
+          glyphs = glyphs_with_notdef
 
           # Deep-clone glyphs so filters don't mutate the source UFO.
           filtered = clone_glyphs(glyphs)

data/lib/fontisan/ufo/glyph.rb

@@ -11,6 +11,30 @@ module Fontisan
     # The `.glif` XML format has multiple revisions (1, 2, 3); the
     # parser accepts all of them.
     class Glyph
+      # OpenType requires GID 0 to be a glyph named `.notdef`. UFO
+      # sources that lack an explicit `.notdef` (synthetic SVG donors,
+      # programmatic sources) need one injected before compile. This
+      # constant is the default width used for that injected glyph, and
+      # doubles as the fallback unitsPerEm in Head.build when UFO info
+      # omits the field. Single source of truth for both call sites.
+      DEFAULT_UNITS_PER_EM = 1000
+
+      # Synthesize an empty `.notdef` glyph suitable for GID 0.
+      #
+      # OpenType mandates GID 0 be `.notdef`. UFO sources that lack an
+      # explicit `.notdef` (synthetic SVG donors, programmatic sources)
+      # need one injected before compile. The width defaults to the
+      # font's units_per_em so the .notdef consumes one em of advance.
+      #
+      # @param units_per_em [Integer, nil] Advance width for the
+      #   synthesized glyph. Defaults to DEFAULT_UNITS_PER_EM when nil.
+      # @return [Glyph]
+      def self.notdef(units_per_em: nil)
+        new(name: ".notdef").tap do |g|
+          g.width = units_per_em&.to_i || DEFAULT_UNITS_PER_EM
+        end
+      end
+
       attr_accessor :width, :height, :note, :lib
       attr_reader :name, :unicodes, :contours, :components, :anchors,
                   :guidelines, :images

data/lib/fontisan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fontisan
-  VERSION = "0.4.19"
+  VERSION = "0.4.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.21
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64