fontisan 0.4.20 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eea2bdc6a2142dc7aec297e4753ea530f9b66d1e89f7cd4a83d8582bd511a8b
-  data.tar.gz: 2d6c594a71b01982f226e2c1db4f952280f167aaf2bc404b8bbfc2ef95bfea79
+  metadata.gz: 55632b625474e82c1cf9573ad6fce2de32f5636823701023abee87fc8817d8fc
+  data.tar.gz: 5a26b3428874b792c101484dbed0468c25eb9f8eb7644a2c0ffff61c8f2baf6a
 SHA512:
-  metadata.gz: 41e75040b3020c6ddcd22ca1567c8a7d44c6511d6fbdd886e6712de23b4ae7146a85fb64ef135c0e3aa73af3054c9c622315663c1bbd60ca744092cc2c6c6b0b
-  data.tar.gz: 7ffb7e4f4a4546d3c42f18ef92566693ca8250e287b307011afa8cd782769c328917eb7929c1bb664581b9c82fafa1355801893e08b8cddda60f222c68e467cc
+  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 23:48:55 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: 2102
+# 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: 1664
+# 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: 2102
+# 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

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
 platform: ruby
 authors:
 - Ribose Inc.