fontisan 0.2.11 → 0.2.13

data/lib/fontisan/commands/convert_command.rb

@@ -3,6 +3,7 @@
 require_relative "base_command"
 require_relative "../pipeline/transformation_pipeline"
 require_relative "../converters/collection_converter"
+require_relative "../conversion_options"
 require_relative "../font_loader"
 
 module Fontisan
@@ -36,6 +37,16 @@ module Fontisan
     #     coordinates: 'wght=700,wdth=100'
     #   )
     #   command.run
+    #
+    # @example Convert with ConversionOptions
+    #   options = ConversionOptions.recommended(from: :ttf, to: :otf)
+    #   command = ConvertCommand.new(
+    #     'input.ttf',
+    #     to: 'otf',
+    #     output: 'output.otf',
+    #     options: options
+    #   )
+    #   command.run
     class ConvertCommand < BaseCommand
       # Initialize convert command
       #
@@ -52,6 +63,7 @@ module Fontisan
       # @option options [String] :target_format Target outline format for collections: 'preserve' (default), 'ttf', or 'otf'
       # @option options [Boolean] :no_validate Skip output validation
       # @option options [Boolean] :verbose Verbose output
+      # @option options [ConversionOptions] :options ConversionOptions object
       def initialize(font_path, options = {})
         super(font_path, options)
 
@@ -63,6 +75,9 @@ module Fontisan
         # Parse target format
         @target_format = parse_target_format(opts[:to])
 
+        # Extract ConversionOptions if provided
+        @conv_options = extract_conversion_options(opts)
+
         # Parse coordinates if string provided
         @coordinates = if opts[:coordinates]
                          parse_coordinates(opts[:coordinates])
@@ -123,6 +138,9 @@ module Fontisan
           verbose: @options[:verbose],
         }
 
+        # Add ConversionOptions if available
+        pipeline_options[:conversion_options] = @conv_options if @conv_options
+
         # Add variation options if specified
         pipeline_options[:coordinates] = @coordinates if @coordinates
         pipeline_options[:instance_index] = @instance_index if @instance_index
@@ -196,6 +214,7 @@ module Fontisan
             output: @output_path,
             target_format: @collection_target_format,
             verbose: @options[:verbose],
+            options: @conv_options, # Pass ConversionOptions
           },
         )
 
@@ -309,10 +328,12 @@ module Fontisan
           :woff
         when "woff2"
           :woff2
+        when "type1", "type-1", "t1", "pfb", "pfa"
+          :type1
         else
           raise ArgumentError,
                 "Unknown target format: #{format}. " \
-                "Supported: ttf, otf, ttc, otc, dfont, svg, woff, woff2"
+                "Supported: ttf, otf, type1, t1, ttc, otc, dfont, svg, woff, woff2"
         end
       end
 
@@ -329,6 +350,16 @@ module Fontisan
           "#{(bytes / (1024.0 * 1024)).round(1)} MB"
         end
       end
+
+      # Extract ConversionOptions from options hash
+      #
+      # @param options [Hash, ConversionOptions] Options or hash containing :options key
+      # @return [ConversionOptions, nil] Extracted ConversionOptions or nil
+      def extract_conversion_options(options)
+        return options if options.is_a?(ConversionOptions)
+
+        options[:options] if options.is_a?(Hash)
+      end
     end
   end
 end

data/lib/fontisan/commands/info_command.rb

@@ -153,12 +153,18 @@ module Fontisan
                              "truetype"
                            when OpenTypeFont
                              "cff"
+                           when Type1Font
+                             "type1"
                            else
                              "unknown"
                            end
 
-        # Check if variable font
-        info.is_variable = font.has_table?(Constants::FVAR_TAG)
+        # Check if variable font (Type1 fonts are never variable)
+        info.is_variable = if font.is_a?(Type1Font)
+                            false
+                          else
+                            font.has_table?(Constants::FVAR_TAG)
+                          end
       end
 
       # Populate essential fields for brief mode (metadata tables only).
@@ -169,6 +175,17 @@ module Fontisan
       #
       # @param info [Models::FontInfo] FontInfo instance to populate
       def populate_brief_fields(info)
+        if font.is_a?(Type1Font)
+          populate_type1_brief_fields(info)
+        else
+          populate_sfnt_brief_fields(info)
+        end
+      end
+
+      # Populate SFNT font brief fields (name, head, OS/2 tables).
+      #
+      # @param info [Models::FontInfo] FontInfo instance to populate
+      def populate_sfnt_brief_fields(info)
         # Essential names from name table
         if font.has_table?(Constants::NAME_TAG)
           name_table = font.table(Constants::NAME_TAG)
@@ -193,12 +210,45 @@ module Fontisan
         end
       end
 
