fontisan 0.2.1 → 0.2.3

data/lib/fontisan/tables/cff/charstring.rb

@@ -239,8 +239,11 @@ module Fontisan
             # 3-byte signed integer (16-bit)
             b1 = io.getbyte
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading shortint" if
-              b1.nil? || b2.nil?
+            if b1.nil? || b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading shortint"
+            end
+
             value = (b1 << 8) | b2
             value > 0x7FFF ? value - 0x10000 : value
           when 32..246
@@ -249,20 +252,29 @@ module Fontisan
           when 247..250
             # Positive 2-byte integer: +108 to +1131
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading positive integer" if
-              b2.nil?
+            if b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading positive integer"
+            end
+
             (byte - 247) * 256 + b2 + 108
           when 251..254
             # Negative 2-byte integer: -108 to -1131
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading negative integer" if
-              b2.nil?
+            if b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading negative integer"
+            end
+
             -(byte - 251) * 256 - b2 - 108
           when 255
             # 5-byte signed integer (32-bit) as fixed-point 16.16
             bytes = io.read(4)
-            raise CorruptedTableError, "Unexpected end of CharString reading fixed-point" if
-              bytes.nil? || bytes.length < 4
+            if bytes.nil? || bytes.length < 4
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading fixed-point"
+            end
+
             value = bytes.unpack1("l>") # Signed 32-bit big-endian
             value / 65536.0 # Convert to float
           else
@@ -368,7 +380,8 @@ module Fontisan
           # rmoveto takes 2 operands, so if stack has 3 and width not parsed,
           # first is width
           parse_width_for_operator(width_parsed, 2)
-          return if @stack.size < 2  # Need at least 2 values
+          return if @stack.size < 2 # Need at least 2 values
+
           dy = @stack.pop
           dx = @stack.pop
           @x += dx
@@ -383,7 +396,8 @@ module Fontisan
           # hmoveto takes 1 operand, so if stack has 2 and width not parsed,
           # first is width
           parse_width_for_operator(width_parsed, 1)
-          return if @stack.empty?  # Need at least 1 value
+          return if @stack.empty? # Need at least 1 value
+
           dx = @stack.pop || 0
           @x += dx
           @path << { type: :move_to, x: @x, y: @y }
@@ -396,7 +410,8 @@ module Fontisan
           # vmoveto takes 1 operand, so if stack has 2 and width not parsed,
           # first is width
           parse_width_for_operator(width_parsed, 1)
-          return if @stack.empty?  # Need at least 1 value
+          return if @stack.empty? # Need at least 1 value
+
           dy = @stack.pop || 0
           @y += dy
           @path << { type: :move_to, x: @x, y: @y }
@@ -688,7 +703,7 @@ module Fontisan
             dy3 = @stack.shift
 
             x1 = @x + dx1
-            y1 = @y +dy1
+            y1 = @y + dy1
             x2 = x1 + dx2
             y2 = y1 + dy2
             @x = x2 + dx3
@@ -785,6 +800,7 @@ module Fontisan
         # Call local subroutine
         def callsubr
           return if @stack.empty?
+
           subr_num = @stack.pop
           return unless subr_num # Guard against empty stack
 
@@ -798,6 +814,7 @@ module Fontisan
         # Call global subroutine
         def callgsubr
           return if @stack.empty?
+
           subr_num = @stack.pop
           return unless subr_num # Guard against empty stack
 
@@ -838,6 +855,7 @@ module Fontisan
         # Arithmetic operators
         def arithmetic_add
           return if @stack.size < 2
+
           b = @stack.pop
           a = @stack.pop
           @stack << (a + b)
@@ -845,6 +863,7 @@ module Fontisan
 
         def arithmetic_sub
           return if @stack.size < 2
+
           b = @stack.pop
           a = @stack.pop
           @stack << (a - b)
@@ -852,6 +871,7 @@ module Fontisan
 
         def arithmetic_mul
           return if @stack.size < 2
+
           b = @stack.pop
           a = @stack.pop
           @stack << (a * b)
@@ -859,26 +879,32 @@ module Fontisan
 
         def arithmetic_div
           return if @stack.size < 2
+
           b = @stack.pop
           a = @stack.pop
           return if b.zero?
+
           @stack << (a / b.to_f)
         end
 
         def arithmetic_neg
           return if @stack.empty?
+
           @stack << -@stack.pop
         end
 
         def arithmetic_abs
           return if @stack.empty?
