fontisan 0.2.1 → 0.2.3

data/lib/fontisan/models/collection_info.rb

@@ -2,6 +2,7 @@
 
 require "lutaml/model"
 require_relative "table_sharing_info"
+require_relative "font_info"
 
 module Fontisan
   module Models
@@ -20,7 +21,8 @@ module Fontisan
     #     num_fonts: 6,
     #     font_offsets: [48, 380, 712, 1044, 1376, 1676],
     #     file_size_bytes: 2240000,
-    #     table_sharing: table_sharing_obj
+    #     table_sharing: table_sharing_obj,
+    #     fonts: [font_info1, font_info2, ...]
     #   )
     class CollectionInfo < Lutaml::Model::Serializable
       attribute :collection_path, :string
@@ -32,6 +34,7 @@ module Fontisan
       attribute :font_offsets, :integer, collection: true
       attribute :file_size_bytes, :integer
       attribute :table_sharing, TableSharingInfo
+      attribute :fonts, FontInfo, collection: true
 
       yaml do
         map "collection_path", to: :collection_path
@@ -43,6 +46,7 @@ module Fontisan
         map "font_offsets", to: :font_offsets
         map "file_size_bytes", to: :file_size_bytes
         map "table_sharing", to: :table_sharing
+        map "fonts", to: :fonts
       end
 
       json do
@@ -55,6 +59,7 @@ module Fontisan
         map "font_offsets", to: :font_offsets
         map "file_size_bytes", to: :file_size_bytes
         map "table_sharing", to: :table_sharing
+        map "fonts", to: :fonts
       end
 
       # Get version as a formatted string

data/lib/fontisan/models/font_export.rb

@@ -71,8 +71,8 @@ module Fontisan
         attribute :tag, :string
         attribute :checksum, :string
         attribute :parsed, :boolean, default: -> { false }
-        attribute :data, :string, default: -> { nil }
-        attribute :fields, :string, default: -> { nil }
+        attribute :data, :string, default: -> {}
+        attribute :fields, :string, default: -> {}
 
         yaml do
           map "tag", to: :tag

data/lib/fontisan/models/font_info.rb

@@ -36,37 +36,9 @@ module Fontisan
       attribute :font_revision, :float
       attribute :permissions, :string
       attribute :units_per_em, :integer
+      attribute :collection_offset, :integer
 
-      json do
-        map "font_format", to: :font_format
-        map "is_variable", to: :is_variable
-        map "family_name", to: :family_name
-        map "subfamily_name", to: :subfamily_name
-        map "full_name", to: :full_name
-        map "postscript_name", to: :postscript_name
-        map "postscript_cid_name", to: :postscript_cid_name
-        map "preferred_family", to: :preferred_family
-        map "preferred_subfamily", to: :preferred_subfamily
-        map "mac_font_menu_name", to: :mac_font_menu_name
-        map "version", to: :version
-        map "unique_id", to: :unique_id
-        map "description", to: :description
-        map "designer", to: :designer
-        map "designer_url", to: :designer_url
-        map "manufacturer", to: :manufacturer
-        map "vendor_url", to: :vendor_url
-        map "vendor_id", to: :vendor_id
-        map "trademark", to: :trademark
-        map "copyright", to: :copyright
-        map "license_description", to: :license_description
-        map "license_url", to: :license_url
-        map "sample_text", to: :sample_text
-        map "font_revision", to: :font_revision
-        map "permissions", to: :permissions
-        map "units_per_em", to: :units_per_em
-      end
-
-      yaml do
+      key_value do
         map "font_format", to: :font_format
         map "is_variable", to: :is_variable
         map "family_name", to: :family_name
@@ -93,6 +65,7 @@ module Fontisan
         map "font_revision", to: :font_revision
         map "permissions", to: :permissions
         map "units_per_em", to: :units_per_em
+        map "collection_offset", to: :collection_offset
       end
     end
   end

data/lib/fontisan/models/hint.rb

@@ -76,7 +76,7 @@ module Fontisan
           {
             type: h.type,
             data: h.data,
-            source_format: h.source_format
+            source_format: h.source_format,
           }
         end
         glyph_hints_hash[glyph_id.to_s] = hints_data
