fontisan 0.2.11 → 0.2.12

data/lib/fontisan/cli.rb

@@ -203,10 +203,10 @@ module Fontisan
 
     desc "convert FONT_FILE", "Convert font to different format"
     option :to, type: :string, required: true,
-                desc: "Target format (ttf, otf, woff, woff2)",
+                desc: "Target format (ttf, otf, type1, t1, woff, woff2)",
                 aliases: "-t"
-    option :output, type: :string, required: true,
-                    desc: "Output file path",
+    option :output, type: :string,
+                    desc: "Output file path (required unless --show-options)",
                     aliases: "-o"
     option :coordinates, type: :string,
                          desc: "Instance coordinates (e.g., wght=700,wdth=100)",
@@ -232,10 +232,34 @@ module Fontisan
                   desc: "Italic axis value (alternative to --coordinates)"
     option :opsz, type: :numeric,
                   desc: "Optical size axis value (alternative to --coordinates)"
+    # Conversion options
+    option :preset, type: :string,
+                    desc: "Use named preset (type1_to_modern, modern_to_type1, web_optimized, archive_to_modern)"
+    option :show_options, type: :boolean, default: false,
+                          desc: "Show recommended options for the conversion and exit"
+    option :decompose, type: :boolean,
+                       desc: "Decompose composite glyphs (opening option)"
+    option :convert_curves, type: :boolean,
+                            desc: "Convert curves during conversion (opening option)"
+    option :scale_to_1000, type: :boolean,
+                           desc: "Scale to 1000 units per em (opening option)"
+    option :autohint, type: :boolean,
+                      desc: "Auto-hint the font (opening option)"
+    option :generate_unicode, type: :boolean,
+                              desc: "Generate Unicode mappings (Type 1 opening option)"
+    option :hinting_mode, type: :string,
+                          desc: "Hinting mode: preserve, auto, none, or full"
+    option :optimize_cff, type: :boolean,
+                          desc: "Enable CFF subroutine optimization"
+    option :optimize_tables, type: :boolean,
+                             desc: "Enable table optimization"
+    option :decompose_on_output, type: :boolean,
+                                 desc: "Decompose on output (generating option)"
     # Convert a font to a different format using the universal transformation pipeline.
     #
     # Supported conversions:
     # - TTF ↔ OTF: Outline format conversion
+    # - Type 1 ↔ TTF/OTF: Adobe Type 1 font conversion
     # - WOFF/WOFF2: Web font packaging
     # - Variable fonts: Automatic variation preservation or instance generation
     # - Collections (TTC/OTC/dfont): Preserve mixed TTF+OTF by default, or standardize with --target-format
@@ -261,6 +285,12 @@ module Fontisan
     # @example Convert TTF to OTF
     #   fontisan convert font.ttf --to otf --output font.otf
     #
+    # @example Convert Type 1 to OTF
+    #   fontisan convert font.pfb --to otf --output font.otf
+    #
+    # @example Convert OTF to Type 1
+    #   fontisan convert font.otf --to type1 --output font.pfb
+    #
     # @example Convert TTC to OTC (preserves mixed formats by default)
     #   fontisan convert family.ttc --to otc --output family.otc
     #
@@ -284,17 +314,46 @@ module Fontisan
     #
     # @example Convert without validation
     #   fontisan convert font.ttf --to otf --output font.otf --no-validate
+    #
+    # @example Use named preset
+    #   fontisan convert font.pfb --to otf --output font.otf --preset type1_to_modern
+    #
+    # @example Show recommended options for conversion
+    #   fontisan convert font.ttf --to otf --show-options
+    #
+    # @example Convert with custom options
+    #   fontisan convert font.ttf --to otf --output font.otf --autohint --hinting-mode auto
     def convert(font_file)
+      # Detect source format from file
+      source_format = detect_source_format(font_file)
+
+      # Handle --show-options
+      if options[:show_options]
+        show_recommended_options(source_format, options[:to])
+        return
+      end
+
+      # Validate output is provided when not using --show-options
+      unless options[:output]
+        raise Thor::Error, "Output path is required. Use --output option."
+      end
+
+      # Build ConversionOptions
+      conv_options = build_conversion_options(source_format, options[:to],
+                                              options)
+
       # Build instance coordinates from axis options
       instance_coords = build_instance_coordinates(options)
 
