fontisan 0.4.26 → 0.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9d761c9308f66218312a055b752135a728413c634fba54caa309c37076a03f0
-  data.tar.gz: 8ec9394bfde51dec443f7b854ab29d698a9cb70c63543ea4067b0fc23ffd10fc
+  metadata.gz: fa4e6e2127d519f9f74aaf89b3d94e675ac09306d6d99eff7735e4789830bd26
+  data.tar.gz: a1f2188729497aff910dcc70e59856e3c72858e33323b4871f626d8443ff505a
 SHA512:
-  metadata.gz: a123990197a2754d9039c7c12f9ed8432165ded5f1c8c1b10c6f150d03907ecd09bc0baf50d40e853ccbad4c340b0694718ea74759b6dacb7fe3796212e8c703
-  data.tar.gz: c0510eee21f156b9f9d7e0110da16372a4c8418774144294efa7fcfcb7b049da72b42f6d683b1a8043e91b2f5ce66d201f3ec84173eead40d5bdab36d8d41ca2
+  metadata.gz: '09ec3032389068dd5870d82c03a89f1b318ad3b76b9b26c1f509d33419fc8728b6d8ff4f3c0e16798380312b003f79118501c9155f581f2f031c9d9893d0baba'
+  data.tar.gz: a5a3cc828bbbd463fda1b74fa7e85b110bc83c55d058a5c484f44213ea4052001c0cf958d73c3b95ec1a3564f4e4ed1cf7901cf6002e7cde8b0ad0c43e98cc04

data/TODO.improvements/README.md

@@ -6,8 +6,8 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 ## Priorities
 
 ### P0 — Correctness gaps (open bugs / silent failures)