@@ -124,6 +124,7 @@ module Fontisan
       # Parse glyph hints JSON
       def parse_glyph_hints
         return {} if @glyph_hints.nil? || @glyph_hints.empty? || @glyph_hints == "{}"
+
         JSON.parse(@glyph_hints)
       rescue JSON::ParserError
         {}
@@ -202,7 +203,7 @@ module Fontisan
         when :interpolate
           # IUP instruction
           axis = data[:axis] || :y
-          axis == :x ? [0x31] : [0x30]  # IUP[x] or IUP[y]
+          axis == :x ? [0x31] : [0x30] # IUP[x] or IUP[y]
         when :shift
           # SHP instruction
           data[:instructions] || []
@@ -268,23 +269,22 @@ module Fontisan
 
       # Convert stem hint to TrueType instructions
       def convert_stem_to_truetype
-        position = data[:position] || 0
-        width = data[:width] || 0
+        data[:position] || 0
+        data[:width] || 0
         orientation = data[:orientation] || :vertical
 
         # TrueType uses MDAP (Move Direct Absolute Point) and MDRP (Move Direct Relative Point)
         # to control stem positioning
         instructions = []
 
-        if orientation == :vertical
-          # Vertical stem: use Y-axis instructions
-          instructions << 0x2E # MDAP[rnd] - mark reference point
-          instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
-        else
-          # Horizontal stem: use X-axis instructions
-          instructions << 0x2F # MDAP[rnd]
-          instructions << 0xC0 # MDRP[min,rnd,black]
-        end
+        instructions << if orientation == :vertical
+                          # Vertical stem: use Y-axis instructions
+                          0x2E # MDAP[rnd] - mark reference point
+                        else
+                          # Horizontal stem: use X-axis instructions
+                          0x2F # MDAP[rnd]
+                        end
+        instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
 
         instructions
       end
@@ -313,16 +313,15 @@ module Fontisan
         # Generate MDAP/MDRP pairs for each stem
         instructions = []
 
-        stems.each do |stem|
-          if orientation == :vertical
-            # Vertical stem: use Y-axis instructions
-            instructions << 0x2E # MDAP[rnd] - mark reference point
-            instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
-          else
-            # Horizontal stem: use X-axis instructions
-            instructions << 0x2F # MDAP[rnd]
-            instructions << 0xC0 # MDRP[min,rnd,black]
-          end
+        stems.each do |_stem|
+          instructions << if orientation == :vertical
+                            # Vertical stem: use Y-axis instructions
+                            0x2E # MDAP[rnd] - mark reference point
+                          else
+                            # Horizontal stem: use X-axis instructions
+                            0x2F # MDAP[rnd]
+                          end
+          instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
         end
 
         instructions

data/lib/fontisan/models/outline.rb

@@ -121,7 +121,10 @@ module Fontisan
 
         # Get path from CharString
         path = charstring.path
-        raise ArgumentError, "CharString has no path data" if path.nil? || path.empty?
+        if path.nil? || path.empty?
+          raise ArgumentError,
+                "CharString has no path data"
+        end
 
         commands = convert_cff_path_to_commands(path)
 

data/lib/fontisan/models/validation_report.rb

@@ -29,7 +29,7 @@ module Fontisan
         attribute :severity, :string
         attribute :category, :string
         attribute :message, :string
-        attribute :location, :string, default: -> { nil }
+        attribute :location, :string, default: -> {}
 
         yaml do
           map "severity", to: :severity

data/lib/fontisan/open_type_collection.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require "bindata"
-require_relative "constants"
+require_relative "base_collection"
 
 module Fontisan
-  # OpenType Collection domain object using BinData
+  # OpenType Collection domain object
   #
-  # Represents a complete OpenType Collection file (OTC) using BinData's declarative
-  # DSL for binary structure definition. Parallel to TrueTypeCollection but for OpenType fonts.
+  # Represents a complete OpenType Collection file (OTC). Inherits all shared
+  # functionality from BaseCollection and implements OTC-specific behavior.
   #
   # @example Reading and extracting fonts
   #   File.open("fonts.otc", "rb") do |io|
@@ -15,39 +14,26 @@ module Fontisan
   #     puts otc.num_fonts  # => 4
   #     fonts = otc.extract_fonts(io)  # => [OpenTypeFont, OpenTypeFont, ...]
   #   end