+
           @stack << @stack.pop.abs
         end
 
         def arithmetic_sqrt
           return if @stack.empty?
+
           val = @stack.pop
           return if val.negative?
+
           @stack << Math.sqrt(val)
         end
 

data/lib/fontisan/tables/cff/charstring_parser.rb

@@ -130,7 +130,7 @@ module Fontisan
                 type: :operator,
                 name: operator,
                 operands: operand_stack.dup,
-                hint_data: hint_data
+                hint_data: hint_data,
               }
 
               # Clear operand stack
@@ -163,7 +163,7 @@ module Fontisan
         # @param byte [Integer] Byte value
         # @return [Boolean] True if operator byte
         def operator_byte?(byte)
-          (byte <= 31 && byte != 28) # Operators are 0-31 except 28 (shortint)
+          byte <= 31 && byte != 28 # Operators are 0-31 except 28 (shortint)
         end
 
         # Read operator from CharString
@@ -200,8 +200,11 @@ module Fontisan
             # 3-byte signed integer (16-bit)
             b1 = io.getbyte
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading shortint" if
-              b1.nil? || b2.nil?
+            if b1.nil? || b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading shortint"
+            end
+
             value = (b1 << 8) | b2
             value > 0x7FFF ? value - 0x10000 : value
           when 32..246
@@ -210,20 +213,29 @@ module Fontisan
           when 247..250
             # Positive 2-byte integer: +108 to +1131
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading positive integer" if
-              b2.nil?
+            if b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading positive integer"
+            end
+
             (byte - 247) * 256 + b2 + 108
           when 251..254
             # Negative 2-byte integer: -108 to -1131
             b2 = io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString reading negative integer" if
-              b2.nil?
+            if b2.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading negative integer"
+            end
+
             -(byte - 251) * 256 - b2 - 108
           when 255
             # 5-byte signed integer (32-bit) as fixed-point 16.16
             bytes = io.read(4)
-            raise CorruptedTableError, "Unexpected end of CharString reading fixed-point" if
-              bytes.nil? || bytes.length < 4
+            if bytes.nil? || bytes.length < 4
+              raise CorruptedTableError,
+                    "Unexpected end of CharString reading fixed-point"
+            end
+
             value = bytes.unpack1("l>") # Signed 32-bit big-endian
             value / 65536.0 # Convert to float
           else
@@ -234,4 +246,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff/charstring_rebuilder.rb

@@ -56,7 +56,7 @@ module Fontisan
         # @yield [operations] Block to modify operations
         # @yieldparam operations [Array<Hash>] Parsed operations
         # @yieldreturn [Array<Hash>] Modified operations
-        def modify_charstring(glyph_index, &block)
+        def modify_charstring(glyph_index)
           # Get original CharString data
           original_data = @source_index[glyph_index]
           return unless original_data
@@ -66,7 +66,7 @@ module Fontisan
           operations = parser.parse
 
           # Apply modification
-          modified_operations = block.call(operations)
+          modified_operations = yield(operations)
 
           # Build new CharString
           new_data = CharStringBuilder.build_from_operations(modified_operations)
@@ -86,13 +86,13 @@ module Fontisan
           charstrings = []
 
           (0...@source_index.count).each do |i|
-            if @modifications.key?(i)
-              # Use modified CharString
-              charstrings << @modifications[i]
-            else
-              # Use original CharString
-              charstrings << @source_index[i]
-            end
+            charstrings << if @modifications.key?(i)
+                             # Use modified CharString
+                             @modifications[i]
+                           else
+                             # Use original CharString
+                             @source_index[i]
+                           end
           end
 
           # Build INDEX
@@ -108,10 +108,10 @@ module Fontisan
         # @yieldparam glyph_index [Integer] Current glyph index
         # @yieldparam operations [Array<Hash>] Parsed operations
         # @yieldreturn [Array<Hash>] Modified operations
-        def batch_modify(glyph_indices, &block)
+        def batch_modify(glyph_indices)
           glyph_indices.each do |glyph_index|
             modify_charstring(glyph_index) do |operations|
-              block.call(glyph_index, operations)
+              yield(glyph_index, operations)
             end
           end
         end
@@ -124,10 +124,10 @@ module Fontisan
         # @yieldparam glyph_index [Integer] Current glyph index
         # @yieldparam operations [Array<Hash>] Parsed operations
         # @yieldreturn [Array<Hash>] Modified operations
