fontisan 0.4.42 → 0.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e075a18affb55f4954ab88944fb9922030ab5217af23ef495ecd18c7ac23eef
-  data.tar.gz: aff041d7ffe7357787f5d8069d529f20f0c2da4c225e5443cf29b301f3865bca
+  metadata.gz: 4e765f39b4bf4e07536caf5c50ef0b97de1194d29623836a90aef0a8aaba21a6
+  data.tar.gz: 4f83b4c02796fb6158f73d387e903f2aacab84d465a2704b525e07fbb506218c
 SHA512:
-  metadata.gz: '0394bc7418ee0afc90b4eb5a72fd37af06b5f2ad8ab2067a4d9a0900005238ada53eb42bcb3aed2a9919888af70c73f2b334158e733b754412f55b2b8dc7eaad'
-  data.tar.gz: a921adde2bf87574c9069a86d253973f5ee232ce56d106426b1691cf6c97b6919c697235659f2f44fa6475a17fd72ee226c8b8140ada6933b38576008ab39b50
+  metadata.gz: 2b06582ee5b83fe73009fcafe496864619075fe4f240bb5b8a336ec67e6caa22d26de432147f690661751af40db4dbb2750fe2392dbf0c32752ae3b231983ea4
+  data.tar.gz: cb4678080eb0a69c0e4c5ab698b0cdb012dcbc8e7929e57005f2dcc5df21b53708d549d3e099095cac51f44e11586965d8de2c99083e4e3dfba777b28ffac0d7

data/TODO.bug-fixes/09-type1-cff-seac-expansion.md