-  class OpenTypeCollection < BinData::Record
-    endian :big
-
-    string :tag, length: 4, assert: "ttcf"
-    uint16 :major_version
-    uint16 :minor_version
-    uint32 :num_fonts
-    array :font_offsets, type: :uint32, initial_length: :num_fonts
-
-    # Read OpenType Collection from a file
+  class OpenTypeCollection < BaseCollection
+    # Get the font class for OpenType collections
     #
-    # @param path [String] Path to the OTC file
-    # @return [OpenTypeCollection] A new instance
-    # @raise [ArgumentError] if path is nil or empty
-    # @raise [Errno::ENOENT] if file does not exist
-    # @raise [RuntimeError] if file format is invalid
-    def self.from_file(path)
-      if path.nil? || path.to_s.empty?
-        raise ArgumentError,
-              "path cannot be nil or empty"
-      end
-      raise Errno::ENOENT, "File not found: #{path}" unless File.exist?(path)
+    # @return [Class] OpenTypeFont class
+    def self.font_class
+      require_relative "open_type_font"
+      OpenTypeFont
+    end
 
-      File.open(path, "rb") { |io| read(io) }
-    rescue BinData::ValidityError => e
-      raise "Invalid OTC file: #{e.message}"
-    rescue EOFError => e
-      raise "Invalid OTC file: unexpected end of file - #{e.message}"
+    # Get the collection format identifier
+    #
+    # @return [String] "OTC" for OpenType Collection
+    def self.collection_format
+      "OTC"
     end
 
     # Extract fonts as OpenTypeFont objects
     #
     # Reads each font from the OTC file and returns them as OpenTypeFont objects.
+    # This method uses the from_collection method.
     #
     # @param io [IO] Open file handle to read fonts from
     # @return [Array<OpenTypeFont>] Array of font objects
@@ -58,194 +44,5 @@ module Fontisan
         OpenTypeFont.from_collection(io, offset)
       end
     end
