fontisan 0.2.16 → 0.2.22

data/lib/fontisan/models/ucd/ucd.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Fontisan
+  module Models
+    module Ucd
+      # Root <ucd> element of the UCDXML flat file.
+      #
+      # The flat UCDXML file has the structure:
+      #
+      #   <ucd>
+      #     <description>...</description>
+      #     <last_revision date="2025-..." version="17.0.0" />
+      #     <char cp="0000" .../>
+      #     <char cp="0001" .../>
+      #     ...
+      #     <char first-cp="3400" last-cp="4DBF" .../>
+      #     ...
+      #   </ucd>
+      #
+      # The flat variant merges all per-category UCD files (Blocks.txt,
+      # Scripts.txt, UnicodeData.txt, etc.) into one stream of <char>
+      # elements. Roughly 340,000 entries for Unicode 17.0.0.
+      class Ucd < Lutaml::Model::Serializable
+        attribute :last_revision, :string
+        attribute :chars, UcdChar, collection: true
+
+        xml do
+          element "ucd"
+
+          map_element "last_revision", to: :last_revision
+          map_element "char", to: :chars
+        end
+      end
+    end
+  end
+end

data/lib/fontisan/models/ucd/ucd_char.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Fontisan
+  module Models
+    module Ucd
+      # Single <char> element from the UCDXML flat file.
+      #
+      # UCDXML uses two forms:
+      #   <char cp="0041" name="..." script="Latin" block="Basic Latin" .../>
+      #   <char first-cp="3400" last-cp="4DBF" name="..." script="Han" .../>
+      #
+      # The first form describes one codepoint. The second form describes a
+      # closed range of codepoints that share the same properties (used for
+      # CJK ideograph ranges where each codepoint would otherwise need its
+      # own <char> entry).
+      #
+      # Both forms can appear in the same document; `cp` is mutually
+      # exclusive with `first-cp`/`last-cp`.
+      class UcdChar < Lutaml::Model::Serializable
+        attribute :cp, :string
+        attribute :first_cp, :string
+        attribute :last_cp, :string
+        attribute :name, :string
+        attribute :general_category, :string
+        attribute :script, :string
+        attribute :block, :string
+        attribute :age, :string
+
+        xml do
+          element "char"
+
+          map_attribute "cp",               to: :cp
+          map_attribute "first-cp",         to: :first_cp
+          map_attribute "last-cp",          to: :last_cp
+          map_attribute "name",             to: :name
+          map_attribute "general-category", to: :general_category
+          map_attribute "script",           to: :script
+          map_attribute "block",            to: :block
+          map_attribute "age",              to: :age
+        end
+
+        # True if this entry describes a codepoint range rather than a
+        # single codepoint.
+        def range?
+          !first_cp.nil? && !last_cp.nil?
+        end
+
+        # The codepoints covered by this entry, as Integers.
+        # For a single-codepoint entry, returns a one-element array.
+        # For a range entry, returns the inclusive range as an array
+        # (caller should treat this lazily if the range is huge — CJK
+        # ranges can have tens of thousands of codepoints).
+        def codepoints
+          if range?
+            (first_cp.to_i(16)..last_cp.to_i(16)).to_a
+          elsif cp
+            [cp.to_i(16)]
+          else
+            []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fontisan/models/ucd.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "lutaml/model"
+
+module Fontisan
+  module Models
+    # Namespace for UCDXML deserialization models.
+    #
+    # These classes deserialize the upstream UCDXML flat file
+    # (https://www.unicode.org/Public/<version>/ucdxml/ucd.all.flat.zip)
+    # into Ruby objects. They are used by Fontisan::Ucd::IndexBuilder to
+    # derive compact run-length-encoded indices for Unicode block and
+    # script lookup.
+    module Ucd
+      autoload :UcdChar, "fontisan/models/ucd/ucd_char"
+      autoload :Ucd,     "fontisan/models/ucd/ucd"
+    end
+  end
+end

data/lib/fontisan/models.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Models namespace.
+
+module Fontisan
+  module Models
+    autoload :AllScriptsFeaturesInfo, "fontisan/models/all_scripts_features_info"
+    autoload :Audit, "fontisan/models/audit"
+    autoload :AxisInfo, "fontisan/models/variable_font_info"
+    autoload :BitmapGlyph, "fontisan/models/bitmap_glyph"
+    autoload :BitmapStrike, "fontisan/models/bitmap_strike"
+    autoload :CollectionBriefInfo, "fontisan/models/collection_brief_info"
+    autoload :CollectionFontSummary, "fontisan/models/collection_font_summary"
+    autoload :CollectionInfo, "fontisan/models/collection_info"
+    autoload :CollectionListInfo, "fontisan/models/collection_list_info"
+    autoload :CollectionValidationReport, "fontisan/models/collection_validation_report"
+    autoload :Cldr, "fontisan/models/cldr"
+    autoload :ColorGlyph, "fontisan/models/color_glyph"
+    autoload :ColorLayer, "fontisan/models/color_layer"
+    autoload :ColorPalette, "fontisan/models/color_palette"
+    autoload :FeatureRecord, "fontisan/models/features_info"
+    autoload :FeaturesInfo, "fontisan/models/features_info"
+    autoload :FontExport, "fontisan/models/font_export"
+    autoload :FontInfo, "fontisan/models/font_info"
+    autoload :FontReport, "fontisan/models/font_report"
+    autoload :FontSummary, "fontisan/models/font_summary"
+    autoload :GlyphInfo, "fontisan/models/glyph_info"
+    autoload :GlyphOutline, "fontisan/models/glyph_outline"
+    autoload :Hint, "fontisan/models/hint"
+    autoload :HintSet, "fontisan/models/hint"
+    autoload :InstanceInfo, "fontisan/models/variable_font_info"
+    autoload :OpticalSizeInfo, "fontisan/models/optical_size_info"
+    autoload :Outline, "fontisan/models/outline"
+    autoload :ScriptRecord, "fontisan/models/scripts_info"
+    autoload :ScriptsInfo, "fontisan/models/scripts_info"
+    autoload :SvgGlyph, "fontisan/models/svg_glyph"
+    autoload :TableEntry, "fontisan/models/table_info"
+    autoload :TableInfo, "fontisan/models/table_info"
+    autoload :TableSharingInfo, "fontisan/models/table_sharing_info"
+    autoload :Ttx, "fontisan/models/ttx/ttfont"
+    autoload :Ucd, "fontisan/models/ucd"
+    autoload :UnicodeMapping, "fontisan/models/unicode_mappings"
+    autoload :UnicodeMappings, "fontisan/models/unicode_mappings"
+    autoload :ValidationReport, "fontisan/models/validation_report"
+    autoload :VariableFontInfo, "fontisan/models/variable_font_info"
+  end
+end