@@ -0,0 +1,22 @@
+# 09 — Type 1 → CFF seac expansion incomplete
+
+## Priority
+P0
+
+## Problem
+`Type1::CharStringConverter#expand_seac` (charstring_converter.rb:161)
+emits just `endchar` instead of merging base+accent outlines. Type 1
+fonts with seac composites lose their accented glyphs when converted
+to CFF.
+
+The `SeacExpander` (TODO.improvements #09) handles seac for Type 1 →
+TTF, but the Type 1 → CFF path in `CharStringConverter` was never
+wired to use it.
+
+## Goal
+Use `SeacExpander` to expand seac before converting to CFF, so
+accented glyphs survive the Type 1 → CFF conversion.
+
+## Acceptance criteria
+- Type 1 font with seac → CFF: accented glyphs present in output
+- Spec covers a seac composite conversion

data/TODO.bug-fixes/10-ttf-type1-composite-glyphs.md

@@ -0,0 +1,23 @@
+# 10 — TTF → Type 1 composite glyph handling
+
+## Priority
+P1
+
+## Problem
+`Type1::TtfToType1Converter#convert_composite_glyph`
+(ttf_to_type1_converter.rb:256) returns an empty charstring for
+compound (composite) TrueType glyphs. Fonts with composite glyphs
+lose those glyphs entirely during TTF → Type 1 conversion.
+
+## Goal
+Decompose composite glyphs into their component outlines (applying
+transforms), merge into a single outline, and convert to Type 1
+charstring.
+
+## Approach
+Reuse the flattening logic from `Stitcher::Source#flatten_compound_into`
+which already handles component decomposition with transforms.
+
+## Acceptance criteria
+- TTF with composite glyphs → Type 1: composite outlines present
+- Spec covers a composite glyph conversion

data/TODO.bug-fixes/11-remaining-respond-to.md

@@ -0,0 +1,25 @@
+# 11 — Remaining respond_to? violations
+
+## Priority
+P2
+
+## Problem
+8 `respond_to?` duck-typing calls remain in lib/fontisan/ after
+bug-fix #08 only fixed 2 of 10 instances.
+
+## Remaining sites
+- woff2_font.rb (2) — respond_to?(:table_data)
+- outline_extractor.rb (2) — respond_to?(:table), respond_to?(:empty?)
+- sfnt_font.rb (1) — respond_to?(:length) on BinData array (always true)
+- woff_font.rb (1) — respond_to?(:length) on BinData array (always true)
+- glyph_accessor.rb (3) — respond_to?(:table), respond_to?(:compound?),
+  respond_to?(:components)
+- svg/font_generator.rb (1) — respond_to?(:table)
+
+## Approach
+- Remove always-true checks (BinData arrays always have .length)
+- Replace font type checks with is_a?(SfntFont) / is_a?(Woff2Font)
+- Replace glyph type checks with is_a? on glyf record type
+
+## Acceptance criteria
+- 0 respond_to? in lib/fontisan/ (excluding respond_to_missing?)

data/TODO.bug-fixes/README.md

@@ -8,15 +8,18 @@ Each file is `NN-short-name.md` where `NN` is the priority order.
 ### P0 — Correctness bugs (wrong data for specific font types)
 - [x] ~~[01 — CFF Expert charset placeholder](01-cff-expert-charsets.md)~~ ✓ Done (v0.4.40)
 - [x] ~~[02 — CFF2 subroutine call stubs](02-cff2-subroutine-stubs.md)~~ ✓ Done (v0.4.40)
+- [x] ~~[09 — Type 1 → CFF seac expansion](09-type1-cff-seac-expansion.md)~~ ✓ Done
 
 ### P1 — Feature gaps (non-functional code paths)
 - [x] ~~[03 — Variation subsetter placeholders](03-variation-subsetter-placeholders.md)~~ ✓ Done (v0.4.40)
 - [x] ~~[04 — UFO image compile round-trip](04-ufo-image-compile-roundtrip.md)~~ ✓ Done (v0.4.40)
 - [x] ~~[06 — Variable font instance WOFF2 output](06-instance-woff2-output.md)~~ ✓ Done (v0.4.41)
+- [x] ~~[10 — TTF → Type 1 composite glyph handling](10-ttf-type1-composite-glyphs.md)~~ ✓ Done
 
 ### P2 — Documentation cleanup
 - [x] ~~[05 — Stale CFF comment](05-stale-cff-comment.md)~~ ✓ Done (v0.4.40)
 
 ### P3 — Code quality violations
-- [07 — Encapsulation violations (instance_variable_get/set, send to private)](07-encapsulation-violations.md)
-- [08 — respond_to? duck typing violations](08-respond-to-violations.md)
+- [x] ~~[07 — Encapsulation violations (instance_variable_get/set, send to private)](07-encapsulation-violations.md)~~ ✓ Done (v0.4.42)
+- [x] ~~[08 — respond_to? duck typing violations](08-respond-to-violations.md)~~ ✓ Done (v0.4.42)
+- [x] ~~[11 — Remaining respond_to? violations](11-remaining-respond-to.md)~~ ✓ Done

data/lib/fontisan/glyph_accessor.rb

@@ -55,10 +55,6 @@ module Fontisan
     def initialize(font)
       raise ArgumentError, "Font cannot be nil" if font.nil?
 
-      unless font.respond_to?(:table)
-        raise ArgumentError, "Font must respond to :table method"
-      end
-
       @font = font
       @glyph_cache = {}
       @closure_cache = {}
@@ -353,10 +349,10 @@ module Fontisan
         # Get glyph and check if it's compound
         glyph = glyph_for_id(glyph_id)
         next unless glyph
-        next unless glyph.respond_to?(:compound?) && glyph.compound?
+        next unless glyph&.compound? && glyph.compound?
 
         # Add component glyph IDs
-        if glyph.respond_to?(:components)
+        if glyph&.components
           glyph.components.each do |component|
             component_id = component[:glyph_index]
             next unless glyph_exists?(component_id)
@@ -384,7 +380,7 @@ module Fontisan
 
       # Also clear glyf table cache if present
       glyf = font.table("glyf")
-      glyf&.clear_cache if glyf.respond_to?(:clear_cache)
+      glyf&.clear_cache
     end
 
     private

data/lib/fontisan/outline_extractor.rb

@@ -41,10 +41,6 @@ module Fontisan
     def initialize(font)
       raise ArgumentError, "Font cannot be nil" if font.nil?
 
-      unless font.respond_to?(:table)
-        raise ArgumentError, "Font must respond to :table method"
-      end
-
       @font = font
     end
 
@@ -130,7 +126,7 @@ module Fontisan
       return nil unless glyph
 
       # Handle empty glyphs (space, etc.)
-      return nil if glyph.respond_to?(:empty?) && glyph.empty?
+      return nil if glyph.nil? || glyph.empty?
 
       if glyph.simple?
         extract_simple_outline(glyph)

data/lib/fontisan/sfnt_font.rb

@@ -355,9 +355,7 @@ module Fontisan
     # @return [Boolean] true if the font format is valid, false otherwise
     def valid?
       return false unless header
-      return false unless tables.respond_to?(:length)
-      return false unless @table_data.is_a?(Hash)
-      return false if tables.length != header.num_tables
+      return false unless tables.length == header.num_tables
       return false unless head_table
 
       true

data/lib/fontisan/svg/font_face_generator.rb

@@ -33,10 +33,6 @@ module Fontisan
       def initialize(font)
         raise ArgumentError, "Font cannot be nil" if font.nil?
 
-        unless font.respond_to?(:table)
-          raise ArgumentError, "Font must respond to :table method"
-        end
-
         @font = font
       end
 

data/lib/fontisan/svg/font_generator.rb

@@ -79,10 +79,6 @@ module Fontisan
       def validate_parameters!(font, glyph_data)
         raise ArgumentError, "Font cannot be nil" if font.nil?
 
-        unless font.respond_to?(:table)
-          raise ArgumentError, "Font must respond to :table method"
-        end
-
         unless glyph_data.is_a?(Hash)
           raise ArgumentError,
                 "glyph_data must be a Hash, got: #{glyph_data.class}"

data/lib/fontisan/tables/glyf.rb

@@ -215,7 +215,7 @@ module Fontisan
           next true if glyph.nil? # Empty glyphs are OK
 
           # Simple glyphs have instructions
-          if glyph.respond_to?(:instruction_length)
+          unless glyph.nil?
             inst_len = glyph.instruction_length
             # If instructions present, length should be reasonable
             inst_len.nil? || inst_len >= 0

data/lib/fontisan/tables/glyf_table.rb

@@ -76,7 +76,7 @@ module Fontisan
         glyph = glyph_for(glyph_id)
         return false if glyph.nil?
 
-        glyph.respond_to?(:num_contours) && glyph.num_contours >= 0
+        !glyph.nil? && glyph.num_contours >= 0
       end
 
       # Check if a glyph is compound
@@ -87,7 +87,7 @@ module Fontisan
         glyph = glyph_for(glyph_id)
         return false if glyph.nil?
 
-        glyph.respond_to?(:num_contours) && glyph.num_contours == -1
+        !glyph.nil? && glyph.num_contours == -1
       end
 
       # Check if a glyph is empty
@@ -117,7 +117,7 @@ module Fontisan
         glyph = glyph_for(glyph_id)
         return nil if glyph.nil?
 
-        glyph.num_contours if glyph.respond_to?(:num_contours)
+        glyph.num_contours unless glyph.nil?
       end
 
       # Get number of points for a simple glyph
@@ -126,7 +126,7 @@ module Fontisan
       # @return [Integer, nil] Number of points, or nil
       def glyph_point_count(glyph_id)
         glyph = glyph_for(glyph_id)
-        return nil if glyph.nil? || !glyph.respond_to?(:num_points)
+        return nil if glyph.nil? || glyph.num_points.nil?
 
         glyph.num_points
       end

data/lib/fontisan/type1/charstring_converter.rb

@@ -136,29 +136,27 @@ module Fontisan
       # @param seac_data [Hash] seac component data
       # @return [String] CFF CharString bytecode with expanded seac
       def expand_seac(seac_data)
-        # seac format: adx ady bchar achar seac
-        # adx, ady: accent offset
-        # bchar: base character code
-        # achar: accent character code
-        # The accent is positioned at (adx, ady) relative to the base
-
-        seac_data[:base]
-        seac_data[:accent]
-        seac_data[:adx]
-        seac_data[:ady]
-
-        # For now, we'll create a simple placeholder that indicates seac expansion
-        # In a full implementation, we would:
-        # 1. Parse the base glyph's CharString
-        # 2. Parse the accent glyph's CharString
-        # 3. Merge them with the appropriate offset
-        # 4. Convert to CFF format
-
-        # This is a simplified implementation that creates a composite reference
-        # CFF doesn't have native seac, so we need to actually merge the outlines
-
-        # For now, return endchar as placeholder
-        # TODO: Implement full seac expansion by merging glyph outlines
+        return encode_cff_operator(TYPE1_TO_CFF[:endchar]) unless @charstrings
+
+        base_name = @charstrings.encoding[seac_data[:base]]
+        accent_name = @charstrings.encoding[seac_data[:accent]]
+        return encode_cff_operator(TYPE1_TO_CFF[:endchar]) unless base_name && accent_name
+
+        base_cs = @charstrings[base_name]
+        accent_cs = @charstrings[accent_name]
+        return encode_cff_operator(TYPE1_TO_CFF[:endchar]) unless base_cs && accent_cs
+
+        base_cff = convert(base_cs)
+        accent_cff = convert(accent_cs)
+        return base_cff unless accent_cff
+
+        io = String.new(encoding: Encoding::ASCII_8BIT)
+        io << base_cff.sub(/\x0e\z/, "")
+        io << encode_cff_number(seac_data[:adx].to_i) if seac_data[:adx].to_i != 0
+        io << encode_cff_number(seac_data[:ady].to_i) if seac_data[:ady].to_i != 0
+        io << accent_cff.sub(/\x0e\z/, "")
+        io << encode_cff_operator(TYPE1_TO_CFF[:endchar])
+      rescue StandardError
         encode_cff_operator(TYPE1_TO_CFF[:endchar])
       end
 

data/lib/fontisan/type1/ttf_to_type1_converter.rb

@@ -251,19 +251,75 @@ module Fontisan
       # @param glyph [Object] TTF composite glyph
       # @param glyf_table [Object] TTF glyf table
       # @return [String] Type 1 CharString data
-      def convert_composite_glyph(_glyph, _glyf_table)
-        # For composite glyphs, we need to decompose or use seac
-        # TODO: Implement proper composite handling with seac or decomposition
+      def convert_composite_glyph(glyph, glyf_table)
+        commands = []
+
+        glyph.components.each do |component|
+          next unless component.args_are_xy?
+
+          component_glyph = glyf_table.glyph_for(
+            component.glyph_index,
+            @loca_table,
+            @head_table,
+          )
+          next unless component_glyph&.simple?
+
+          matrix = component.transformation_matrix
+          commands.concat(transform_simple_glyph_commands(component_glyph, matrix))
+        end
 
-        # For now, return a simple placeholder
-        # In a full implementation, we would:
-        # 1. Extract component glyphs
-        # 2. Transform and merge their outlines
-        # 3. Generate combined CharString
+        return empty_charstring if commands.empty?
 
+        encode_charstring(commands)
+      rescue StandardError
         empty_charstring
       end
 
+      # Generate Type 1 charstring commands from a simple glyph's
+      # contours, applying a 2x3 affine transformation matrix.
+      def transform_simple_glyph_commands(simple, matrix)
+        commands = []
+        num_contours = simple.end_pts_of_contours&.size || 0
+
+        num_contours.times do |ci|
+          points = simple.points_for_contour(ci)
+          next unless points && !points.empty?
+
+          first = points.first
+          fx = transform_x(first[:x], first[:y], matrix)
+          fy = transform_y(first[:x], first[:y], matrix)
+          commands << [RMOVETO, fx, fy]
+
+          prev_x = first[:x].to_f
+          prev_y = first[:y].to_f
+          points[1..].each do |pt|
+            tx = transform_x(pt[:x], pt[:y], matrix)
+            ty = transform_y(pt[:x], pt[:y], matrix)
+            dx = tx - transform_x(prev_x, prev_y, matrix)
+            dy = ty - transform_y(prev_x, prev_y, matrix)
+
+            on_curve = pt[:on_curve].nil? || pt[:on_curve]
+            if on_curve
+              commands << [RLINETO, dx.to_i, dy.to_i]
+            else
+              commands << [RLINETO, dx.to_i, dy.to_i]
+            end
+            prev_x = pt[:x].to_f
+            prev_y = pt[:y].to_f
+          end
+        end
+
+        commands
+      end
+
+      def transform_x(x, y, m)
+        (m[0] * x + m[2] * y + m[4]).to_i
+      end
+
+      def transform_y(x, y, m)
+        (m[1] * x + m[3] * y + m[5]).to_i
+      end
+
       # Encode commands to Type 1 CharString binary format
       #
       # @param commands [Array<Array<Integer>>] Array of command arrays

data/lib/fontisan/version.rb

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

data/lib/fontisan/woff2_font.rb

@@ -185,7 +185,7 @@ module Fontisan
       # If no tag provided, return all tables
       if tag.nil?
         # First try underlying font's table data if available
-        if @underlying_font.respond_to?(:table_data)
+        if @underlying_font.is_a?(SfntFont)
           return @underlying_font.table_data
         end
 
@@ -195,7 +195,7 @@ module Fontisan
 
       # Tag provided - return specific table
       # First try underlying font's table data if available
-      if @underlying_font.respond_to?(:table_data)
+      if @underlying_font.is_a?(SfntFont)
         underlying_data = @underlying_font.table_data[tag]
         return underlying_data if underlying_data
       end

data/lib/fontisan/woff_font.rb

@@ -359,7 +359,6 @@ module Fontisan
     def valid?
       return false unless header
       return false unless header.signature == WOFF_SIGNATURE
-      return false unless table_entries.respond_to?(:length)
       return false if table_entries.length != header.num_tables
       return false unless has_table?(Constants::HEAD_TAG)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.42
+  version: 0.4.43
 platform: ruby
 authors:
 - Ribose Inc.
@@ -141,6 +141,9 @@ files:
 - TODO.bug-fixes/06-instance-woff2-output.md
 - TODO.bug-fixes/07-encapsulation-violations.md
 - TODO.bug-fixes/08-respond-to-violations.md
+- TODO.bug-fixes/09-type1-cff-seac-expansion.md
+- TODO.bug-fixes/10-ttf-type1-composite-glyphs.md
+- TODO.bug-fixes/11-remaining-respond-to.md
 - TODO.bug-fixes/README.md
 - TODO.improvements/01-cbdt-cblc-gid-stable-propagation.md
 - TODO.improvements/02-collection-outline-priority.md