-      # Merge coordinates into options
+      # Merge coordinates and ConversionOptions into convert_options
       convert_options = options.to_h.dup
       if instance_coords.any?
-        convert_options[:instance_coordinates] =
-          instance_coords
+        convert_options[:instance_coordinates] = instance_coords
       end
 
+      # Add ConversionOptions if built
+      convert_options[:options] = conv_options if conv_options
+
       command = Commands::ConvertCommand.new(font_file, convert_options)
       command.run
     rescue Errno::ENOENT, Error => e
@@ -668,5 +727,117 @@ module Fontisan
         puts "  #{profile_name.to_s.ljust(20)} - #{config[:description]}"
       end
     end
+
+    # Detect source format from file extension
+    #
+    # @param font_file [String] Path to the font file
+    # @return [Symbol] Detected format symbol
+    def detect_source_format(font_file)
+      ext = File.extname(font_file).downcase
+      case ext
+      when ".ttf"
+        :ttf
+      when ".otf"
+        :otf
+      when ".pfb", ".pfa"
+        :type1
+      when ".ttc"
+        :ttc
+      when ".otc"
+        :otc
+      when ".dfont"
+        :dfont
+      when ".woff"
+        :woff
+      when ".woff2"
+        :woff2
+      when ".svg"
+        :svg
+      else
+        # Default to TTF for unknown extensions
+        :ttf
+      end
+    end
+
+    # Show recommended options for a conversion
+    #
+    # @param source_format [Symbol] Source format
+    # @param target_format_str [String] Target format string
+    # @return [void]
+    def show_recommended_options(source_format, target_format_str)
+      target_format = Fontisan::ConversionOptions.normalize_format(target_format_str)
+
+      puts "\nRecommended options for #{source_format.to_s.upcase} → #{target_format.to_s.upcase} conversion:"
+      puts "=" * 70
+
+      # Show recommended options
+      recommended = Fontisan::ConversionOptions.recommended(from: source_format,
+                                                            to: target_format)
+      puts "\nOpening options:"
+      if recommended.opening.any?
+        recommended.opening.each do |key, value|
+          puts "  --#{key.to_s.gsub('_', '-')}: #{value}"
+        end
+      else
+        puts "  (none)"
+      end
+
+      puts "\nGenerating options:"
+      if recommended.generating.any?
+        recommended.generating.each do |key, value|
+          puts "  --#{key.to_s.gsub('_', '-')}: #{value}"
+        end
+      else
+        puts "  (none)"
+      end
+
+      puts "\nAvailable presets:"
+      Fontisan::ConversionOptions.available_presets.each do |preset|
+        puts "  #{preset}"
+      end
+
+      puts "\nTo use preset:"
+      puts "  fontisan convert #{source_format} --to #{target_format} --preset <name> --output output.ext"
+      puts "\n"
+    end
+
+    # Build ConversionOptions from CLI options
+    #
+    # @param source_format [Symbol] Source format
+    # @param target_format_str [String] Target format string
+    # @param opts [Hash] CLI options
+    # @return [ConversionOptions, nil] Built ConversionOptions or nil
+    def build_conversion_options(source_format, target_format_str, opts)
+      target_format = Fontisan::ConversionOptions.normalize_format(target_format_str)
+
+      # Use preset if specified
+      if opts[:preset]
+        return Fontisan::ConversionOptions.from_preset(opts[:preset])
+      end
+
+      # Build opening options from CLI flags
+      opening = {}
+      opening[:decompose_composites] = true if opts[:decompose]
+      opening[:convert_curves] = true if opts[:convert_curves]
+      opening[:scale_to_1000] = true if opts[:scale_to_1000]
+      opening[:autohint] = true if opts[:autohint]
+      opening[:generate_unicode] = true if opts[:generate_unicode]
+
+      # Build generating options from CLI flags
+      generating = {}
+      generating[:hinting_mode] = opts[:hinting_mode] if opts[:hinting_mode]
+      generating[:decompose_on_output] = true if opts[:decompose_on_output]
+      generating[:optimize_tables] = true if opts[:optimize_tables]
+
+      # Only create ConversionOptions if any options were set
+      return nil if opening.empty? && generating.empty?
+
+      Fontisan::ConversionOptions.new(
+        from: source_format,
+        to: target_format,
+        opening: opening,
+        generating: generating,
+      )
+    end
   end
 end

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/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"