fontisan 0.2.16 → 0.2.22

data/lib/fontisan/commands/convert_command.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../pipeline/transformation_pipeline"
-require_relative "../converters/collection_converter"
-require_relative "../conversion_options"
-require_relative "../font_loader"
-
 module Fontisan
   module Commands
     # Command for converting fonts between formats
@@ -67,29 +61,33 @@ module Fontisan
       def initialize(font_path, options = {})
         super(font_path, options)
 
-        # Convert string keys to symbols for Thor compatibility
-        opts = options.transform_keys(&:to_sym)
+        # Convert string keys to symbols for Thor compatibility. All command
+        # code reads @options with symbol keys (e.g., @options[:quiet]);
+        # normalizing once at construction is cleaner than threading a
+        # second opts hash alongside @options.
+        @options = options.transform_keys(&:to_sym)
 
-        @output_path = opts[:output]
+        @output_path = @options[:output]
 
         # Parse target format
-        @target_format = parse_target_format(opts[:to])
+        @target_format = parse_target_format(@options[:to])
 
         # Extract ConversionOptions if provided
-        @conv_options = extract_conversion_options(opts)
+        @conv_options = extract_conversion_options(@options)
 
         # Parse coordinates if string provided
-        @coordinates = if opts[:coordinates]
-                         parse_coordinates(opts[:coordinates])
-                       elsif opts[:instance_coordinates]
-                         opts[:instance_coordinates]
+        @coordinates = if @options[:coordinates]
+                         parse_coordinates(@options[:coordinates])
+                       elsif @options[:instance_coordinates]
+                         @options[:instance_coordinates]
                        end
 
-        @instance_index = opts[:instance_index]
-        @preserve_variation = opts[:preserve_variation]
-        @preserve_hints = opts.fetch(:preserve_hints, false)
-        @collection_target_format = opts.fetch(:target_format, "preserve").to_s
-        @validate = !opts[:no_validate]
+        @instance_index = @options[:instance_index]
+        @preserve_variation = @options[:preserve_variation]
+        @preserve_hints = @options.fetch(:preserve_hints, false)
+        @collection_target_format = @options.fetch(:target_format,
+                                                   "preserve").to_s
+        @validate = !@options[:no_validate]
       end
 
       # Execute the conversion
@@ -152,6 +150,13 @@ module Fontisan
         # Add hint preservation option
         pipeline_options[:preserve_hints] = @preserve_hints if @preserve_hints
 