-- [01 — CBDT/CBLC GID-stable propagation](01-cbdt-cblc-gid-stable-propagation.md)
-- [02 — Collection-mode outline-priority regression](02-collection-outline-priority.md)
+- [x] ~~[01 — CBDT/CBLC GID-stable propagation](01-cbdt-cblc-gid-stable-propagation.md)~~ ✓ Done (PR #115)
+- [x] ~~[02 — Collection-mode outline-priority regression](02-collection-outline-priority.md)~~ ✓ Already fixed (PR #108 unskipped the test; now passing with TODO 01)
 
 ### P1 — High-value features
 - [03 — `fontisan audit` command (identity+style+features lens)](03-fontisan-audit-command.md)
@@ -15,16 +15,16 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 - [05 — OTF compiler real CFF charstrings](05-otf-compiler-real-cff.md)
 
 ### P2 — Specialist feature parity
-- [x] ~~[07 — CPAL v1 header fields](07-cpal-v1-header-fields.md)~~ ✓ Done
+- [x] ~~[07 — CPAL v1 header fields](07-cpal-v1-header-fields.md)~~ ✓ Done (v0.4.25)
+- [x] ~~[08 — CFF standard string table](08-cff-standard-string-table.md)~~ ✓ Partial (SID 0-95, ASCII subset)
 - [06 — CFF2 blend/vsindex operators](06-cff2-blend-vsindex-operators.md)
-- [08 — CFF standard string table](08-cff-standard-string-table.md)
 - [09 — Type 1 seac expansion](09-type1-seac-expansion.md)
 - [10 — UFO image set + feature writers](10-ufo-image-set-feature-writers.md)
 - [11 — kern groups.plist support](11-kern-groups-plist.md)
 
 ### P3 — Code-quality cleanup
-- [x] ~~[13 — Split `OctokitFetcher` out of `fixture_downloader.rb`](13-split-octokit-fetcher.md)~~ ✓ Done (commit `4c68f2a`)
-- [12 — `cbdt_fixture.rb` full BinData conversion](12-cbdt-fixture-bindata-conversion.md)
+- [x] ~~[13 — Split `OctokitFetcher` out of `fixture_downloader.rb`](13-split-octokit-fetcher.md)~~ ✓ Done (v0.4.24)
+- [x] ~~[12 — `cbdt_fixture.rb` full BinData conversion](12-cbdt-fixture-bindata-conversion.md)~~ ✓ Partial (head/hhea/post converted; os2/name/hmtx/cmap remain)
 - [14 — Rubocop baseline chip (per-namespace)](14-rubocop-baseline-chip.md)
 
 ## Convention

data/lib/fontisan/stitcher/cbdt_propagator.rb

@@ -80,6 +80,8 @@ module Fontisan
       # @param source [Stitcher::Source] the CBDT source
       # @param target [Ufo::Font] target UFO font to receive placeholders
       def add_placeholder_glyphs(source, target)
+        @placeholder_names = {}
+
         ufo = source.font.is_a?(Ufo::Font) ? source.font : nil
         if ufo
           ufo.glyphs.each_value do |g|
@@ -104,43 +106,28 @@ module Fontisan
           glyph.width = 0
           gid_cps[gid].each { |cp| glyph.add_unicode(cp) }
           target.layers.default_layer.add(glyph)
+          @placeholder_names[gid] = name
         end
       end
 
-      # Propagate the raw CBDT/CBLC tables from the CBDT source into
-      # the compiled font at `path`, rewriting the file in place.
+      # Propagate CBDT/CBLC tables from the CBDT source into the
+      # compiled font at `path`, rewriting the file in place.
       #
       # Reads every table from the compiled font as raw bytes (bypassing
       # BinData #table because some tables — notably CFF2 — don't yet
-      # have round-trippable BinData models), splices in CBDT/CBLC,
-      # and rewrites the file.
-      #
-      # No-op when called with a non-CBDT source or nil.
+      # have round-trippable BinData models), splices in CBDT/CBLC
+      # rebuilt with compiled-font GIDs, and rewrites the file.
       #
-      # == Limitation: GID stability
+      # The CBDT/CBLC rebuild uses Subset::TableStrategy::ColorBitmapSubsetter
+      # to remap every bitmap block from source GID to compiled GID.
+      # This ensures CBLC's IndexSubTableArray references the compiled
+      # font's actual GIDs, not the source's.
       #
-      # The propagation copies CBDT/CBLC bytes verbatim. CBLC indexes
-      # glyphs by SOURCE GID — the GIDs of the CBDT donor. The compiled
-      # font's GIDs may differ because:
+      # Falls back to raw-byte copy when the GID mapping can't be
+      # resolved (no placeholder names recorded, or compiled post table
+      # is v3.0 with no glyph names).
       #
-      #   1. +add_placeholder_glyphs+ renames CBDT placeholders via
-      #      UniqueGlyphName when their default "gid{N}" name collides
-      #      with outline glyphs sharing the same donor-gid scheme
-      #      (see Layer's naming contract).
-      #   2. The compiler assigns GIDs in target-namespace order, which
-      #      is not the same as source-GID order once renaming happens.
-      #
-      # The bitmaps line up correctly only when the CBDT source and
-      # every outline source cover disjoint codepoint ranges (the
-      # Essenfont TTC case: emoji vs CJK Ext G). When ranges overlap,
-      # CBLC's source-GID-indexed bitmaps may point at the wrong
-      # compiled glyphs and the colour rendering for affected
-      # codepoints will fall back to outlines.
-      #
-      # A proper fix requires a CBLC rebuild pass: walk the compiled
-      # font's cmap to find the new GID for every CBDT-covered source
-      # glyph, then rewrite CBLC's IndexSubTableArray + IndexSubTable
-      # offsets to match. Tracked as a follow-up.
+      # No-op when called with a non-CBDT source or nil.
       #
       # @param source [Stitcher::Source, nil] the CBDT source
       # @param path [String] compiled font file to rewrite
@@ -149,25 +136,77 @@ module Fontisan
 
         compiled = 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 = compiled.table_data[tag]
           tables[tag] = raw if raw
         end
 
-        cbdt_bytes = source.raw_table_bytes("CBDT")
-        cblc_bytes = source.raw_table_bytes("CBLC")
-        tables["CBDT"] = cbdt_bytes if cbdt_bytes
-        tables["CBLC"] = cblc_bytes if cblc_bytes
+        rebuilt = rebuild_color_tables(source, compiled)
+        tables["CBDT"] = rebuilt[:cbdt] if rebuilt[:cbdt]
+        tables["CBLC"] = rebuilt[:cblc] if rebuilt[:cblc]
 
         sfnt = tables.key?("CFF ") || tables.key?("CFF2") ? 0x4F54544F : 0x00010000
         FontWriter.write_to_file(tables, path, sfnt_version: sfnt)
       end
+
+      private
+
+      # Rebuild CBDT/CBLC bytes with compiled-font GIDs instead of
+      # source GIDs. Delegates to Subset::TableStrategy::ColorBitmapSubsetter
+      # which already implements the offset-remap algorithm for the
+      # subsetter — the Stitcher case is the same algorithm with a
+      # different GID mapping (source → compiled instead of source →
+      # sequential subset GID).
+      #
+      # Falls back to raw-byte copy when the GID mapping can't be
+      # resolved (no placeholder names recorded, or compiled post/cmap
+      # can't reverse-map them).
+      def rebuild_color_tables(source, compiled)
+        source_cbdt = source.raw_table_bytes("CBDT")
+        source_cblc = source.raw_table_bytes("CBLC")
+        return {} unless source_cbdt && source_cblc
+
+        gid_map = resolve_gid_mapping(compiled)
+        return raw_bytes_fallback(source_cbdt, source_cblc) unless gid_map
+
+        mapping = Subset::GlyphMapping.new(mapping: gid_map)
+        subsetter = Subset::TableStrategy::ColorBitmapSubsetter.new(
+          font: source.font, mapping: mapping,
+        ).build
+
+        { cbdt: subsetter.cbdt_bytes, cblc: subsetter.cblc_bytes }
+      end
+
+      # Build {source_gid => compiled_gid} from the placeholder names
+      # recorded during add_placeholder_glyphs. Walks the compiled
+      # font's post table to find each placeholder's compiled GID.
+      # Returns nil when the mapping can't be resolved (e.g., no
+      # placeholders recorded, or post v3.0 with no names).
+      def resolve_gid_mapping(compiled)
+        return nil unless @placeholder_names && !@placeholder_names.empty?
+
+        post = compiled.table("post")
+        return nil unless post
+
+        names = post.glyph_names
+        return nil unless names
+
+        name_to_gid = {}
+        names.each_with_index { |name, gid| name_to_gid[name] = gid }
+
+        gid_map = {}
+        @placeholder_names.each do |source_gid, placeholder_name|
+          compiled_gid = name_to_gid[placeholder_name]
+          gid_map[source_gid] = compiled_gid if compiled_gid
+        end
+
+        gid_map.empty? ? nil : gid_map
+      end
+
+      def raw_bytes_fallback(cbdt_bytes, cblc_bytes)
+        { cbdt: cbdt_bytes, cblc: cblc_bytes }
+      end
     end
   end
 end

data/lib/fontisan/subset/glyph_mapping.rb

@@ -52,12 +52,17 @@ module Fontisan
       #
       # @example Create mapping that retains GIDs
       #   mapping = GlyphMapping.new([0, 3, 5, 10], retain_gids: true)
-      def initialize(old_glyph_ids, retain_gids: false)
+      def initialize(old_glyph_ids = [], retain_gids: false, mapping: nil)
         @old_to_new = {}
         @new_to_old = {}
         @retain_gids = retain_gids
 
-        build_mappings(old_glyph_ids)
+        if mapping
+          @old_to_new = mapping
+          @new_to_old = mapping.invert
+        else
+          build_mappings(old_glyph_ids)
+        end
       end
 
       # Get new glyph ID for an old glyph ID

data/lib/fontisan/tables/cff.rb

@@ -408,30 +408,134 @@ module Fontisan
         true
       end
 
+      # Adobe Standard Encoding glyph names that map 1:1 to CFF SIDs
+      # 0..95. Source: Adobe CFF Specification 1.0 (TN 5176), Appendix A.
+      # These cover the printable ASCII range plus .notdef — the most
+      # common glyph names encountered in CFF fonts.
+      STANDARD_STRINGS_ASCII = [
+        ".notdef", # SID 0
+        "space", # SID 1 (code 32)
+        "exclam", # SID 2 (code 33)
+        "quotedbl", # SID 3 (code 34)
+        "numbersign", # SID 4 (code 35)
+        "dollar", # SID 5 (code 36)
+        "percent", # SID 6 (code 37)
+        "ampersand", # SID 7 (code 38)
+        "quoteright", # SID 8 (code 39)
+        "parenleft", # SID 9 (code 40)
+        "parenright", # SID 10 (code 41)
+        "asterisk", # SID 11 (code 42)
+        "plus", # SID 12 (code 43)
+        "comma", # SID 13 (code 44)
+        "hyphen", # SID 14 (code 45)
+        "period", # SID 15 (code 46)
+        "slash", # SID 16 (code 47)
+        "zero", # SID 17 (code 48)
+        "one", # SID 18 (code 49)
+        "two", # SID 19 (code 50)
+        "three", # SID 20 (code 51)
+        "four", # SID 21 (code 52)
+        "five", # SID 22 (code 53)
+        "six", # SID 23 (code 54)
+        "seven", # SID 24 (code 55)
+        "eight", # SID 25 (code 56)
+        "nine", # SID 26 (code 57)
+        "colon", # SID 27 (code 58)
+        "semicolon", # SID 28 (code 59)
+        "less", # SID 29 (code 60)
+        "equal", # SID 30 (code 61)
+        "greater", # SID 31 (code 62)
+        "question", # SID 32 (code 63)
+        "at", # SID 33 (code 64)
+        "A", # SID 34 (code 65)
+        "B", # SID 35 (code 66)
+        "C", # SID 36 (code 67)
+        "D", # SID 37 (code 68)
+        "E", # SID 38 (code 69)
+        "F", # SID 39 (code 70)
+        "G", # SID 40 (code 71)
+        "H", # SID 41 (code 72)
+        "I", # SID 42 (code 73)
+        "J", # SID 43 (code 74)
+        "K", # SID 44 (code 75)
+        "L", # SID 45 (code 76)
+        "M", # SID 46 (code 77)
+        "N", # SID 47 (code 78)
+        "O", # SID 48 (code 79)
+        "P", # SID 49 (code 80)
+        "Q", # SID 50 (code 81)
+        "R", # SID 51 (code 82)
+        "S", # SID 52 (code 83)
+        "T", # SID 53 (code 84)
+        "U", # SID 54 (code 85)
+        "V", # SID 55 (code 86)
+        "W", # SID 56 (code 87)
+        "X", # SID 57 (code 88)
+        "Y", # SID 58 (code 89)
+        "Z", # SID 59 (code 90)
+        "bracketleft", # SID 60 (code 91)
+        "backslash", # SID 61 (code 92)
+        "bracketright", # SID 62 (code 93)
+        "asciicircum", # SID 63 (code 94)
+        "underscore", # SID 64 (code 95)
+        "quoteleft", # SID 65 (code 96)
+        "a", # SID 66 (code 97)
+        "b", # SID 67 (code 98)
+        "c", # SID 68 (code 99)
+        "d", # SID 69 (code 100)
+        "e", # SID 70 (code 101)
+        "f", # SID 71 (code 102)
+        "g", # SID 72 (code 103)
+        "h", # SID 73 (code 104)
+        "i", # SID 74 (code 105)
+        "j", # SID 75 (code 106)
+        "k", # SID 76 (code 107)
+        "l", # SID 77 (code 108)
+        "m", # SID 78 (code 109)
+        "n", # SID 79 (code 110)
+        "o", # SID 80 (code 111)
+        "p", # SID 81 (code 112)
+        "q", # SID 82 (code 113)
+        "r", # SID 83 (code 114)
+        "s", # SID 84 (code 115)
+        "t", # SID 85 (code 116)
+        "u", # SID 86 (code 117)
+        "v", # SID 87 (code 118)
+        "w", # SID 88 (code 119)
+        "x", # SID 89 (code 120)
+        "y", # SID 90 (code 121)
+        "z", # SID 91 (code 122)
+        "braceleft", # SID 92 (code 123)
+        "bar", # SID 93 (code 124)
+        "braceright", # SID 94 (code 125)
+        "asciitilde", # SID 95 (code 126)
+      ].freeze
+
+      # First SID outside the ASCII subset. SIDs in
+      # EXTENDED_STRINGS_START..390 cover ligatures, currency symbols,
+      # Cyrillic (afii*), etc. Resolving those requires the full
+      # Adobe CFF spec Appendix A table; tracked as a follow-up to
+      # avoid embedding unverified data.
+      EXTENDED_STRINGS_START = STANDARD_STRINGS_ASCII.length
+
       private
 
-      # Get a standard CFF string by SID
-      #
-      # This is a placeholder that returns a generic string.
-      # A complete implementation would include all 391 standard strings
-      # from CFF spec Appendix A.
+      # Get a standard CFF string by SID (0-390).
       #
-      # TODO: Implement complete standard string table in follow-up task
+      # The ASCII subset (SID 0-95) is fully covered. Extended SIDs
+      # (96-390) cover ligatures, currency, Cyrillic, etc., and
+      # require the full Adobe CFF spec Appendix A table to fill in
+      # correctly. Until that follow-up lands, extended SIDs return
+      # nil so callers can detect the gap and fall back to the
+      # custom string index.
       #
       # @param sid [Integer] String ID (0-390)
-      # @return [String] Standard string
+      # @return [String, nil] standard string, or nil for uncovered SIDs
       def standard_string(sid)
-        # Placeholder implementation
-        # Full implementation should include all standard strings
-        # from CFF specification Appendix A
-        case sid
-        when 0 then ".notdef"
-        when 1 then "space"
-        when 2 then "exclam"
-        # ... (388 more standard strings)
-        else
-          ".notdef" # Fallback
-        end
+        return nil if sid.negative?
+        return STANDARD_STRINGS_ASCII[sid] if sid < EXTENDED_STRINGS_START
+
+        nil
       end
 
       # Get the Charset for a specific font

data/lib/fontisan/version.rb

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

metadata

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