fontisan 0.2.12 → 0.2.13

data/lib/fontisan/type1/seac_expander.rb

@@ -0,0 +1,501 @@
+# frozen_string_literal: true
+
+module Fontisan
+  module Type1
+    # Expands Type 1 seac composite glyphs into base + accent outlines
+    #
+    # [`SeacExpander`](lib/fontisan/type1/seac_expander.rb) handles the
+    # decomposition of Type 1 composite glyphs that use the `seac` operator.
+    # The seac operator combines two glyphs (a base character and an accent)
+    # with a positioning offset, which must be decomposed for CFF conversion.
+    #
+    # The seac operator format is:
+    # ```
+    # seac asb adx ady bchar achar
+    # ```
+    #
+    # Where:
+    # - `asb`: Accent side bearing (not used in decomposition)
+    # - `adx`: X offset for accent placement
+    # - `ady`: Y offset for accent placement
+    # - `bchar`: Character code of base glyph
+    # - `achar`: Character code of accent glyph
+    #
+    # @example Decompose a seac composite
+    #   expander = Fontisan::Type1::SeacExpander.new(charstrings, private_dict)
+    #   decomposed = expander.decompose("Agrave")
+    #   # => Returns merged outline of base 'A' + accent 'grave'
+    #
+    # @see https://www.adobe.com/devnet/font/pdfs/Type1.pdf
+    class SeacExpander
+      # @return [CharStrings] Type 1 CharStrings dictionary
+      attr_reader :charstrings
+
+      # @return [PrivateDict] Private dictionary for hinting
+      attr_reader :private_dict
+
+      # Initialize a new SeacExpander
+      #
+      # @param charstrings [CharStrings] Type 1 CharStrings dictionary
+      # @param private_dict [PrivateDict] Private dictionary for context
+      def initialize(charstrings, private_dict)
+        @charstrings = charstrings
+        @private_dict = private_dict
+      end
+
+      # Decompose a seac composite glyph into base + accent outlines
+      #
+      # This method:
+      # 1. Parses the seac operator to extract components
+      # 2. Gets CharStrings for base and accent glyphs
+      # 3. Parses both CharStrings into outline commands
+      # 4. Transforms the accent by (adx, ady) offset
+      # 5. Merges base and accent outlines into a single path
+      # 6. Returns the decomposed CharString data
+      #
+      # @param glyph_name [String] Name of the composite glyph to decompose
+      # @return [String, nil] Decomposed CharString bytecode, or nil if not a seac composite
+      # @raise [Fontisan::Error] If base or accent glyphs are not found
+      #
+      # @example Decompose "Agrave" glyph
+      #   expander.decompose("Agrave")
+      def decompose(glyph_name)
+        components = @charstrings.components_for(glyph_name)
+        return nil unless components
+
+        # Use the encoding map to lookup glyph names from character codes
+        base_glyph_name = @charstrings.encoding[components[:base]]
+        accent_glyph_name = @charstrings.encoding[components[:accent]]
+
+        if base_glyph_name.nil?
+          raise Fontisan::Error, "Base glyph for char code #{components[:base]} not found"
+        end
+
+        if accent_glyph_name.nil?
+          raise Fontisan::Error, "Accent glyph for char code #{components[:accent]} not found"
+        end
+
+        # Get CharStrings for base and accent
+        base_charstring = @charstrings[base_glyph_name]
+        accent_charstring = @charstrings[accent_glyph_name]
+
+        if base_charstring.nil?
+          raise Fontisan::Error, "CharString not found for base glyph #{base_glyph_name}"
+        end
+
+        if accent_charstring.nil?
+          raise Fontisan::Error, "CharString not found for accent glyph #{accent_glyph_name}"
+        end
+
+        # Parse both CharStrings into command sequences
+        base_commands = parse_charstring_to_commands(base_charstring)
+        accent_commands = parse_charstring_to_commands(accent_charstring)
+
+        # Transform accent by (adx, ady) offset
+        accent_commands = transform_commands(accent_commands, components[:adx], components[:ady])
+
+        # Merge base and accent commands
+        merged_commands = merge_outline_commands(base_commands, accent_commands)
+
+        # Convert merged commands back to CharString bytecode
+        generate_charstring(merged_commands)
+      end
+
+      # Check if a glyph is a seac composite
+      #
+      # @param glyph_name [String] Glyph name to check
+      # @return [Boolean] True if the glyph uses seac operator
+      def composite?(glyph_name)
+        @charstrings.composite?(glyph_name)
+      end
+
+      # Get all seac composite glyphs in the font
+      #
+      # @return [Array<String>] List of composite glyph names
+      def composite_glyphs
+        @charstrings.glyph_names.select { |name| composite?(name) }
+      end
+
+      private
+
+      # Parse Type 1 CharString into drawing commands
+      #
+      # Converts Type 1 CharString bytecode into a list of drawing commands
+      # that can be manipulated and transformed.
+      #
+      # @param charstring [String] Binary CharString data
+      # @return [Array<Hash>] Array of command hashes
+      def parse_charstring_to_commands(charstring)
+        parser = CharStrings::CharStringParser.new(@private_dict)
+        parser.parse(charstring)
+        # Preprocess to combine numbers with operators
+        combined_commands = combine_numbers_with_operators(parser.commands)
+        commands_to_outline(combined_commands)
+      end
+
+      # Combine separate number commands with their operators
+      #
+      # The CharStringParser produces commands like [[:number, 100], [:number, 0], [:hsbw]]
+      # This method combines them into [[:hsbw, 100, 0]]
+      #
+      # @param commands [Array] Parser commands
+      # @return [Array] Combined commands
+      def combine_numbers_with_operators(commands)
+        result = []
+        number_stack = []
+
+        commands.each do |cmd|
+          if cmd[0] == :number
+            number_stack << cmd[1]
+          elsif cmd[0] == :seac
+            # seac is special - it uses the number stack for components
+            result << cmd
+            parse_seac_from_stack(result, number_stack)
+          else
+            # Operator - pop required numbers from stack
+            operator = cmd[0]
+            args = get_args_for_operator(operator, number_stack)
+            result << [operator, *args] if args
+          end
+        end
+
+        result
+      end
+
+      # Get arguments for an operator from the number stack
+      #
+      # @param operator [Symbol] Operator symbol
+      # @param stack [Array] Number stack
+      # @return [Array, nil] Arguments or nil if operator unknown
+      def get_args_for_operator(operator, stack)
+        case operator
+        when :hsbw
+          # hsbw takes 2 args: sbw, width
+          stack.pop(2).reverse
+        when :sbw
+          # sbw takes 3 args: sbw, wy, wx
+          stack.pop(3).reverse
+        when :rmoveto
+          # rmoveto takes 2 args: dy, dx
+          stack.pop(2).reverse
+        when :hmoveto
+          # hmoveto takes 1 arg: dx
+          stack.pop(1)
+        when :vmoveto
+          # vmoveto takes 1 arg: dy
+          stack.pop(1)
+        when :rlineto
+          # rlineto takes 2 args: dy, dx
+          stack.pop(2).reverse
+        when :hlineto
+          # hlineto takes 1 arg: dx
+          stack.pop(1)
+        when :vlineto
+          # vlineto takes 1 arg: dy
+          stack.pop(1)
+        when :rrcurveto
+          # rrcurveto takes 6 args: dy3, dx3, dy2, dx2, dy1, dx1
+          stack.pop(6).reverse
+        when :vhcurveto, :hvcurveto
+          # vhcurveto/hvcurveto take 4 args
+          stack.pop(4).reverse
+        when :hstem, :vstem, :callsubr, :return, :endchar
+          # These operators don't need args for outline conversion
+          []
+        else
+          # Unknown operator - return nil
+          nil
+        end
+      end
+
+      # Parse seac components from number stack
+      #
+      # @param result [Array] Result array to append to
+      # @param stack [Array] Number stack
+      def parse_seac_from_stack(result, stack)
+        return if stack.length < 5
+
+        # Last 5 numbers are: asb, adx, ady, bchar, achar
+        args = stack.pop(5).reverse
+        result.last[1] = args[1] # adx
+        result.last[2] = args[2] # ady
+        result.last[3] = args[3] # bchar
+        result.last[4] = args[4] # achar
+      end
+
+      # Convert parser commands to outline format
+      #
+      # @param commands [Array] Parser command format [type, *args]
+      # @return [Array<Hash>] Outline command format
+      def commands_to_outline(commands)
+        outline_commands = []
+        x = 0
+        y = 0
+
+        commands.each do |cmd|
+          case cmd[0]
+          when :hsbw
+            # hsbw x0 sbw: Set horizontal width and left sidebearing
+            # This is usually the first command in a CharString
+            x = cmd[1]
+            y = 0
+            outline_commands << { type: :move_to, x: x, y: y }
+          when :sbw
+            # sbw sbw x0 sbw: Set width and side bearings (vertical)
+            y = cmd[1]
+            x = cmd[2]
+            outline_commands << { type: :move_to, x: x, y: y }
+          when :rmoveto
+            # rmoveto dx dy: Relative move to
+            x += cmd[1]
+            y += cmd[2]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :hmoveto
+            # hmoveto dx: Horizontal move to
+            x += cmd[1]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :vmoveto
+            # vmoveto dy: Vertical move to
+            y += cmd[1]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :rlineto
+            # rlineto dx dy: Relative line to
+            x += cmd[1]
+            y += cmd[2]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :hlineto
+            # hlineto dx: Horizontal line to
+            x += cmd[1]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :vlineto
+            # vlineto dy: Vertical line to
+            y += cmd[1]
+            outline_commands << { type: :line_to, x: x, y: y }
+          when :rrcurveto
+            # rrcurveto dx1 dy1 dx2 dy2 dx3 dy3: Relative curved line to
+            # This is a quadratic curve in Type 1
+            # Convert to our outline format (quadratic)
+            dx1, dy1, dx2, dy2, dx3, dy3 = cmd[1..6]
+            control_x = x + dx1
+            control_y = y + dy1
+            anchor_x = x + dx1 + dx2
+            anchor_y = y + dy1 + dy2
+            end_x = x + dx1 + dx2 + dx3
+            end_y = y + dy1 + dy2 + dy3
+
+            outline_commands << {
+              type: :quad_to,
+              cx: control_x,
+              cy: control_y,
+              x: end_x,
+              y: end_y
+            }
+            x = end_x
+            y = end_y
+          when :vhcurveto, :hvcurveto
+            # vhcurveto: Vertical-to-horizontal curve
+            # hvcurveto: Horizontal-to-vertical curve
+            # These are also quadratic curves
+            # For now, treat as simple curves
+            handle_curve_command(outline_commands, cmd, x, y)
+            x = outline_commands.last[:x]
+            y = outline_commands.last[:y]
+          when :endchar
+            # End of CharString
+            break
+          when :number
+            # Number - skip, consumed by operators
+            nil
+          else
+            # Unknown command - skip
+            nil
+          end
+        end
+
+        outline_commands
+      end
+
+      # Handle curve commands (vhcurveto, hvcurveto)
+      #
+      # @param commands [Array] Command list to append to
+      # @param cmd [Array] The curve command
+      # @param x [Integer] Current X position
+      # @param y [Integer] Current Y position
+      def handle_curve_command(commands, cmd, x, y)
+        # Simplified handling - treat as quadratic curve
+        # vhcurveto: dy1 dx2 dy2 dx3
+        # hvcurveto: dx1 dy2 dx3 dy3
+        if cmd[0] == :vhcurveto
+          dy1, dx2, dy2, dx3 = cmd[1..4]
+          control_x = x
+          control_y = y + dy1
+          end_x = x + dx2
+          end_y = y + dy1 + dy2
+        else
+          dx1, dy2, dx3, dy3 = cmd[1..4]
+          control_x = x + dx1
+          control_y = y
+          end_x = x + dx1 + dx2
+          end_y = y + dy2 + dy3
+        end
+
+        commands << {
+          type: :quad_to,
+          cx: control_x,
+          cy: control_y,
+          x: end_x,
+          y: end_y
+        }
+      end
+
+      # Transform outline commands by translation
+      #
+      # @param commands [Array<Hash>] Outline commands
+      # @param dx [Integer] X offset
+      # @param dy [Integer] Y offset
+      # @return [Array<Hash>] Transformed commands
+      def transform_commands(commands, dx, dy)
+        return commands if dx == 0 && dy == 0
+
+        commands.map do |cmd|
+          case cmd[:type]
+          when :move_to, :line_to
+            { type: cmd[:type], x: cmd[:x] + dx, y: cmd[:y] + dy }
+          when :quad_to
+            {
+              type: :quad_to,
+              cx: cmd[:cx] + dx,
+              cy: cmd[:cy] + dy,
+              x: cmd[:x] + dx,
+              y: cmd[:y] + dy
+            }
+          when :curve_to
+            {
+              type: :curve_to,
+              cx1: cmd[:cx1] + dx,
+              cy1: cmd[:cy1] + dy,
+              cx2: cmd[:cx2] + dx,
+              cy2: cmd[:cy2] + dy,
+              x: cmd[:x] + dx,
+              y: cmd[:y] + dy
+            }
+          else
+            cmd # close_path, etc. pass through
+          end
+        end
+      end
+
+      # Merge base and accent outline commands
+      #
+      # Combines two outline sequences into one. The accent outline is
+      # appended to the base outline with proper contour separation.
+      #
+      # @param base_commands [Array<Hash>] Base glyph commands
+      # @param accent_commands [Array<Hash>] Accent glyph commands
+      # @return [Array<Hash>] Merged commands
+      def merge_outline_commands(base_commands, accent_commands)
+        # Remove the final close_path from base (if any)
+        # Then append accent commands
+        merged = base_commands.dup
+
+        # If base ends with close_path, remove it (accent will have its own)
+        merged.pop if merged.last && merged.last[:type] == :close_path
+
+        # Add accent commands
+        merged.concat(accent_commands)
+
+        merged
+      end
+
+      # Generate CharString bytecode from outline commands
+      #
+      # Converts outline commands back to Type 1 CharString format.
+      # This is a simplified implementation that handles common cases.
+      #
+      # @param commands [Array<Hash>] Outline commands
+      # @return [String] Binary CharString data
+      def generate_charstring(commands)
+        return "" if commands.empty?
+
+        charstring = String.new(encoding: Encoding::ASCII_8BIT)
+
+        x = 0
+        y = 0
+
+        commands.each do |cmd|
+          case cmd[:type]
+          when :move_to
+            # Use hsbw to set initial position
+            dx = cmd[:x] - x
+            # hsbw is a two-byte operator: 12 34
+            charstring << encode_number(dx)  # sbw value
+            charstring << encode_number(0)    # width (always 0 for decomposed glyphs)
+            charstring << 12  # First byte of two-byte operator
+            charstring << 34  # Second byte - hsbw
+            x = cmd[:x]
+            y = cmd[:y]
+          when :line_to
+            dx = cmd[:x] - x
+            dy = cmd[:y] - y
+            if dx != 0 && dy != 0
+              charstring << encode_number(dx)
+              charstring << encode_number(dy)
+              charstring << 5 # rlineto
+            elsif dx != 0
+              charstring << encode_number(dx)
+              charstring << 6 # hlineto
+            elsif dy != 0
+              charstring << encode_number(dy)
+              charstring << 7 # vlineto
+            end
+            x = cmd[:x]
+            y = cmd[:y]
+          when :quad_to
+            # rrcurveto: dx1 dy1 dx2 dy2 dx3 dy3
+            dx1 = cmd[:cx] - x
+            dy1 = cmd[:cy] - y
+            # For quadratic curves, we need to convert to cubic (Type 1 rrcurveto)
+            # This is a simplified conversion
+            anchor_dx = (cmd[:x] - x) / 2 - dx1 / 2
+            anchor_dy = (cmd[:y] - y) / 2 - dy1 / 2
+            end_dx = (cmd[:x] - x) - dx1 - anchor_dx
+            end_dy = (cmd[:y] - y) - dy1 - anchor_dy
+
+            charstring << encode_number(dx1)
+            charstring << encode_number(dy1)
+            charstring << encode_number(anchor_dx)
+            charstring << encode_number(anchor_dy)
+            charstring << encode_number(end_dx)
+            charstring << encode_number(end_dy)
+            charstring << 8 # rrcurveto
+            x = cmd[:x]
+            y = cmd[:y]
+          end
+        end
+
+        # Add endchar
+        charstring << 14
+
+        charstring
+      end
+
+      # Encode integer for Type 1 CharString
+      #
+      # Type 1 CharStrings use a variable-length integer encoding:
+      # - Numbers from -107 to 107: single byte (byte + 139)
+      # - Larger numbers: escaped with 255, then 2-byte value
+      #
+      # @param num [Integer] Number to encode
+      # @return [String] Encoded bytes
+      def encode_number(num)
+        if num >= -107 && num <= 107
+          [num + 139].pack("C*")
+        else
+          # Use escape sequence (255) followed by 2-byte signed integer
+          num += 32768 if num < 0
+          [255, num % 256, num >> 8].pack("C*")
+        end
+      end
+    end
+  end
+end

