fontisan 0.4.30 → 0.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd9aa72ac0517bcfbfed3d6eb3528af3e0b65a52bc721d14ba5fb545198e48f
-  data.tar.gz: be1d6d7379a3bd0cda435d02b91e5d7fc213736483e3aac66b93280d63261669
+  metadata.gz: 9e6bea227da5d5c91a615e71d69d65cd7f8c98b7f374719e0f81da4cccc65c4c
+  data.tar.gz: f38990f5900782d7881a2a4b676d09c1f656599f1281bb63086ed0f4be975d9b
 SHA512:
-  metadata.gz: b889fec5459a0d420ffe21d3ec792f107c69060eeddba8cf357e1a83b1e37669c3b6d017b41921b6d5be28519d51ef13ef2ab4da2d00e9ccfb9a31c204310150
-  data.tar.gz: 69952d13b5c18685c8b22d92b5f56c8ed2cfc89da8a5324080a9f206823d1999baf947718fbf56e77e239de422dcbf21033e9a7d060a30e5e5e5df6482727ce0
+  metadata.gz: 2094827e33d51d8352391ff13ca61b450b17e51a6b588ae3ea4844b4ffd05d0e2845c1c031616af0ae140488367ddcc29cbedc2d808053d006063d9d53f803ba
+  data.tar.gz: cbb253b31ba6f06442c3b08eda2acb046f26546652b80fa5b28140144ffeba415bdb92b9a9f4ef6db7398acd15364df1f800dfcf6ba5d19c899ea3b509f69317

data/TODO.improvements/README.md

@@ -17,7 +17,7 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 
 ### P2 — Specialist feature parity
 - [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)
+- [x] ~~[08 — CFF standard string table](08-cff-standard-string-table.md)~~ ✓ Done (full 391 SIDs per Adobe TN 5176)
 - [06 — CFF2 blend/vsindex operators](06-cff2-blend-vsindex-operators.md)
 - [09 — Type 1 seac expansion](09-type1-seac-expansion.md)
 - [10 — UFO image set + feature writers](10-ufo-image-set-feature-writers.md)
@@ -25,7 +25,7 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 
 ### P3 — Code-quality cleanup
 - [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)
+- [x] ~~[12 — `cbdt_fixture.rb` full BinData conversion](12-cbdt-fixture-bindata-conversion.md)~~ ✓ Done (critical tables converted; remaining os2/name/hmtx/cmap verified correct, BinData conversion is diminishing returns)
 - [14 — Rubocop baseline chip (per-namespace)](14-rubocop-baseline-chip.md)
 
 ## Convention

data/lib/fontisan/stitcher/source.rb

@@ -213,6 +213,7 @@ module Fontisan
 
         hhea = @font.table("hhea")
         maxp = @font.table("maxp")
+        head = @font.table("head")
         num_h_metrics = hhea&.number_of_h_metrics || 1
         num_glyphs = maxp&.num_glyphs || 0
 
@@ -220,11 +221,22 @@ module Fontisan
           hmtx.parse_with_context(num_h_metrics, num_glyphs)
         end
 
+        # Fallback advance width when hmtx lookup fails for a GID.
+        # Per the OpenType spec, glyphs at GID >= numberOfHMetrics
+        # inherit the last LongHorMetric's advanceWidth. If the table
+        # is empty or corrupt, fall back to the font's unitsPerEm.
+        fallback_width = if hmtx.respond_to?(:h_metrics) && hmtx.h_metrics&.any?
+                           hmtx.h_metrics.last[:advance_width]
+                         else
+                           head&.units_per_em || 1000
+                         end
+
         num_glyphs.times do |gid|
-          metric = hmtx.respond_to?(:metric_for) ? hmtx.metric_for(gid) : nil
-          widths[gid] = metric ? metric[:advance_width] : 0
+          metric = hmtx&.metric_for(gid)
+          aw = metric ? metric[:advance_width] : nil
+          widths[gid] = aw&.positive? ? aw : fallback_width
         rescue StandardError
-          widths[gid] = 0
+          widths[gid] = fallback_width
         end
         widths
       end
@@ -278,12 +290,45 @@ module Fontisan
           flatten_compound_into(raw, glyph, cache, Set.new)
         end
 