+        # Forward format-specific compression knobs declared by strategies
+        # (zlib_level, brotli_quality, etc.). Cross-format misuse is caught
+        # downstream by FormatConverter.validate_options_for_target!.
+        Converters::FormatConverter.all_strategy_option_names.each do |opt|
+          pipeline_options[opt] = @options[opt] if @options.key?(opt)
+        end
+
         # Use TransformationPipeline for universal conversion
         pipeline = Pipeline::TransformationPipeline.new(
           font_path,

data/lib/fontisan/commands/dump_table_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../font_loader"
-require_relative "../error"
-
 module Fontisan
   module Commands
     # Command to dump raw table data from fonts

data/lib/fontisan/commands/export_command.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../export/exporter"
-require_relative "../font_loader"
-
 module Fontisan
   module Commands
     # ExportCommand provides CLI interface for font export to YAML/JSON

data/lib/fontisan/commands/features_command.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require "yaml"
-require_relative "base_command"
-require_relative "../models/features_info"
-require_relative "../models/all_scripts_features_info"
 
 module Fontisan
   module Commands

data/lib/fontisan/commands/instance_command.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "base_command"
-require_relative "../variation/instance_generator"
-require_relative "../variation/instance_writer"
-require_relative "../variation/validator"
-require_relative "../error"
 
 module Fontisan
   module Commands

data/lib/fontisan/commands/ls_command.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../font_loader"
-require_relative "../models/collection_list_info"
-require_relative "../models/font_summary"
-require_relative "../tables/name"
-require_relative "../error"
-
 module Fontisan
   module Commands
     # Command to list contents of font files (collections or individual fonts).

data/lib/fontisan/commands/optical_size_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../models/optical_size_info"
-
 module Fontisan
   module Commands
     # Command to extract optical size information from fonts

data/lib/fontisan/commands/pack_command.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../collection/builder"
-require_relative "../collection/dfont_builder"
-require_relative "../font_loader"
-
 module Fontisan
   module Commands
     # Command for packing multiple fonts into a TTC/OTC collection

data/lib/fontisan/commands/scripts_command.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "yaml"
-require_relative "base_command"
-require_relative "../models/scripts_info"
 
 module Fontisan
   module Commands

data/lib/fontisan/commands/subset_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../subset/builder"
-require_relative "../subset/options"
 require "fileutils"
 
 module Fontisan

data/lib/fontisan/commands/unicode_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../models/unicode_mappings"
-
 module Fontisan
   module Commands
     # Command to list Unicode to glyph index mappings from a font file

data/lib/fontisan/commands/unpack_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../font_loader"
-require_relative "../font_writer"
 require "fileutils"
 
 module Fontisan
@@ -144,10 +141,8 @@ module Fontisan
           # Load as TTC or OTC based on extension hint
           # Both use same structure, main difference is expected font types
           if ext == ".otc"
-            require_relative "../open_type_collection"
             OpenTypeCollection.read(io)
           else
-            require_relative "../true_type_collection"
             TrueTypeCollection.read(io)
           end
         end
@@ -252,8 +247,6 @@ module Fontisan
       # @param output_path [String] Output file path
       # @return [void]
       def convert_and_write(font, output_path)
-        require_relative "../converters/format_converter"
-
         converter = Converters::FormatConverter.new
         converter.convert(font, @format, output_path: output_path)
       rescue StandardError => e

data/lib/fontisan/commands/validate_command.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../validators/profile_loader"
-require_relative "../font_loader"
-require_relative "../tables/name"
-
 module Fontisan
   module Commands
     # ValidateCommand provides CLI interface for font validation
@@ -138,9 +133,6 @@ module Fontisan
       # @param mode [Symbol] Loading mode
       # @return [Integer] Exit code
       def validate_collection(mode)
-        require_relative "../models/collection_validation_report"
-        require_relative "../models/font_report"
-
         # Load collection metadata
         collection = FontLoader.load_collection(@input)
 

data/lib/fontisan/commands/variable_command.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "base_command"
-require_relative "../variation/inspector"
-
 module Fontisan
   module Commands
     # Command to extract variable font information.

data/lib/fontisan/commands.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Autoload hub for the Fontisan::Commands namespace.
+
+module Fontisan
+  module Commands
+    autoload :AuditCompareCommand, "fontisan/commands/audit_compare_command"
+    autoload :AuditCommand, "fontisan/commands/audit_command"
+    autoload :AuditLibraryCommand, "fontisan/commands/audit_library_command"
+    autoload :BaseCommand, "fontisan/commands/base_command"
+    autoload :ConvertCommand, "fontisan/commands/convert_command"
+    autoload :DumpTableCommand, "fontisan/commands/dump_table_command"
+    autoload :ExportCommand, "fontisan/commands/export_command"
+    autoload :FeaturesCommand, "fontisan/commands/features_command"
+    autoload :GlyphsCommand, "fontisan/commands/glyphs_command"
+    autoload :InfoCommand, "fontisan/commands/info_command"
+    autoload :InstanceCommand, "fontisan/commands/instance_command"
+    autoload :LsCommand, "fontisan/commands/ls_command"
+    autoload :OpticalSizeCommand, "fontisan/commands/optical_size_command"
+    autoload :PackCommand, "fontisan/commands/pack_command"
+    autoload :ScriptsCommand, "fontisan/commands/scripts_command"
+    autoload :SubsetCommand, "fontisan/commands/subset_command"
+    autoload :TablesCommand, "fontisan/commands/tables_command"
+    autoload :UnicodeCommand, "fontisan/commands/unicode_command"
+    autoload :UnpackCommand, "fontisan/commands/unpack_command"
+    autoload :ValidateCommand, "fontisan/commands/validate_command"
+    autoload :VariableCommand, "fontisan/commands/variable_command"
+  end
+end

data/lib/fontisan/config/cldr.yml

@@ -0,0 +1,22 @@
+# UCD alternative: CLDR (Common Locale Data Repository) configuration.
+#
+# This file is the single source of truth for which CLDR version Fontisan
+# uses by default, what versions are recognized, and where to fetch them.
+#
+# Update `default_version` and `known_versions` when a new CLDR release
+# ships (typically 2× per year, alongside Unicode releases).
+# Users override at runtime via `fontisan cldr download --version X.Y.Z`
+# or `fontisan audit --cldr-version X.Y.Z`.
+
+default_version: "46.0.0"
+
+known_versions:
+  - "45.0.0"
+  - "46.0.0"
+
+# CLDR JSON releases are published on GitHub.
+# Full URL: <base_url>/<version>/cldr-<version>-json-full.zip
+base_url: "https://github.com/unicode-org/cldr-json/releases/download"
+
+# Releases listing URL for `--latest` probing. JSON API.
+listing_url: "https://api.github.com/repos/unicode-org/cldr-json/releases"

data/lib/fontisan/config/conversion_matrix.yml

@@ -174,6 +174,25 @@ conversions:
       WOFF decompression with zlib. Preserves all font data and metadata.
       Automatically detects font flavor from WOFF header.
 
+  - from: woff
+    to: woff2
+    strategy: woff_reader
+    description: "Transcode WOFF to WOFF2 (re-wrap with Brotli)"
+    status: implemented
+    notes: >
+      Web-format transcoding. The pipeline decodes WOFF (zlib) into its
+      underlying SFNT tables, then re-wraps them as WOFF2 with Brotli.
+      Useful for migrating legacy web fonts to the smaller WOFF2 format.
+
+  - from: woff
+    to: svg
+    strategy: svg_generator
+    description: "Generate SVG font from WOFF"
+    status: implemented
+    notes: >
+      Decodes WOFF (zlib) to SFNT tables, then renders glyph outlines as
+      SVG paths. Note: SVG fonts are deprecated in favor of WOFF2.
+
   # Phase 2 conversions (Milestone 2.2) - SVG
   - from: ttf
     to: svg
@@ -254,6 +273,25 @@ conversions:
       Same-format copy operation. Decompresses and re-compresses WOFF2 data
       with Brotli, useful for normalizing compression or updating metadata.
 
+  - from: woff2
+    to: woff
+    strategy: woff2_decoder
+    description: "Transcode WOFF2 to WOFF (re-wrap with zlib)"
+    status: implemented
+    notes: >
+      Web-format transcoding. The pipeline decodes WOFF2 (Brotli) into its
+      underlying SFNT tables, then re-wraps them as WOFF with zlib. Useful
+      for legacy browser compatibility where WOFF2 is unavailable.
+
+  - from: woff2
+    to: svg
+    strategy: svg_generator
+    description: "Generate SVG font from WOFF2"
+    status: implemented
+    notes: >
+      Decodes WOFF2 (Brotli) to SFNT tables, then renders glyph outlines as
+      SVG paths. Note: SVG fonts are deprecated in favor of WOFF2.
+
   # Collection format conversions (TTC/OTC/dfont)
   # Same-format collection operations
   - from: ttc

data/lib/fontisan/config/ucd.yml

@@ -0,0 +1,23 @@
+# UCD (Unicode Character Database) configuration.
+#
+# This file is the single source of truth for which UCD version Fontisan
+# uses by default, what versions are recognized, and where to fetch them.
+#
+# Update `default_version` and `known_versions` when a new Unicode version
+# is released (typically twice a year). Users may override at runtime via
+# `fontisan ucd download --version X.Y.Z` or `fontisan audit --ucd-version X.Y.Z`.
+
+default_version: "17.0.0"
+
+known_versions:
+  - "15.0.0"
+  - "15.1.0"
+  - "16.0.0"
+  - "17.0.0"
+
+# Base URL for fetching UCDXML artifacts.
+# Full URL: <base_url>/<version>/ucdxml/ucd.all.flat.zip
+base_url: "https://www.unicode.org/Public"
+
+# Listing URL for `--latest` probing. HTML scraping, best-effort.
+listing_url: "https://www.unicode.org/Public/ucdxml/"

data/lib/fontisan/constants.rb

@@ -9,7 +9,7 @@ module Fontisan
   module Constants
     # TrueType Collection file signature tag.
     # All valid TTC files must begin with this 4-byte tag.
-    TTC_TAG = "ttcf"
+    TTC_TAG = "ttcf".b.freeze
 
     # TrueType Collection Version 1.0 identifier.
     # Represents the original TTC format version.
@@ -25,11 +25,23 @@ module Fontisan
     # SFNT version for OpenType fonts with CFF outlines ('OTTO')
     SFNT_VERSION_OTTO = 0x4F54544F
 
-    # Apple 'true' TrueType signature (alternate to 0x00010000)
-    SFNT_VERSION_TRUE = 0x74727965 # 'true' in ASCII
-
-    # dfont resource fork signatures
-    DFONT_RESOURCE_HEADER = "\x00\x00\x01\x00"
+    # Apple 'true' TrueType signature (alternate to 0x00010000).
+    # Bytes: 0x74 ('t') 0x72 ('r') 0x75 ('u') 0x65 ('e').
+    SFNT_VERSION_TRUE = 0x74727565
+
+    # Four-byte file signatures used for content-based format detection.
+    # Pre-packed once here so format detection doesn't repack on every call.
+    SFNT_TRUETYPE_MAGIC = "\x00\x01\x00\x00".b.freeze # packed SFNT_VERSION_TRUETYPE
+    SFNT_TRUE_MAGIC     = "true".b.freeze             # Apple legacy TrueType
+    SFNT_OTTO_MAGIC     = "OTTO".b.freeze             # OpenType / CFF
+    WOFF_MAGIC          = "wOFF".b.freeze
+    WOFF2_MAGIC         = "wOF2".b.freeze
+
+    # dfont resource fork signatures.
+    # Note: bytes differ from SFNT_TRUETYPE_MAGIC despite the visual similarity —
+    # dfont is "\x00\x00\x01\x00" (resource-data offset 256, big-endian),
+    # SFNT_TRUETYPE_MAGIC is "\x00\x01\x00\x00" (sfnt version 0x00010000).
+    DFONT_RESOURCE_HEADER = "\x00\x00\x01\x00".b.freeze
     SFNT_RESOURCE_TYPE = "sfnt"
     FOND_RESOURCE_TYPE = "FOND"
 
@@ -77,6 +89,9 @@ module Fontisan
     # Fvar table tag identifier (Font Variations)
     FVAR_TAG = "fvar"
 
+    # Avar table tag identifier (Axis Variation)
+    AVAR_TAG = "avar"
+
     # Gvar table tag identifier (Glyph Variations for TrueType)
     GVAR_TAG = "gvar"
 
@@ -117,6 +132,22 @@ module Fontisan
     # Control Value Table (metrics used by TrueType hinting)
     CVT_TAG = "cvt "
 
+    # Grid-fitting And Scan-conversion Procedure table (per-ppem hinting policy)
+    GASP_TAG = "gasp"
+
+    # Color font tables.
+    # COLR: COLR vector color glyph table (v0 or v1).
+    # CPAL: Color Palette table.
+    # SVG:  SVG-in-OpenType color glyph table (tag is "SVG " — 4 bytes incl. trailing space).
+    # CBDT/CBLC: Color Bitmap Data / Location (paired — EBLC/EBDT equivalents for color).
+    # sbix: Apple bitmap glyph table.
+    COLR_TAG = "COLR"
+    CPAL_TAG = "CPAL"
+    SVG_TAG  = "SVG "
+    CBDT_TAG = "CBDT"
+    CBLC_TAG = "CBLC"
+    SBIX_TAG = "sbix"
+
     # Magic number used for font file checksum adjustment calculation.
     # This constant is used in conjunction with the file checksum to compute
     # the checksumAdjustment value stored in the 'head' table.
@@ -173,5 +204,16 @@ module Fontisan
     def self.intern_string(str)
       STRING_POOL[str] || str.freeze
     end
+
+    # Classify a 4-byte SFNT-style signature read from a font file's magic.
+    #
+    # @param signature [String, nil]
+    # @return [Symbol, nil] :ttf, :otf, or nil for unrecognised signatures
+    def self.sfnt_format_for(signature)
+      case signature
+      when SFNT_TRUETYPE_MAGIC, SFNT_TRUE_MAGIC then :ttf
+      when SFNT_OTTO_MAGIC then :otf
+      end
+    end
   end
 end

data/lib/fontisan/conversion_options.rb

@@ -35,8 +35,12 @@ module Fontisan
       preserve_encoding
     ].freeze
 