data/lib/fontisan/type1.rb

@@ -46,6 +46,8 @@ require_relative "type1/font_dictionary"
 require_relative "type1/private_dict"
 require_relative "type1/charstrings"
 require_relative "type1/charstring_converter"
+require_relative "type1/cff_to_type1_converter"
+require_relative "type1/seac_expander"
 
 # Infrastructure
 require_relative "type1/upm_scaler"

data/lib/fontisan/type1_font.rb

@@ -37,27 +37,41 @@ module Fontisan
     # @return [Symbol] Format type (:pfb or :pfa)
     attr_reader :format
 
+    # @return [Symbol] Loading mode (:metadata or :full)
+    attr_reader :loading_mode
+
     # @return [String, nil] Decrypted font data
     attr_reader :decrypted_data
 
     # @return [FontDictionary, nil] Font dictionary
-    attr_reader :font_dictionary
+    def font_dictionary
+      parse_dictionaries! unless @font_dictionary
+      @font_dictionary
+    end
 
     # @return [PrivateDict, nil] Private dictionary
-    attr_reader :private_dict
+    def private_dict
+      parse_dictionaries! unless @private_dict
+      @private_dict
+    end
 
     # @return [CharStrings, nil] CharStrings dictionary
-    attr_reader :charstrings
+    def charstrings
+      parse_dictionaries! unless @charstrings
+      @charstrings
+    end
 
     # Initialize a new Type1Font instance
     #
     # @param data [String] Font file data (binary or text)
     # @param format [Symbol] Format type (:pfb or :pfa, auto-detected if nil)
     # @param file_path [String, nil] Optional file path for reference