-        def modify_all(&block)
+        def modify_all
           (0...@source_index.count).each do |i|
             modify_charstring(i) do |operations|
-              block.call(i, operations)
+              yield(i, operations)
             end
           end
         end
@@ -169,4 +169,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff/dict_builder.rb

@@ -93,7 +93,10 @@ module Fontisan
           dict_hash.each do |operator_name, value|
             # Get operator bytes
             operator_bytes = operator_for_name(operator_name)
-            raise ArgumentError, "Unknown operator: #{operator_name}" unless operator_bytes
+            unless operator_bytes
+              raise ArgumentError,
+                    "Unknown operator: #{operator_name}"
+            end
 
             # Write operands (value can be single value or array)
             if value.is_a?(Array)

data/lib/fontisan/tables/cff/hint_operation_injector.rb

@@ -120,7 +120,7 @@ module Fontisan
             type: :operator,
             name: operator,
             operands: args,
-            hint_data: nil
+            hint_data: nil,
           }]
         end
 
@@ -144,7 +144,7 @@ module Fontisan
             type: :operator,
             name: :hintmask,
             operands: [],
-            hint_data: hint_data
+            hint_data: hint_data,
           }]
         end
 
@@ -168,7 +168,7 @@ module Fontisan
             type: :operator,
             name: :cntrmask,
             operands: [],
-            hint_data: hint_data
+            hint_data: hint_data,
           }]
         end
 
@@ -188,6 +188,7 @@ module Fontisan
             vvcurveto hhcurveto vhcurveto hvcurveto
           ]
 
+          # rubocop:disable Style/CombinableLoops
           # Find first path operator
           operations.each_with_index do |op, index|
             return index if path_operators.include?(op[:name])
@@ -197,6 +198,7 @@ module Fontisan
           operations.each_with_index do |op, index|
             return index if op[:name] == :endchar
           end
+          # rubocop:enable Style/CombinableLoops
 
           # Empty or malformed - inject at start
           0
@@ -204,4 +206,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff/offset_recalculator.rb

@@ -67,4 +67,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff/private_dict_writer.rb

@@ -99,7 +99,11 @@ module Fontisan
           # Check array limits
           if HINT_LIMITS[key]
             raise ArgumentError, "#{key} invalid" unless value.is_a?(Array)
-            raise ArgumentError, "#{key} too long" if value.length > HINT_LIMITS[key][:max]
+
+            if value.length > HINT_LIMITS[key][:max]
+              raise ArgumentError,
+                    "#{key} too long"
+            end
             if HINT_LIMITS[key][:pairs] && value.length.odd?
               raise ArgumentError, "#{key} must be pairs"
             end
@@ -114,12 +118,14 @@ module Fontisan
           when :blue_shift, :blue_fuzz
             raise ArgumentError, "#{key} invalid" unless value.is_a?(Numeric)
           when :force_bold
-            raise ArgumentError, "#{key} must be 0 or 1" unless [0, 1].include?(value)
+            raise ArgumentError, "#{key} must be 0 or 1" unless [0,
+                                                                 1].include?(value)
           when :language_group
-            raise ArgumentError, "#{key} must be 0 or 1" unless [0, 1].include?(value)
+            raise ArgumentError, "#{key} must be 0 or 1" unless [0,
+                                                                 1].include?(value)
           end
         end
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff/table_builder.rb

@@ -218,4 +218,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff2/charstring_parser.rb

@@ -68,7 +68,8 @@ module Fontisan
         # @param global_subrs [Cff::Index, nil] Global subroutines INDEX
         # @param local_subrs [Cff::Index, nil] Local subroutines INDEX
         # @param vsindex [Integer] Variation store index (default 0)
-        def initialize(data, num_axes = 0, global_subrs = nil, local_subrs = nil, vsindex = 0)
+        def initialize(data, num_axes = 0, global_subrs = nil,
+local_subrs = nil, vsindex = 0)
           @data = data
           @num_axes = num_axes
           @global_subrs = global_subrs
@@ -123,7 +124,8 @@ module Fontisan
             when :line_to
               [:line_to, cmd[:x], cmd[:y]]
             when :curve_to
-              [:curve_to, cmd[:x1], cmd[:y1], cmd[:x2], cmd[:y2], cmd[:x], cmd[:y]]
+              [:curve_to, cmd[:x1], cmd[:y1], cmd[:x2], cmd[:y2], cmd[:x],
+               cmd[:y]]
             end
           end
         end