+      # Populate Type 1 font brief fields.
+      #
+      # @param info [Models::FontInfo] FontInfo instance to populate
+      def populate_type1_brief_fields(info)
+        # Get Type 1 font metadata
+        font_dict = font.font_dictionary
+        font_info = font_dict&.font_info if font_dict
+
+        return unless font_info
+
+        # Essential names from Type 1 font
+        info.family_name = font_info.family_name
+        info.full_name = font_info.full_name
+        info.postscript_name = font.font_name
+        info.version = font_info.version
+
+        # Metrics from font dictionary
+        if font_dict&.font_b_box
+          info.bounding_box = font_dict.font_b_box
+        end
+      end
+
       # Populate all fields for full mode.
       #
       # Full mode extracts comprehensive metadata from all available tables.
       #
       # @param info [Models::FontInfo] FontInfo instance to populate
       def populate_full_fields(info)
+        if font.is_a?(Type1Font)
+          populate_type1_full_fields(info)
+        else
+          populate_sfnt_full_fields(info)
+        end
+      end
+
+      # Populate SFNT font full fields.
+      #
+      # @param info [Models::FontInfo] FontInfo instance to populate
+      def populate_sfnt_full_fields(info)
         populate_from_name_table(info) if font.has_table?(Constants::NAME_TAG)
         populate_from_os2_table(info) if font.has_table?(Constants::OS2_TAG)
         populate_from_head_table(info) if font.has_table?(Constants::HEAD_TAG)
@@ -207,6 +257,37 @@ module Fontisan
         populate_bitmap_info(info) if font.has_table?("CBLC") || font.has_table?("sbix")
       end
 
+      # Populate Type 1 font full fields.
+      #
+      # @param info [Models::FontInfo] FontInfo instance to populate
+      def populate_type1_full_fields(info)
+        font_dict = font.font_dictionary
+        font_info = font_dict&.font_info if font_dict
+
+        return unless font_info
+
+        # Names from Type 1 font
+        info.family_name = font_info.family_name
+        info.full_name = font_info.full_name
+        info.postscript_name = font.font_name
+        info.version = font_info.version
+        info.copyright = font_info.copyright
+        info.description = font_info.notice
+        info.designer = nil  # Type 1 fonts may not have designer info
+
+        # Metrics
+        if font_dict&.font_b_box
+          info.bounding_box = font_dict.font_b_box
+        end
+
+        if font_dict&.font_matrix
+          info.font_matrix = font_dict.font_matrix
+        end
+
+        # Glyph count
+        info.glyph_count = font.charstrings&.count || 0
+      end
+
       # Populate FontInfo from the name table.
       #
       # @param info [Models::FontInfo] FontInfo instance to populate

data/lib/fontisan/config/conversion_matrix.yml

@@ -6,9 +6,13 @@
 # Format identifiers:
 # - ttf: TrueType Font (with glyf/loca tables)
 # - otf: OpenType Font with CFF outlines (with CFF table)
-# - woff: Web Open Font Format (not yet implemented)
-# - woff2: Web Open Font Format 2 (implemented in Phase 2)
-# - svg: SVG Font (implemented in Phase 2)
+# - type1: Adobe Type 1 Font (PFB/PFA format)
+# - woff: Web Open Font Format (zlib compression)
+# - woff2: Web Open Font Format 2 (Brotli compression)
+# - svg: SVG Font (deprecated, for conversion/inspection)
+# - ttc: TrueType Collection
+# - otc: OpenType Collection
+# - dfont: Apple dfont suitcase
 #
 # Phase 1 (Milestone 1.3): Basic conversions
 # - Same format (copy/optimize): ttf→ttf, otf→otf
@@ -20,8 +24,11 @@
 # Phase 2 (Milestone 2.2): SVG font generation
 # - SVG export: ttf to svg, otf to svg
 #
+# Phase 3: Type 1 font support
+# - Type 1 conversions: type1↔otf, type1↔ttf
+#
 # Future phases:
-# - Phase 3: Variable font conversions
+# - Phase 4: Variable font conversions
 
 conversions:
   # Same-format conversions (copy/optimize)
@@ -58,6 +65,47 @@ conversions:
       table generation including cubic-to-quadratic curve conversion and
       proper TrueType glyph structure encoding.
 
+  # Phase 3 conversions - Type 1 fonts
+  - from: type1
+    to: otf
+    strategy: type1_converter
+    description: "Convert Type 1 to OpenType/CFF format"
+    status: foundation
+    notes: >
+      Type 1 to OpenType conversion using CharStringConverter. Converts Type 1
+      CharStrings to CFF format and builds CFF table with proper DICT structures.
+      seac composites are expanded. Some hinting may not be preserved.
+
+  - from: otf
+    to: type1
+    strategy: type1_converter
+    description: "Convert OpenType/CFF to Type 1 format"
+    status: foundation
+    notes: >
+      OpenType to Type 1 conversion. Reverse conversion from CFF CharStrings to
+      Type 1 format. Builds PFB output with eexec encryption. Some modern
+      OpenType features may be lost in conversion.
+
+  - from: type1
+    to: ttf
+    strategy: type1_converter
+    description: "Convert Type 1 to TrueType format"
+    status: foundation
+    notes: >
+      Two-step conversion: Type 1 → OTF → TTF. First converts to OpenType/CFF,
+      then to TrueType with cubic-to-quadratic curve approximation. Hinting may
+      not be preserved in either step.
+
+  - from: ttf
+    to: type1
+    strategy: type1_converter
+    description: "Convert TrueType to Type 1 format"
+    status: foundation
+    notes: >
+      Two-step conversion: TTF → OTF → Type 1. First converts to OpenType/CFF
+      with quadratic-to-cubic curve conversion, then to Type 1. Significant
+      approximation artifacts may occur due to curve conversions.
+
   # Phase 2 conversions (Milestone 2.1) - WOFF2
   - from: ttf
     to: woff2