-    def initialize(data, format: nil, file_path: nil)
+    # @param mode [Symbol] Loading mode (:metadata or :full, default: :full)
+    def initialize(data, format: nil, file_path: nil, mode: :full)
       @file_path = file_path
       @format = format || detect_format(data)
       @data = data
+      @loading_mode = mode
 
       parse_font_data
     end
@@ -65,6 +79,7 @@ module Fontisan
     # Load Type 1 font from file
     #
     # @param file_path [String] Path to PFB or PFA file
+    # @param mode [Symbol] Loading mode (:metadata or :full, default: :full)
     # @return [Type1Font] Loaded font instance
     # @raise [ArgumentError] If file_path is nil
     # @raise [Fontisan::Error] If file cannot be read or parsed
@@ -74,7 +89,7 @@ module Fontisan
     #
     # @example Load PFA file
     #   font = Fontisan::Type1Font.from_file('font.pfa')
-    def self.from_file(file_path)
+    def self.from_file(file_path, mode: :full)
       raise ArgumentError, "File path cannot be nil" if file_path.nil?
 
       unless File.exist?(file_path)
@@ -84,7 +99,7 @@ module Fontisan
       # Read file
       data = File.binread(file_path)
 
-      new(data, file_path: file_path)
+      new(data, file_path: file_path, mode: mode)
     end
 
     # Get clear text portion (before eexec)
