fontisan 0.2.17 → 0.2.22

data/lib/fontisan/pipeline/format_detector.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../font_loader"
-
 module Fontisan
   module Pipeline
     # Detects font format and capabilities
@@ -50,107 +48,62 @@ module Fontisan
 
       # Detect font format
       #
-      # @return [Symbol] One of :ttf, :otf, :ttc, :otc, :woff, :woff2, :svg
+      # Delegates to the loaded font object's own `#format` method.
+      # Each font class (TrueTypeFont, OpenTypeFont, WoffFont, Woff2Font,
+      # Type1Font, *Collection) is the single source of truth for its
+      # format identifier. This keeps FormatDetector closed for modification
+      # when new font classes are added (OCP): no case statement to edit.
+      #
+      # @return [Symbol] One of :ttf, :otf, :ttc, :otc, :woff, :woff2,
+      #   :type1, :dfont, or :unknown
       def detect_format
-        # Check for SVG first (from file extension even if font failed to load)
+        # SVG fonts are an export-only target; no font object exists yet.
         return :svg if @file_path.end_with?(".svg")
 
         return :unknown unless @font
 
-        # Use is_a? for proper class checking
-        case @font
-        when Fontisan::TrueTypeCollection
-          :ttc
-        when Fontisan::OpenTypeCollection
-          :otc
-        when Fontisan::TrueTypeFont
-          if @file_path.end_with?(".woff")
-            :woff
-          elsif @file_path.end_with?(".woff2")
-            :woff2
-          else
-            :ttf
-          end
-        when Fontisan::OpenTypeFont
-          if @file_path.end_with?(".woff")
-            :woff
-          elsif @file_path.end_with?(".woff2")
-            :woff2
-          else
-            :otf
-          end
-        else
-          :unknown
-        end
+        @font.format
       end
 
       # Detect variation type
       #
-      # @return [Symbol] One of :static, :gvar, :cff2
+      # Delegates to the loaded font object's own `#variation_type` method.
+      # Each font class is the single source of truth for its variation
+      # profile, so this method needs no class-specific branching.
+      #
+      # @return [Symbol] :static, :gvar (TrueType variable), or :cff2
       def detect_variation
         return :static unless @font
 
-        # Collections don't have has_table? method
-        # Return :static for collections (variation detection would need to load first font)
-        return :static if collection?
-
-        # Check for variable font tables
-        if @font.has_table?("fvar")
-          # Variable font detected - check variation type
-          if @font.has_table?("gvar")
-            :gvar # TrueType variable font
-          elsif @font.has_table?("CFF2")
-            :cff2 # OpenType variable font (CFF2)
-          else
-            :static # Has fvar but no variation data (shouldn't happen)
-          end
-        else
-          :static
-        end
+        @font.variation_type
       end
 
       # Detect font capabilities
       #
+      # Aggregates four pieces of self-knowledge owned by the font class:
+      # outline representation, variation support, collection status, and
+      # the table directory. Each is exposed as a method on the font object
+      # so this method stays free of class-specific branching.
+      #
       # @return [Hash] Capabilities hash
       def detect_capabilities
         return default_capabilities unless @font
 
-        # Check if this is a collection
-        is_collection = collection?
-
-        font_to_check = if is_collection
-                          # Collections don't have fonts method, need to load first font
-                          nil # Will handle in API usage
-                        else
-                          @font
-                        end
-
-        # For collections, return basic capabilities
-        if is_collection
-          return {
-            outline: :unknown, # Would need to load first font to know
-            variation: false,  # Would need to load first font to know
-            collection: true,
-            tables: [],
-          }
-        end
-
-        return default_capabilities unless font_to_check
-
         {
-          outline: detect_outline_type(font_to_check),
-          variation: detect_variation != :static,
-          collection: false,
-          tables: available_tables(font_to_check),
+          outline: @font.outline_type,
+          variation: @font.variation_type != :static,
+          collection: @font.collection?,
+          tables: @font.table_names,
         }
       end
 
       # Check if font is a collection
       #
-      # @return [Boolean] True if collection (TTC/OTC)
+      # @return [Boolean] True if the loaded object is a font collection
       def collection?
-        @font.is_a?(Fontisan::TrueTypeCollection) ||
-          @font.is_a?(Fontisan::OpenTypeCollection)
+        return false unless @font
+
+        @font.collection?
       end
 
       # Check if font is variable
@@ -207,32 +160,6 @@ module Fontisan
         @font = nil
       end
 