@@ -147,6 +195,35 @@ conversions:
       transformation. Note: SVG fonts are deprecated in favor of WOFF2, but
       useful for fallback, conversion, and inspection purposes.
 
+  # Type 1 to web formats (via OTF intermediate)
+  - from: type1
+    to: woff
+    strategy: type1_converter
+    description: "Convert Type 1 to WOFF format"
+    status: foundation
+    notes: >
+      Two-step conversion: Type 1 → OTF → WOFF. Converts Type 1 to OpenType/CFF,
+      then compresses with zlib. Useful for web delivery of legacy Type 1 fonts.
+
+  - from: type1
+    to: woff2
+    strategy: type1_converter
+    description: "Convert Type 1 to WOFF2 format"
+    status: foundation
+    notes: >
+      Two-step conversion: Type 1 → OTF → WOFF2. Converts Type 1 to OpenType/CFF,
+      then compresses with Brotli. Best for web delivery of legacy Type 1 fonts.
+
+  - from: type1
+    to: svg
+    strategy: type1_converter
+    description: "Generate SVG font from Type 1"
+    status: foundation
+    notes: >
+      Type 1 to SVG conversion. Extracts outlines from Type 1 CharStrings and
+      generates SVG font format. Note: SVG fonts are deprecated but useful for
+      inspection and conversion workflows.
+
   # WOFF2 decompression (reverse conversions)
   - from: woff2
     to: ttf
@@ -296,6 +373,57 @@ compatibility:
       - hinting_loss: >
           CFF hints are not converted to TrueType hinting instructions.
 
+  type1_to_otf:
+    preserves:
+      - glyph_outlines: Type 1 CharStrings are similar to CFF
+      - font_metrics: FontBBox, metrics preserved
+      - name_table: FontInfo converted to name table
+      - hints: Some hints preserved (BlueValues, OtherBlues)
+    limitations:
+      - seac_expansion: >
+          seac composite glyphs are expanded to base glyphs.
+      - hinting_approximation: >
+          Some Type 1 hints may not translate exactly to CFF hints.
+      - lost_features: >
+          Type 1-specific features (Flex, multiple master) not preserved.
+
+  otf_to_type1:
+    preserves:
+      - glyph_outlines: CFF outlines converted to Type 1
+      - font_metrics: Basic metrics preserved
+      - name_table: name table converted to FontInfo
+    limitations:
+      - reverse_conversion: >
+          CFF to Type 1 is reverse conversion with potential data loss.
+      - modern_features_lost: >
+          Modern OpenType features (GPOS, GSUB variations) lost in Type 1.
+      - hinting_approximation: >
+          CFF hints may not translate exactly to Type 1 hints.
+
+  type1_to_ttf:
+    preserves:
+      - glyph_outlines: Via OTF intermediate
+      - font_metrics: Basic metrics preserved
+    limitations:
+      - multi_step_conversion: >
+          Type 1 → OTF → TTF, compounding approximation errors.
+      - curve_approximation: >
+          CFF cubic to TrueType quadratic approximation.
+      - significant_data_loss: >
+          Most Type 1 and OpenType features lost.
+
+  ttf_to_type1:
+    preserves:
+      - glyph_outlines: Via OTF intermediate
+      - font_metrics: Basic metrics preserved
+    limitations:
+      - multi_step_conversion: >
+          TTF → OTF → Type 1, compounding approximation errors.
+      - curve_approximation: >
+          Quadratic to cubic, then back to Type 1 curves.
+      - extreme_data_loss: >
+          Nearly all TrueType and Type 1 features lost.
+
   same_format:
     preserves:
       - all_tables

data/lib/fontisan/constants.rb

@@ -95,6 +95,18 @@ module Fontisan
     # CFF2 table tag identifier (CFF version 2 with variations)
     CFF2_TAG = "CFF2"
 
+    # Adobe Type 1 font format constants
+    # PFB (Printer Font Binary) chunk markers
+    PFB_ASCII_CHUNK = 0x8001
+    PFB_BINARY_CHUNK = 0x8002
+
+    # PFA (Printer Font ASCII) file signatures
+    PFA_SIGNATURE_ADOBE_1_0 = "%!PS-AdobeFont-1.0"
+    PFA_SIGNATURE_ADOBE_3_0 = "%!PS-Adobe-3.0 Resource-Font"
+
+    # Type 1 CharString operators
+    TYPE1_SEAC_ESCAPE = 6 # seac operator is escape byte 12 + 6
+
     # TrueType hinting tables
     # Font Program table (TrueType bytecode executed once at font load)
     FPGM_TAG = "fpgm"