@@ -101,34 +116,6 @@ module Fontisan
       @encrypted_portion ||= ""
     end
 
-    # Get font name from font dictionary
-    #
-    # @return [String, nil] Font name or nil if not found
-    def font_name
-      extract_dictionary_value("/FontName")
-    end
-
-    # Get full name from FontInfo
-    #
-    # @return [String, nil] Full name or nil if not found
-    def full_name
-      extract_fontinfo_value("FullName")
-    end
-
-    # Get family name from FontInfo
-    #
-    # @return [String, nil] Family name or nil if not found
-    def family_name
-      extract_fontinfo_value("FamilyName")
-    end
-
-    # Get version from FontInfo
-    #
-    # @return [String, nil] Version or nil if not found
-    def version
-      extract_fontinfo_value("version")
-    end
-
     # Check if font has been decrypted
     #
     # @return [Boolean] True if font data has been decrypted

data/lib/fontisan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fontisan
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-20 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -120,9 +120,10 @@ files:
 - docs/APPLE_LEGACY_FONTS.adoc
 - docs/COLLECTION_VALIDATION.adoc
 - docs/COLOR_FONTS.adoc
-- docs/DOCUMENTATION_SUMMARY.md
+- docs/CONVERSION_GUIDE.adoc
 - docs/EXTRACT_TTC_MIGRATION.md
 - docs/FONT_HINTING.adoc
+- docs/TYPE1_FONTS.adoc
 - docs/VALIDATION.adoc
 - docs/VARIABLE_FONT_OPERATIONS.adoc
 - docs/WOFF_WOFF2_FORMATS.adoc
@@ -354,6 +355,7 @@ files:
 - lib/fontisan/type1/afm_generator.rb
 - lib/fontisan/type1/afm_parser.rb
 - lib/fontisan/type1/agl.rb
+- lib/fontisan/type1/cff_to_type1_converter.rb
 - lib/fontisan/type1/charstring_converter.rb
 - lib/fontisan/type1/charstrings.rb
 - lib/fontisan/type1/conversion_options.rb
@@ -369,6 +371,7 @@ files:
 - lib/fontisan/type1/pfm_generator.rb
 - lib/fontisan/type1/pfm_parser.rb
 - lib/fontisan/type1/private_dict.rb
+- lib/fontisan/type1/seac_expander.rb
 - lib/fontisan/type1/ttf_to_type1_converter.rb
 - lib/fontisan/type1/upm_scaler.rb
 - lib/fontisan/type1_font.rb