-
-    # Get a single font from the collection
-    #
-    # @param index [Integer] Index of the font (0-based)
-    # @param io [IO] Open file handle
-    # @param mode [Symbol] Loading mode (:metadata or :full, default: :full)
-    # @return [OpenTypeFont, nil] Font object or nil if index out of range
-    def font(index, io, mode: LoadingModes::FULL)
-      return nil if index >= num_fonts
-
-      require_relative "open_type_font"
-      OpenTypeFont.from_collection(io, font_offsets[index], mode: mode)
-    end
-
-    # Get font count
-    #
-    # @return [Integer] Number of fonts in collection
-    def font_count
-      num_fonts
-    end
-
-    # Validate format correctness
-    #
-    # @return [Boolean] true if the format is valid, false otherwise
-    def valid?
-      tag == Constants::TTC_TAG && num_fonts.positive? && font_offsets.length == num_fonts
-    rescue StandardError
-      false
-    end
-
-    # Get the OTC version as a single integer
-    #
-    # @return [Integer] Version number (e.g., 0x00010000 for version 1.0)
-    def version
-      (major_version << 16) | minor_version
-    end
-
-    # List all fonts in the collection with basic metadata
-    #
-    # Returns a CollectionListInfo model containing summaries of all fonts.
-    # This is the API method used by the `ls` command for collections.
-    #
-    # @param io [IO] Open file handle to read fonts from
-    # @return [CollectionListInfo] List of fonts with metadata
-    #
-    # @example List fonts in collection
-    #   File.open("fonts.otc", "rb") do |io|
-    #     otc = OpenTypeCollection.read(io)
-    #     list = otc.list_fonts(io)
-    #     list.fonts.each { |f| puts "#{f.index}: #{f.family_name}" }
-    #   end
-    def list_fonts(io)
-      require_relative "models/collection_list_info"
-      require_relative "models/collection_font_summary"
-      require_relative "open_type_font"
-      require_relative "tables/name"
-
-      fonts = font_offsets.map.with_index do |offset, index|
-        font = OpenTypeFont.from_collection(io, offset)
-
-        # Extract basic font info
-        name_table = font.table("name")
-        post_table = font.table("post")
-
-        family_name = name_table&.english_name(Tables::Name::FAMILY) || "Unknown"
-        subfamily_name = name_table&.english_name(Tables::Name::SUBFAMILY) || "Regular"
-        postscript_name = name_table&.english_name(Tables::Name::POSTSCRIPT_NAME) || "Unknown"
-
-        # Determine font format
-        sfnt = font.header.sfnt_version
-        font_format = case sfnt
-                      when 0x00010000, 0x74727565 # 0x74727565 = 'true'
-                        "TrueType"
-                      when 0x4F54544F # 'OTTO'
-                        "OpenType"
-                      else
-                        "Unknown"
-                      end
-
-        num_glyphs = post_table&.glyph_names&.length || 0
-        num_tables = font.table_names.length
-
-        Models::CollectionFontSummary.new(
-          index: index,
-          family_name: family_name,
-          subfamily_name: subfamily_name,
-          postscript_name: postscript_name,
-          font_format: font_format,
-          num_glyphs: num_glyphs,
-          num_tables: num_tables,
-        )
-      end
-
-      Models::CollectionListInfo.new(
-        collection_path: nil, # Will be set by command
-        num_fonts: num_fonts,
-        fonts: fonts,
-      )
-    end
-
-    # Get comprehensive collection metadata
-    #
-    # Returns a CollectionInfo model with header information, offsets,
-    # and table sharing statistics.
-    # This is the API method used by the `info` command for collections.
-    #
-    # @param io [IO] Open file handle to read fonts from
-    # @param path [String] Collection file path (for file size)
-    # @return [CollectionInfo] Collection metadata
-    #
-    # @example Get collection info
-    #   File.open("fonts.otc", "rb") do |io|
-    #     otc = OpenTypeCollection.read(io)
-    #     info = otc.collection_info(io, "fonts.otc")
-    #     puts "Version: #{info.version_string}"
-    #   end
-    def collection_info(io, path)
-      require_relative "models/collection_info"
-      require_relative "models/table_sharing_info"
-
-      # Calculate table sharing statistics
-      table_sharing = calculate_table_sharing(io)
-
-      # Get file size
-      file_size = path ? File.size(path) : 0
-
-      Models::CollectionInfo.new(
-        collection_path: path,
-        collection_format: "OTC",
-        ttc_tag: tag,
-        major_version: major_version,
-        minor_version: minor_version,
-        num_fonts: num_fonts,
-        font_offsets: font_offsets.to_a,
-        file_size_bytes: file_size,
-        table_sharing: table_sharing,
-      )
-    end
-
-    private
-
-    # Calculate table sharing statistics
-    #
-    # Analyzes which tables are shared between fonts and calculates
-    # space savings from deduplication.
-    #
-    # @param io [IO] Open file handle
-    # @return [TableSharingInfo] Sharing statistics
-    def calculate_table_sharing(io)
-      require_relative "models/table_sharing_info"
-      require_relative "open_type_font"
-
-      # Extract all fonts
-      fonts = font_offsets.map do |offset|
-        OpenTypeFont.from_collection(io, offset)
-      end
-
-      # Build table hash map (checksum -> size)
-      table_map = {}
-      total_table_size = 0
-
-      fonts.each do |font|
-        font.tables.each do |entry|
-          key = entry.checksum
-          size = entry.table_length
-          table_map[key] ||= size
-          total_table_size += size
-        end
-      end
-
-      # Count unique vs shared
-      unique_tables = table_map.size
-      total_tables = fonts.sum { |f| f.tables.length }
-      shared_tables = total_tables - unique_tables
-
-      # Calculate space saved
-      unique_size = table_map.values.sum
-      space_saved = total_table_size - unique_size
-
-      # Calculate sharing percentage
-      sharing_pct = total_tables.positive? ? (shared_tables.to_f / total_tables * 100).round(2) : 0.0
-
-      Models::TableSharingInfo.new(
-        shared_tables: shared_tables,
-        unique_tables: unique_tables,
-        sharing_percentage: sharing_pct,
-        space_saved_bytes: space_saved,
-      )
-    end
   end
 end

data/lib/fontisan/open_type_font.rb

@@ -211,7 +211,8 @@ module Fontisan
           batch_entries.each do |entry|
             relative_offset = entry.offset - batch_offset
             tag_key = entry.tag.dup.force_encoding("UTF-8")
-            @table_data[tag_key] = batch_data[relative_offset, entry.table_length]
+            @table_data[tag_key] =
+              batch_data[relative_offset, entry.table_length]
           end
         end
 