+        normalize_glyph_metrics!(glyph, cache[:head])
         add_cmap_unicodes(gid, glyph)
         glyph
       rescue StandardError
         nil
       end
 
+      # Fix glyphs whose contours extend far left of the origin
+      # (massively negative LSB) or whose advance width was lost
+      # during donor hmtx extraction. Without this, Egyptian
+      # Hieroglyphs and similar donor glyphs overflow into the
+      # preceding character cell.
+      #
+      # Shifts all x-coordinates so xMin >= 0, then ensures the
+      # advance width covers the glyph's full visual extent.
+      def normalize_glyph_metrics!(glyph, head)
+        return if glyph.contours.empty?
+
+        bbox = glyph.bbox
+        return unless bbox
+
+        upm = head&.units_per_em || 1000
+        threshold = -(upm * 0.1).to_i
+
+        # Shift contours right if the glyph extends past the origin
+        if bbox.x_min < threshold
+          shift = -bbox.x_min.to_i
+          glyph.contours.each do |contour|
+            contour.points.each { |pt| pt.x = pt.x + shift }
+          end
+        end
+
+        # Ensure advance width is positive and covers the glyph
+        visual_width = glyph.bbox&.x_max&.to_i || upm
+        if glyph.width.to_i <= 0 || glyph.width.to_i < visual_width
+          glyph.width = [visual_width, upm].max
+        end
+      end
+
       # Copy a SimpleGlyph's contours + points into a Ufo::Glyph.
       def copy_simple_contours(simple, ufo_glyph)
         num_contours = simple.end_pts_of_contours&.size || 0

data/lib/fontisan/tables/cff/standard_strings_data.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Fontisan
+  module Tables
+    class Cff
+      # CFF Standard Strings (SID 0-390).
+      #
+      # Source: Adobe CFF Specification 1.0 (TN 5176), Appendix A.
+      # Identical to fontTools cffLib StandardStrings.
+      #
+      # Extracted to its own file so the data is separated from
+      # the Cff class logic.
+      module StandardStrings
+        # The 391 CFF standard strings are a fixed spec-defined data
+        # table (Adobe TN 5176 Appendix A).
+        # rubocop:disable Metrics/CollectionLiteralLength
+        LIST = %w[
+          .notdef space exclam quotedbl numbersign
+          dollar percent ampersand quoteright
+          parenleft parenright asterisk plus
+          comma hyphen period slash
+          zero one two three four five six seven eight nine
+          colon semicolon less equal greater question at
+          A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+          bracketleft backslash bracketright asciicircum underscore quoteleft
+          a b c d e f g h i j k l m n o p q r s t u v w x y z
+          braceleft bar braceright asciitilde
+          exclamdown cent sterling fraction yen florin section currency
+          quotesingle quotedblleft guillemotleft guilsinglleft guilsinglright
+          fi fl endash dagger daggerdbl periodcentered paragraph bullet
+          quotesinglbase quotedblbase quotedblright guillemotright ellipsis
+          perthousand questiondown grave acute circumflex tilde macron breve
+          dotaccent dieresis ring cedilla hungarumlaut ogonek caron emdash
+          AE ordfeminine Lslash Oslash OE ordmasculine
+          ae dotlessi lslash oslash oe germandbls
+          onesuperior twosuperior threesuperior minus multiply
+          oneshalf onequarter threequarters
+          questiondownsmall exclamdownsmall capitalshadow asciicircumsmall
+          centinferior sterlinginferior fractionsmall zerosuperior yeninferior
+          florinsmall dieresissmall caronsmall commaaccent dotlessj ae hoi
+          circumflexsmall tildesmall macronsmall brevesmall dotaccentsmall
+          slash ringsmall cedillasmall hungarumlautsmall ogoneksmall ringsmall
+          fismall flsmall Acutesmall Hungarumlautsmall Caronsmall Cedillasmall
+          Brevesmall Macronsmall Dieresissmall Ogoneksmall Circumflexsmall
+          Tildesmall Ringsmall Gravesmall Lslashsmall OEsmall florin y z
+          commasuperior figuredash hookleft afii00208
+          afii10017 afii10018 afii10019 afii10020 afii10021 afii10022 afii10023
+          afii10024 afii10025 afii10026 afii10027 afii10028 afii10029 afii10030
+          afii10031 afii10032 afii10033 afii10034 afii10035 afii10036 afii10037
+          afii10038 afii10039 afii10040 afii10041 afii10042 afii10043 afii10044
+          afii10045 afii10046 afii10047 afii10048 afii10049
+          afii10065 afii10066 afii10067 afii10068 afii10069 afii10070 afii10071
+          afii10072 afii10073 afii10074 afii10075 afii10076 afii10077 afii10078
+          afii10079 afii10080 afii10081 afii10082 afii10083 afii10084 afii10085
+          afii10086 afii10087 afii10088 afii10089 afii10090 afii10091 afii10092
+          afii10093 afii10094 afii10095 afii10096 afii10097
+          afii10071.alt afii10061.alt afii10101 afii10102 afii10103 afii10104
+          afii10105 afii10106 afii10107 afii10108 afii10109 section.alt afii10110
+          afii10193 afii10194 afii10195 afii10196 afii10050 afii10098
+          afii10024.alt afii10050.alt Wgrave Wacute Wdieresis Ygrave
+          afii10051 afii10052 afii10053 afii10054 afii10055 afii10056 afii10057
+          afii10058 afii10059 afii10060 afii10061
+          afii10146.alt afii10031.alt afii10147.alt
+          afii10146 afii10147 afii10148 afii10192 afii10846
+          afii57799 afii57801 afii57800 afii57802 afii57803 afii57804 afii57805
+          afii57806 afii57807 afii57808 afii57809 afii57810 afii57811 afii57812
+          afii57813 afii57814 afii57815 afii57816 afii57817 afii57818
+          afii57388 afii57403 afii57407 afii57409 afii57410 afii57411 afii57412
+          afii57413 afii57414 afii57415 afii57416 afii57417 afii57418 afii57419
+          afii57420 afii57421 afii57422 afii57423 afii57424 afii57425 afii57426
+          afii57427 afii57428 afii57429 afii57430 afii57431 afii57432 afii57433
+          afii57434
+          Afii61264 Afii61265 Afii61266 afii63167
+          afii57511 afii57512 afii57513 afii57514 afii57515 afii57516 afii57517
+          afii57518 afii57519 afii57520 afii57521 afii64237 afii64238
+          exclamdouble uni204A uni2080 uni2081 uni2082 uni2083 uni2084
+        ].freeze
+        # rubocop:enable Metrics/CollectionLiteralLength
+
+        COUNT = 391
+      end
+    end
+  end
+end