data/lib/fontisan/open_type_collection.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_collection"
-
 module Fontisan
   # OpenType Collection domain object
   #
@@ -15,11 +13,16 @@ module Fontisan
   #     fonts = otc.extract_fonts(io)  # => [OpenTypeFont, OpenTypeFont, ...]
   #   end
   class OpenTypeCollection < BaseCollection
+    # High-level pipeline format identifier. Owned by the collection class
+    # so the conversion pipeline can dispatch without case statements (OCP).
+    #
+    # @return [Symbol] :otc
+    def format = :otc
+
     # Get the font class for OpenType collections
     #
     # @return [Class] OpenTypeFont class
     def self.font_class
-      require_relative "open_type_font"
       OpenTypeFont
     end
 
@@ -38,8 +41,6 @@ module Fontisan
     # @param io [IO] Open file handle to read fonts from
     # @return [Array<OpenTypeFont>] Array of font objects
     def extract_fonts(io)
-      require_relative "open_type_font"
-
       font_offsets.map do |offset|
         OpenTypeFont.from_collection(io, offset)
       end

data/lib/fontisan/open_type_font.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "sfnt_font"
-
 module Fontisan
   # OpenType Font domain object
   #
@@ -26,6 +24,14 @@ module Fontisan
   # @example Reading from TTC collection
   #   otf = OpenTypeFont.from_collection(io, offset)
   class OpenTypeFont < SfntFont
+    extend OpenTypeFontExtensions
+
+    # High-level pipeline format identifier. Owned by the font class so the
+    # conversion pipeline can dispatch without case statements (OCP).
+    #
+    # @return [Symbol] :otf
+    def format = :otf
+
     # Page cache for lazy loading (maps page_start_offset => page_data)
     attr_accessor :page_cache
 

data/lib/fontisan/open_type_font_extensions.rb

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
 
 module Fontisan
-  # Extensions to OpenTypeFont for table-based construction
-  class OpenTypeFont
+  # Extension module for {OpenTypeFont} providing table-based construction.
+  #
+  # Extended into OpenTypeFont from +open_type_font.rb+ so that
+  # +OpenTypeFont.from_tables(...)+ is available whenever the class
+  # itself is loaded.
+  module OpenTypeFontExtensions
     # Create font from hash of tables
     #
     # This is used during font conversion when we have tables but not a file.
     #
     # @param tables [Hash<String, String>] Map of table tag to binary data
     # @return [OpenTypeFont] New font instance
-    def self.from_tables(tables)
-      # Create minimal header structure
+    def from_tables(tables)
       font = new
       font.initialize_storage
       font.loading_mode = LoadingModes::FULL
 
-      # Store table data
       font.table_data = tables
 
-      # Build header from tables
       num_tables = tables.size
       max_power = 0
       n = num_tables
@@ -37,13 +38,12 @@ module Fontisan
       font.header.entry_selector = entry_selector
       font.header.range_shift = range_shift
 
-      # Build table directory
       font.tables.clear
       tables.each_key do |tag|
         entry = TableDirectory.new
         entry.tag = tag
-        entry.checksum = 0 # Will be calculated on write
-        entry.offset = 0 # Will be calculated on write
+        entry.checksum = 0
+        entry.offset = 0
         entry.table_length = tables[tag].bytesize
         font.tables << entry
       end

data/lib/fontisan/optimizers/pattern_analyzer.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "stringio"
-require_relative "stack_tracker"
 
 module Fontisan
   module Optimizers

data/lib/fontisan/optimizers.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Optimizers namespace.
+
+module Fontisan
+  module Optimizers
+    autoload :CharstringRewriter, "fontisan/optimizers/charstring_rewriter"
+    autoload :PatternAnalyzer, "fontisan/optimizers/pattern_analyzer"
+    autoload :StackTracker, "fontisan/optimizers/stack_tracker"
+    autoload :SubroutineBuilder, "fontisan/optimizers/subroutine_builder"
+    autoload :SubroutineGenerator, "fontisan/optimizers/subroutine_generator"
+    autoload :SubroutineOptimizer, "fontisan/optimizers/subroutine_optimizer"
+  end
+end

data/lib/fontisan/outline_extractor.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "models/glyph_outline"
-
 module Fontisan
   # Extracts glyph outlines from font tables
   #

data/lib/fontisan/parsers/dfont_parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bindata"
-require_relative "../error"
 
 module Fontisan
   module Parsers

data/lib/fontisan/parsers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Parsers namespace.
+
+module Fontisan
+  module Parsers
+    autoload :DfontParser, "fontisan/parsers/dfont_parser"
+    autoload :Tag, "fontisan/parsers/tag"
+  end
+end

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