-      # Detect outline type
-      #
-      # @param font [Font] Font object
-      # @return [Symbol] :truetype or :cff
-      def detect_outline_type(font)
-        if font.has_table?("glyf") || font.has_table?("gvar")
-          :truetype
-        elsif font.has_table?("CFF ") || font.has_table?("CFF2")
-          :cff
-        else
-          :unknown
-        end
-      end
-
-      # Get available tables
-      #
-      # @param font [Font] Font object
-      # @return [Array<String>] List of table tags
-      def available_tables(font)
-        return [] unless font.respond_to?(:table_names)
-
-        font.table_names
-      rescue StandardError
-        []
-      end
-
       # Default capabilities when font cannot be loaded
       #
       # @return [Hash] Default capabilities

data/lib/fontisan/pipeline/output_writer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../font_writer"
-
 module Fontisan
   module Pipeline
     # Handles writing font tables to various output formats
@@ -33,8 +31,9 @@ module Fontisan
       # Initialize output writer
       #
       # @param output_path [String] Path to write output
-      # @param format [Symbol] Target format (:ttf, :otf, :woff, :woff2)
-      # @param options [Hash] Writing options
+      # @param format [Symbol] Target format (:ttf, :otf, :woff, :woff2, :svg)
+      # @param options [Hash] Writing options. Format-specific compression
+      #   knobs (zlib_level, brotli_quality, etc.) pass through to the strategy.
       def initialize(output_path, format, options = {})
         @output_path = output_path
         @format = format
@@ -45,8 +44,15 @@ module Fontisan
       #
       # @param tables [Hash<String, String>, Hash] Font tables (tag => binary data) or special format result
       # @return [Integer] Number of bytes written
-      # @raise [ArgumentError] If format is unsupported
+      # @raise [ArgumentError] If format is unsupported or options don't apply
       def write(tables)
+        # Catch cross-format misuse before delegating, so the error message
+        # is consistent regardless of whether the format goes through
+        # FormatConverter (outline conversions) or this writer (packaging
+        # changes for WOFF/WOFF2).
+        Converters::FormatConverter.validate_options_for_target!(@format,
+                                                                 @options)
+
         case @format
         when :ttf, :otf
           write_sfnt(tables)
@@ -92,8 +98,6 @@ module Fontisan
       # @param tables [Hash<String, String>] Font tables
       # @return [Integer] Number of bytes written
       def write_woff(tables)
-        require_relative "../converters/woff_writer"
-
         writer = Converters::WoffWriter.new
         font = build_font_from_tables(tables)
         woff_data = writer.convert(font, @options)
@@ -106,8 +110,6 @@ module Fontisan
       # @param tables [Hash<String, String>] Font tables
       # @return [Integer] Number of bytes written
       def write_woff2(tables)
-        require_relative "../converters/woff2_encoder"
-
         encoder = Converters::Woff2Encoder.new
         font = build_font_from_tables(tables)
         result = encoder.convert(font, @options)

data/lib/fontisan/pipeline/strategies/instance_strategy.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_strategy"
-require_relative "../../variation/instance_generator"
-require_relative "../../variation/variation_context"
-
 module Fontisan
   module Pipeline
     module Strategies

data/lib/fontisan/pipeline/strategies/named_strategy.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_strategy"
-require_relative "instance_strategy"
-require_relative "../../variation/variation_context"
-
 module Fontisan
   module Pipeline
     module Strategies

data/lib/fontisan/pipeline/strategies/preserve_strategy.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_strategy"
-
 module Fontisan
   module Pipeline
     module Strategies

data/lib/fontisan/pipeline/strategies.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Pipeline::Strategies namespace.
+
+module Fontisan
+  module Pipeline
+    module Strategies
+      autoload :BaseStrategy, "fontisan/pipeline/strategies/base_strategy"
+      autoload :InstanceStrategy, "fontisan/pipeline/strategies/instance_strategy"
+      autoload :NamedStrategy, "fontisan/pipeline/strategies/named_strategy"
+      autoload :PreserveStrategy, "fontisan/pipeline/strategies/preserve_strategy"
+    end
+  end
+end

data/lib/fontisan/pipeline/transformation_pipeline.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "format_detector"
-require_relative "variation_resolver"
-require_relative "../converters/format_converter"
-require_relative "../font_loader"
-require_relative "../font_writer"
-require_relative "output_writer"
-
 module Fontisan
   module Pipeline
     # Orchestrates universal font transformation pipeline