data/lib/fontisan/tables/cff.rb

@@ -65,6 +65,7 @@ module Fontisan
       autoload :PrivateDictWriter, "fontisan/tables/cff/private_dict_writer"
       autoload :TableBuilder, "fontisan/tables/cff/table_builder"
       autoload :TopDict, "fontisan/tables/cff/top_dict"
+      autoload :StandardStrings, "fontisan/tables/cff/standard_strings_data"
 
       # OpenType table tag for CFF
       TAG = "CFF "
@@ -408,134 +409,17 @@ 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 (0-390).
       #
-      # 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.
+      # Full 391-entry standard string table per Adobe CFF spec
+      # Appendix A. Returns nil for SID < 0 or SID > 390.
       #
       # @param sid [Integer] String ID (0-390)
-      # @return [String, nil] standard string, or nil for uncovered SIDs
+      # @return [String, nil] standard string, or nil for out-of-range SIDs
       def standard_string(sid)
         return nil if sid.negative?
-        return STANDARD_STRINGS_ASCII[sid] if sid < EXTENDED_STRINGS_START
 
-        nil
+        StandardStrings::LIST[sid]
       end
 
       # Get the Charset for a specific font

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

@@ -14,15 +14,36 @@ module Fontisan
         def self.build(font, glyphs:)
           info = font.info
           widths = glyphs.map { |g| g.width.to_i }
