fontisan 0.4.30 → 0.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd9aa72ac0517bcfbfed3d6eb3528af3e0b65a52bc721d14ba5fb545198e48f
-  data.tar.gz: be1d6d7379a3bd0cda435d02b91e5d7fc213736483e3aac66b93280d63261669
+  metadata.gz: 2a84b3003bce58bcd29e1ada7dd175235d6a57f90c062e70e8c6696f818b4a4a
+  data.tar.gz: e9890a2151d339ec8aee34bab3da816615afa1a19aade3739fb1928e2711158e
 SHA512:
-  metadata.gz: b889fec5459a0d420ffe21d3ec792f107c69060eeddba8cf357e1a83b1e37669c3b6d017b41921b6d5be28519d51ef13ef2ab4da2d00e9ccfb9a31c204310150
-  data.tar.gz: 69952d13b5c18685c8b22d92b5f56c8ed2cfc89da8a5324080a9f206823d1999baf947718fbf56e77e239de422dcbf21033e9a7d060a30e5e5e5df6482727ce0
+  metadata.gz: 0ee92245d86e3b325daa81caf2657c2dcad21c796a775ceea579482a85b5ba59e751f2f993e3ab9a5ac7af12ec8d6b1b698c4b8625fb968f44d5ebfc86434a7e
+  data.tar.gz: 5120ad6b71b8263c33fc0d22bf9a80d61377417aa95916ca2a205801aa1788fb8be958fa36c5e0cb428fa2ac4b7f155c83181c0a251d829a29fbfd6b9779d9c2

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/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.31"
 end

metadata

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