data/lib/fontisan/pipeline/variation_resolver.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "strategies/base_strategy"
-require_relative "strategies/preserve_strategy"
-require_relative "strategies/instance_strategy"
-require_relative "strategies/named_strategy"
-
 module Fontisan
   module Pipeline
     # Resolves variation data using strategy pattern
@@ -136,7 +131,6 @@ module Fontisan
       def validate_instance_coordinates(coordinates)
         return if coordinates.empty?
 
-        require_relative "../variation/variation_context"
         context = Variation::VariationContext.new(@font)
         context.validate_coordinates(coordinates)
       end
@@ -146,7 +140,6 @@ module Fontisan
       # @param instance_index [Integer] Instance index to validate
       # @raise [ArgumentError] If index invalid
       def validate_named_instance_index(instance_index)
-        require_relative "../variation/variation_context"
         context = Variation::VariationContext.new(@font)
 
         unless context.fvar

data/lib/fontisan/pipeline.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Pipeline namespace.
+
+module Fontisan
+  module Pipeline
+    autoload :FormatDetector, "fontisan/pipeline/format_detector"
+    autoload :OutputWriter, "fontisan/pipeline/output_writer"
+    autoload :Strategies, "fontisan/pipeline/strategies/base_strategy"
+    autoload :TransformationPipeline, "fontisan/pipeline/transformation_pipeline"
+    autoload :VariationResolver, "fontisan/pipeline/variation_resolver"
+  end
+end

data/lib/fontisan/sfnt_font.rb

@@ -1,20 +1,6 @@
 # frozen_string_literal: true
 
 require "bindata"
-require_relative "constants"
-require_relative "loading_modes"
-require_relative "utilities/checksum_calculator"
-require_relative "sfnt_table"
-require_relative "tables/head_table"
-require_relative "tables/name_table"
-require_relative "tables/os2_table"
-require_relative "tables/cmap_table"
-require_relative "tables/glyf_table"
-require_relative "tables/hhea_table"
-require_relative "tables/maxp_table"
-require_relative "tables/post_table"
-require_relative "tables/hmtx_table"
-require_relative "tables/loca_table"
 
 module Fontisan
   # SFNT Offset Table structure
@@ -377,6 +363,35 @@ module Fontisan
       !find_table_entry(tag).nil?
     end
 
+    # Whether this object represents a font collection rather than a single
+    # font. Each font class is the authority on this question.
+    #
+    # @return [Boolean]
+    def collection? = false
+
+    # Variation profile of the font, derived from its table set. Used by the
+    # conversion pipeline to choose between preserving variation tables and
+    # generating a static instance.
+    #
+    # @return [Symbol] :static, :gvar (TrueType variable), or :cff2 (CFF2 variable)
+    def variation_type
+      return :static unless has_table?("fvar")
+      return :gvar if has_table?("gvar")
+      return :cff2 if has_table?("CFF2")
+
+      :static
+    end
+
+    # Outline representation used by the font. Derived from the table set.
+    #
+    # @return [Symbol] :truetype (glyf/gvar) or :cff (CFF/CFF2)
+    def outline_type
+      return :truetype if has_table?("glyf") || has_table?("gvar")
+      return :cff if has_table?("CFF ") || has_table?("CFF2")
+
+      :unknown
+    end
+
     # Check if a table is available in the current loading mode
     #
     # @param tag [String] The table tag to check

data/lib/fontisan/sfnt_table.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "constants"
-require_relative "loading_modes"
-
 module Fontisan
   # Base class for SFNT font tables
   #
@@ -198,7 +195,6 @@ module Fontisan
     def calculate_checksum
       load_data! unless data_loaded?
 
-      require_relative "utilities/checksum_calculator"
       Utilities::ChecksumCalculator.calculate_table_checksum(@data)
     end
 

data/lib/fontisan/subset/builder.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "options"
-require_relative "profile"
-require_relative "glyph_mapping"
-require_relative "table_subsetter"
-require_relative "../font_writer"
-
 module Fontisan
   module Subset
     # Main font subsetting engine

data/lib/fontisan/subset.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Subset namespace.
+
+module Fontisan
+  module Subset
+    autoload :Builder, "fontisan/subset/builder"
+    autoload :GlyphMapping, "fontisan/subset/glyph_mapping"
+    autoload :Options, "fontisan/subset/options"
+    autoload :Profile, "fontisan/subset/profile"
+    autoload :TableSubsetter, "fontisan/subset/table_subsetter"
+  end
+end