@@ -286,6 +287,7 @@ module Fontisan
     # @return [Boolean] true if table is available in current mode
     def table_available?(tag)
       return false unless has_table?(tag)
+
       LoadingModes.table_allowed?(@loading_mode, tag)
     end
 

data/lib/fontisan/optimizers/pattern_analyzer.rb

@@ -222,7 +222,8 @@ module Fontisan
                 if @stack_aware
                   tracker = @stack_trackers[glyph_id]
                   next unless tracker
-                  next unless tracker.stack_neutral?(start_pos, start_pos + length)
+                  next unless tracker.stack_neutral?(start_pos,
+                                                     start_pos + length)
                 end
 
                 pattern_bytes = charstring[start_pos, length]

data/lib/fontisan/optimizers/subroutine_generator.rb

@@ -74,7 +74,7 @@ module Fontisan
         # 2. Analyze patterns
         analyzer = PatternAnalyzer.new(
           min_length: @min_pattern_length,
-          stack_aware: true
+          stack_aware: true,
         )
         patterns = analyzer.analyze(charstrings)
 

data/lib/fontisan/pipeline/output_writer.rb

@@ -69,7 +69,10 @@ module Fontisan
       # @return [Integer] Number of bytes written
       def write_svg(result)
         svg_xml = result[:svg_xml] || result["svg_xml"]
-        raise ArgumentError, "SVG result must contain :svg_xml key" unless svg_xml
+        unless svg_xml
+          raise ArgumentError,
+                "SVG result must contain :svg_xml key"
+        end
 
         File.write(@output_path, svg_xml)
       end
@@ -80,7 +83,8 @@ module Fontisan
       # @return [Integer] Number of bytes written
       def write_sfnt(tables)
         sfnt_version = determine_sfnt_version
-        FontWriter.write_to_file(tables, @output_path, sfnt_version: sfnt_version)
+        FontWriter.write_to_file(tables, @output_path,
+                                 sfnt_version: sfnt_version)
       end
 
       # Write WOFF format
@@ -145,7 +149,8 @@ module Fontisan
           when :otf
             OpenTypeFont.from_tables(tables)
           else
-            raise ArgumentError, "Cannot determine font type for format: #{@format}"
+            raise ArgumentError,
+                  "Cannot determine font type for format: #{@format}"
           end
         end
       end

data/lib/fontisan/pipeline/transformation_pipeline.rb

@@ -294,7 +294,8 @@ module Fontisan
         when ".woff" then :woff
         when ".woff2" then :woff2
         else
-          raise ArgumentError, "Cannot determine target format from extension: #{ext}"
+          raise ArgumentError,
+                "Cannot determine target format from extension: #{ext}"
         end
       end
 
@@ -304,7 +305,10 @@ module Fontisan
       def variation_options
         opts = {}
         opts[:coordinates] = @options[:coordinates] if @options[:coordinates]
-        opts[:instance_index] = @options[:instance_index] if @options[:instance_index]
+        if @options[:instance_index]
+          opts[:instance_index] =
+            @options[:instance_index]
+        end
         opts
       end
 
@@ -344,7 +348,8 @@ module Fontisan
           when :otf
             OpenTypeFont.from_tables(tables)
           else
-            raise ArgumentError, "Cannot determine font type: format=#{format}, has_cff=#{has_cff}, has_glyf=#{has_glyf}"
+            raise ArgumentError,
+                  "Cannot determine font type: format=#{format}, has_cff=#{has_cff}, has_glyf=#{has_glyf}"
           end
         end
       end

data/lib/fontisan/subset/table_subsetter.rb

@@ -122,11 +122,11 @@ module Fontisan
         data = table.to_binary_s.dup
 
         # Calculate new numberOfHMetrics
-        new_num_h_metrics = if hmtx && hmtx.h_metrics
-                             hmtx.h_metrics.size
-                           else
-                             calculate_number_of_h_metrics
-                           end
+        new_num_h_metrics = if hmtx&.h_metrics
+                              hmtx.h_metrics.size
+                            else
+                              calculate_number_of_h_metrics
+                            end
 
         # Update numberOfHMetrics field (at offset 34, uint16)
         data[34, 2] = [new_num_h_metrics].pack("n")