@@ -146,7 +148,8 @@ module Fontisan
             end
           end
         rescue StandardError => e
-          raise CorruptedTableError, "Failed to parse CFF2 CharString: #{e.message}"
+          raise CorruptedTableError,
+                "Failed to parse CFF2 CharString: #{e.message}"
         end
 
         # Check if byte is an operator
@@ -165,7 +168,10 @@ module Fontisan
           if first_byte == 12
             # Two-byte operator
             second_byte = @io.getbyte
-            raise CorruptedTableError, "Unexpected end of CharString" if second_byte.nil?
+            if second_byte.nil?
+              raise CorruptedTableError,
+                    "Unexpected end of CharString"
+            end
 
             [12, second_byte]
           else
@@ -305,7 +311,7 @@ module Fontisan
         # @param blend_op [Hash] Blend operation data
         # @param coordinates [Hash<String, Float>] Axis coordinates
         # @return [Array<Float>] Blended values
-        def apply_blend(blend_op, coordinates)
+        def apply_blend(blend_op, _coordinates)
           blend_op[:blends].map do |blend|
             base = blend[:base]
             deltas = blend[:deltas]
@@ -313,7 +319,7 @@ module Fontisan
             # Apply deltas based on coordinates
             # This will be enhanced when we have proper coordinate interpolation
             blended_value = base
-            deltas.each_with_index do |delta, axis_index|
+            deltas.each_with_index do |delta, _axis_index|
               # Placeholder: use normalized coordinate (will be replaced with proper interpolation)
               scalar = 0.0 # Will be calculated by interpolator
               blended_value += delta * scalar
@@ -573,7 +579,7 @@ module Fontisan
         def callsubr
           return if @local_subrs.nil? || @stack.empty?
 
-          subr_index = @stack.pop
+          @stack.pop
           # Implement subroutine call (placeholder)
           @stack.clear
         end
@@ -581,7 +587,7 @@ module Fontisan
         def callgsubr
           return if @global_subrs.nil? || @stack.empty?
 
-          subr_index = @stack.pop
+          @stack.pop
           # Implement global subroutine call (placeholder)
           @stack.clear
         end

data/lib/fontisan/tables/cff2/private_dict_blend_handler.rb

@@ -63,14 +63,14 @@ module Fontisan
 
             blends << {
               base: base,
-              deltas: deltas
+              deltas: deltas,
             }
           end
 
           {
             num_values: num_values,
             num_axes: num_axes,
-            blends: blends
+            blends: blends,
           }
         end
 
@@ -90,7 +90,7 @@ module Fontisan
           {
             base: value[0],
             deltas: value[1..num_axes],
-            num_axes: num_axes
+            num_axes: num_axes,
           }
         end
 
@@ -149,7 +149,8 @@ module Fontisan
               else
                 # Try as single blend value
                 blend_data = parse_blend_value(key, num_axes: num_axes)
-                result[key] = blend_data ? apply_blend(blend_data, scalars) : value
+                result[key] =
+                  blend_data ? apply_blend(blend_data, scalars) : value
               end
             else
               # Non-blend value, copy as-is
@@ -186,7 +187,7 @@ module Fontisan
               # Hint with blend data - normalize and flatten for DICT storage
               normalized_value = {
                 base: value[:base] || value["base"],
-                deltas: value[:deltas] || value["deltas"]
+                deltas: value[:deltas] || value["deltas"],
               }
               result[key] = flatten_blend(normalized_value, num_axes: num_axes)
             else
@@ -243,4 +244,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff2/region_matcher.rb

@@ -121,7 +121,7 @@ module Fontisan
         def active_regions(coordinates)
           scalars = calculate_scalars(coordinates)
           scalars.each_with_index.select { |scalar, _| scalar.positive? }
-                 .map(&:last)
+            .map(&:last)
         end
 
         # Get scalar for specific region index
@@ -197,4 +197,4 @@ module Fontisan
       end
     end
   end
-end
+end

data/lib/fontisan/tables/cff2/table_builder.rb

@@ -31,6 +31,9 @@ module Fontisan
       #   builder = CFF2TableBuilder.new(reader, hint_set)
       #   new_cff2 = builder.build
       class TableBuilder < Tables::Cff::TableBuilder
+        # CFF2-specific operators not supported by CFF DictBuilder
+        INVALID_CFF_KEYS = [24].freeze # operator 24 = vstore (CFF2 only)
+
         # @return [CFF2TableReader] CFF2 table reader
         attr_reader :reader
 