data/lib/fontisan/svg/font_generator.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "font_face_generator"
-require_relative "glyph_generator"
-require_relative "view_box_calculator"
-
 module Fontisan
   module Svg
     # Generates complete SVG font XML structure

data/lib/fontisan/svg/glyph_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "view_box_calculator"
-
 module Fontisan
   module Svg
     # Generates SVG glyph elements from glyph outlines

data/lib/fontisan/svg.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Svg namespace.
+
+module Fontisan
+  module Svg
+    autoload :FontFaceGenerator, "fontisan/svg/font_face_generator"
+    autoload :FontGenerator, "fontisan/svg/font_generator"
+    autoload :GlyphGenerator, "fontisan/svg/glyph_generator"
+    autoload :ViewBoxCalculator, "fontisan/svg/view_box_calculator"
+  end
+end

data/lib/fontisan/tables/cbdt.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../binary/base_record"
 
 module Fontisan
   module Tables

data/lib/fontisan/tables/cblc.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "charstring_parser"
-require_relative "charstring_builder"
-require_relative "index_builder"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "index"
-require_relative "charstring"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../binary/base_record"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../../models/hint"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../../binary/base_record"
 
 module Fontisan
   module Tables

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "dict"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "dict_builder"
-
 module Fontisan
   module Tables
     class Cff

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

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "private_dict_writer"
-require_relative "offset_recalculator"
-require_relative "index_builder"
-require_relative "dict_builder"
-require_relative "charstring_rebuilder"
-require_relative "hint_operation_injector"
 require "stringio"
 
 module Fontisan

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "dict"
-
 module Fontisan
   module Tables
     class Cff

data/lib/fontisan/tables/cff.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "../binary/base_record"
 
 module Fontisan
   module Tables
@@ -42,6 +41,28 @@ module Fontisan
     #   puts cff.font_count  # => 1
     #   puts cff.header.version  # => "1.0"
     class Cff < Binary::BaseRecord
+      # Inner namespace autoloads — declared here so Cff::* constants
+      # resolve on first reference without require_relative.
+      autoload :CFFGlyph, "fontisan/tables/cff/cff_glyph"
+      autoload :Charset, "fontisan/tables/cff/charset"
+      autoload :CharString, "fontisan/tables/cff/charstring"
+      autoload :CharStringBuilder, "fontisan/tables/cff/charstring_builder"
+      autoload :CharStringParser, "fontisan/tables/cff/charstring_parser"
+      autoload :CharStringRebuilder, "fontisan/tables/cff/charstring_rebuilder"
+      autoload :CharstringsIndex, "fontisan/tables/cff/charstrings_index"
+      autoload :Dict, "fontisan/tables/cff/dict"
+      autoload :DictBuilder, "fontisan/tables/cff/dict_builder"
+      autoload :Encoding, "fontisan/tables/cff/encoding"
+      autoload :Header, "fontisan/tables/cff/header"
+      autoload :HintOperationInjector, "fontisan/tables/cff/hint_operation_injector"
+      autoload :Index, "fontisan/tables/cff/index"
+      autoload :IndexBuilder, "fontisan/tables/cff/index_builder"
+      autoload :OffsetRecalculator, "fontisan/tables/cff/offset_recalculator"
+      autoload :PrivateDict, "fontisan/tables/cff/private_dict"
+      autoload :PrivateDictWriter, "fontisan/tables/cff/private_dict_writer"
+      autoload :TableBuilder, "fontisan/tables/cff/table_builder"
+      autoload :TopDict, "fontisan/tables/cff/top_dict"
+
       # OpenType table tag for CFF
       TAG = "CFF "
 
@@ -468,19 +489,5 @@ module Fontisan
         raise CorruptedTableError, "Failed to parse Encoding: #{e.message}"
       end
     end
-
-    # Load nested class definitions after the main class is defined
-    require_relative "cff/header"
-    require_relative "cff/index"
-    require_relative "cff/dict"
-    require_relative "cff/top_dict"
-    require_relative "cff/private_dict"
-    require_relative "cff/charstring"
-    require_relative "cff/charstring_parser"
-    require_relative "cff/charstring_rebuilder"
-    require_relative "cff/charstrings_index"
-    require_relative "cff/charset"
-    require_relative "cff/encoding"
-    require_relative "cff/cff_glyph"
   end
 end