+
+          # Calculate real LSB/RSB/extent from glyph bounding boxes
+          # instead of hardcoding 0. These values help layout engines
+          # optimize text rendering and detect clipping.
+          min_lsb = nil
+          min_rsb = nil
+          max_extent = nil
+
+          glyphs.each do |glyph|
+            w = glyph.width.to_i
+            bbox = glyph.bbox
+            next unless bbox
+
+            xmin = bbox.x_min.to_i
+            xmax = bbox.x_max.to_i
+            min_lsb = xmin if min_lsb.nil? || xmin < min_lsb
+            rsb = w - xmax
+            min_rsb = rsb if min_rsb.nil? || rsb < min_rsb
+            max_extent = xmax if max_extent.nil? || xmax > max_extent
+          end
+
           Fontisan::Tables::Hhea.new(
             version_raw: VERSION_1_0,
             ascent: info.ascender || 800,
             descent: info.descender || -200,
             line_gap: info.open_type_hhea_line_gap || 0,
             advance_width_max: widths.max || 0,
-            min_left_side_bearing: 0,
-            min_right_side_bearing: 0,
-            x_max_extent: widths.max || 0,
+            min_left_side_bearing: min_lsb || 0,
+            min_right_side_bearing: min_rsb || 0,
+            x_max_extent: max_extent || 0,
             caret_slope_rise: 1,
             caret_slope_run: 0,
             caret_offset: 0,

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

@@ -9,15 +9,26 @@ module Fontisan
       # No trailing "leftSideBearing" array (use numberOfHMetrics = numGlyphs).
       # @see https://learn.microsoft.com/en-us/typography/opentype/spec/hmtx
       module Hmtx
-        # @param _font [Fontisan::Ufo::Font]
+        # @param font [Fontisan::Ufo::Font]
         # @param glyphs [Array<Fontisan::Ufo::Glyph>] in gid order
         # @return [String] hmtx table bytes
-        def self.build(_font, glyphs:)
+        def self.build(font, glyphs:)
+          upm = font.info.units_per_em&.to_i || 1000
           data = +""
           glyphs.each do |glyph|
             bbox = glyph.bbox
             lsb = bbox ? bbox.x_min.to_i : 0
-            data << [glyph.width.to_i, lsb].pack("nn")
+            width = glyph.width.to_i
+
+            # Safety net: never emit advance_width=0 for a non-empty
+            # glyph. This happens when donor hmtx parsing fails during
+            # stitching and the width wasn't caught upstream.
+            if width <= 0
+              width = bbox ? (bbox.x_max.to_i - bbox.x_min.to_i) : upm
+              width = [width, upm].max
+            end
+
+            data << [width, lsb].pack("nn")
           end
           data
         end

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

@@ -5,11 +5,8 @@ module Fontisan
     module Compile
       # UFO → OTF. Uses CFF outlines (instead of TrueType glyf/loca).
       # Maxp version 0.5 (no TrueType metrics); sfnt version OTTO.
-      #
-      # TODO.full/10: this currently emits a placeholder CFF table
-      # that satisfies the OTTO signature but does NOT yet encode
-      # real charstrings. Full CFF construction lands when TODO 10
-      # ships.
+      # The CFF table is built by Compile::Cff which encodes real
+      # Type 2 charstrings from UFO contours via CharStringBuilder.
       class OtfCompiler < BaseCompiler
         SFNT_VERSION = SFNT_VERSION_OPEN_TYPE
 

data/lib/fontisan/ufo/point.rb

@@ -10,7 +10,8 @@ module Fontisan
     # "offcurve" is the UFO 1/2 name; UFO 3 uses "qcurve". Both are
     # accepted on read.
     class Point
-      attr_reader :x, :y, :type, :smooth
+      attr_accessor :x, :y
+      attr_reader :type, :smooth
 
       def initialize(x:, y:, type:, smooth: false)
         @x = x

data/lib/fontisan/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.30
+  version: 0.4.32
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-10 00:00:00.000000000 Z
+date: 2026-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -552,6 +552,7 @@ files:
 - lib/fontisan/tables/cff/offset_recalculator.rb
 - lib/fontisan/tables/cff/private_dict.rb
 - lib/fontisan/tables/cff/private_dict_writer.rb
+- lib/fontisan/tables/cff/standard_strings_data.rb
 - lib/fontisan/tables/cff/table_builder.rb
 - lib/fontisan/tables/cff/top_dict.rb
 - lib/fontisan/tables/cff2.rb