@@ -79,7 +82,7 @@ module Fontisan
             top_dict: top_dict_hash,
             charstrings: charstrings_data,
             private_dict: private_dict_data,
-            vstore: vstore_data
+            vstore: vstore_data,
           )
         end
 
@@ -134,7 +137,8 @@ module Fontisan
 
           # Create rebuilder with stem count
           stem_count = calculate_stem_count
-          rebuilder = Cff::CharStringRebuilder.new(charstrings_index, stem_count: stem_count)
+          rebuilder = Cff::CharStringRebuilder.new(charstrings_index,
+                                                   stem_count: stem_count)
 
           # Modify each glyph with hints
           hinted_glyph_ids.each do |glyph_id|
@@ -179,14 +183,14 @@ module Fontisan
           # Count stems from blue zones (hstem)
           hstem_count = 0
           blue_values = font_hints["blue_values"] || font_hints[:blue_values]
-          if blue_values && blue_values.is_a?(Array)
+          if blue_values.is_a?(Array)
             hstem_count = blue_values.size / 2
           end
 
           # Count stems from stem snap (vstem)
           vstem_count = 0
           stem_snap_h = font_hints["stem_snap_h"] || font_hints[:stem_snap_h]
-          if stem_snap_h && stem_snap_h.is_a?(Array)
+          if stem_snap_h.is_a?(Array)
             vstem_count = stem_snap_h.size
           end
 
@@ -365,7 +369,7 @@ module Fontisan
           # Extract Variable Store bytes unchanged
           # For simplicity, extract from vstore_offset to end of table
           # In production, we'd parse structure to get exact size
-          @reader.data[vstore_offset..-1]
+          @reader.data[vstore_offset..]
         end
 
         # Rebuild complete CFF2 table
@@ -376,7 +380,8 @@ module Fontisan
         # @param private_dict [String, nil] Private DICT
         # @param vstore [String, nil] Variable Store
         # @return [String] Complete CFF2 table binary
-        def rebuild_cff2_table(header:, top_dict:, charstrings:, private_dict:, vstore:)
+        def rebuild_cff2_table(header:, top_dict:, charstrings:, private_dict:,
+vstore:)
           output = StringIO.new("".b)
 
           # 1. Write Header
@@ -387,7 +392,7 @@ module Fontisan
             header_size: header.size,
             charstrings: charstrings,
             private_dict: private_dict,
-            vstore: vstore
+            vstore: vstore,
           )
 
           # 3. Build Top DICT with updated offsets
@@ -416,7 +421,8 @@ module Fontisan
         # @param private_dict [String, nil] Private DICT data
         # @param vstore [String, nil] Variable Store data
         # @return [Hash] Section offsets
-        def calculate_cff2_offsets(header_size:, charstrings:, private_dict:, vstore:)
+        def calculate_cff2_offsets(header_size:, charstrings:, private_dict:,
+vstore:)
           # Start after header
           offset = header_size
 
@@ -446,7 +452,7 @@ module Fontisan
             charstrings: charstrings_offset,
             private_dict: private_dict_offset,
             private_dict_size: private_dict_size,
-            vstore: vstore_offset
+            vstore: vstore_offset,
           }
         end
 
@@ -531,23 +537,23 @@ module Fontisan
             18 => :private,
             19 => :subrs,
             20 => :default_width_x,
-            21 => :nominal_width_x
-          # Note: operator 24 (vstore) is CFF2-specific and handled separately
+            21 => :nominal_width_x,
+            # Note: operator 24 (vstore) is CFF2-specific and handled separately
           }
 
           result = {}
           dict.each do |key, value|
             # Skip vstore (operator 24) - CFF2 specific, not in CFF DictBuilder
-            next if key == 24 || key == :vstore
+            next if INVALID_CFF_KEYS.include?(key)
 
             # Convert string keys to symbols for DictBuilder
-            if key.is_a?(String)
-              symbol_key = key.to_sym
-            elsif key.is_a?(Integer)
-              symbol_key = operator_map[key] || key
-            else
-              symbol_key = key
-            end
+            symbol_key = if key.is_a?(String)
+                           key.to_sym
+                         elsif key.is_a?(Integer)
+                           operator_map[key] || key
+                         else
+                           key
+                         end
 
             result[symbol_key] = value
           end
@@ -571,4 +577,4 @@ module Fontisan
       end
     end
   end
-end
+end