-    # Generating options (output processing)
-    GENERATING_OPTIONS = %i[
+    # Generating options (output processing) declared statically by
+    # ConversionOptions itself. Format-specific compression knobs (zlib_level,
+    # brotli_quality, transform_tables, etc.) are declared by each strategy
+    # via the ConversionStrategy DSL and discovered via
+    # FormatConverter.all_strategy_option_names — see `.generating_options`.
+    STATIC_GENERATING_OPTIONS = %i[
       write_pfm
       write_afm
       write_inf
@@ -47,19 +51,28 @@ module Fontisan
       optimize_tables
       reencode_first_256
       encoding_vector
-      compression
-      transform_tables
       preserve_metadata
       strip_metadata
       target_format
     ].freeze
 
+    # Full list of recognized generating options, computed lazily because
+    # converters `require_relative` this file, creating a load cycle that
+    # prevents resolving `FormatConverter` at class-definition time. The first
+    # call resolves all strategies (which are loaded before any conversion
+    # actually runs) and caches the result.
+    #
+    # @return [Array<Symbol>]
+    def self.generating_options
+      @generating_options ||= (
+        STATIC_GENERATING_OPTIONS +
+        Converters::FormatConverter.all_strategy_option_names
+      ).uniq.freeze
+    end
+
     # Valid hinting modes
     HINTING_MODES = %w[preserve auto none full].freeze
 
-    # Valid compression modes
-    COMPRESSION_MODES = %w[zlib brotli none].freeze
-
     attr_reader :from, :to, :opening, :generating
 
     # Initialize conversion options
@@ -199,9 +212,9 @@ module Fontisan
     # Validate generating options
     def validate_generating_options!
       @generating.each_key do |key|
-        unless GENERATING_OPTIONS.include?(key)
+        unless self.class.generating_options.include?(key)
           raise ArgumentError, "Unknown generating option: #{key}. " \
-                              "Available: #{GENERATING_OPTIONS.join(', ')}"
+                              "Available: #{self.class.generating_options.join(', ')}"
         end
       end
 
@@ -214,15 +227,6 @@ module Fontisan
         end
       end
 
-      # Validate compression mode
-      if @generating[:compression]
-        comp = @generating[:compression].to_s
-        unless COMPRESSION_MODES.include?(comp)
-          raise ArgumentError, "Invalid compression: #{comp}. " \
-                              "Available: #{COMPRESSION_MODES.join(', ')}"
-        end
-      end
-
       # Validate target_format for collection conversions
       if @generating[:target_format]
         target = @generating[:target_format].to_s
@@ -364,9 +368,16 @@ module Fontisan
         from: :otf,
         to: :woff2,
         opening: {},
-        generating: { compression: "brotli", transform_tables: true,
+        generating: { brotli_quality: 11, transform_tables: true,
                       optimize_tables: true, preserve_metadata: true },
       },
+      legacy_web: {
+        from: :otf,
+        to: :woff,
+        opening: {},
+        generating: { zlib_level: 9, optimize_tables: true,
+                      preserve_metadata: true },
+      },
       archive_to_modern: {
         from: :ttc,
         to: :otf,

data/lib/fontisan/converters/cff_table_builder.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../tables/cff/index_builder"
-require_relative "../tables/cff/dict_builder"
-
 module Fontisan
   module Converters
     # Builds CFF table data from glyph outlines

data/lib/fontisan/converters/collection_converter.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../conversion_options"
-require_relative "format_converter"
-require_relative "../collection/builder"
-require_relative "../collection/dfont_builder"
-require_relative "../parsers/dfont_parser"
-require_relative "../font_loader"
-
 module Fontisan
   module Converters
     # CollectionConverter handles conversion between collection formats
@@ -343,7 +336,6 @@ conv_options = nil)
       # @return [Font] Font object
       def build_font_from_tables(tables, format)
         # Create temporary font from tables
-        require_relative "../font_writer"
         require "stringio"
 
         sfnt_version = format == :otf ? 0x4F54544F : 0x00010000