fontisan 0.2.1 → 0.2.2

data/lib/fontisan/models/font_info.rb

@@ -36,37 +36,9 @@ module Fontisan
       attribute :font_revision, :float
       attribute :permissions, :string
       attribute :units_per_em, :integer
+      attribute :collection_offset, :integer
 
-      json do
-        map "font_format", to: :font_format
-        map "is_variable", to: :is_variable
-        map "family_name", to: :family_name
-        map "subfamily_name", to: :subfamily_name
-        map "full_name", to: :full_name
-        map "postscript_name", to: :postscript_name
-        map "postscript_cid_name", to: :postscript_cid_name
-        map "preferred_family", to: :preferred_family
-        map "preferred_subfamily", to: :preferred_subfamily
-        map "mac_font_menu_name", to: :mac_font_menu_name
-        map "version", to: :version
-        map "unique_id", to: :unique_id
-        map "description", to: :description
-        map "designer", to: :designer
-        map "designer_url", to: :designer_url
-        map "manufacturer", to: :manufacturer
-        map "vendor_url", to: :vendor_url
-        map "vendor_id", to: :vendor_id
-        map "trademark", to: :trademark
-        map "copyright", to: :copyright
-        map "license_description", to: :license_description
-        map "license_url", to: :license_url
-        map "sample_text", to: :sample_text
-        map "font_revision", to: :font_revision
-        map "permissions", to: :permissions
-        map "units_per_em", to: :units_per_em
-      end
-
-      yaml do
+      key_value do
         map "font_format", to: :font_format
         map "is_variable", to: :is_variable
         map "family_name", to: :family_name
@@ -93,6 +65,7 @@ module Fontisan
         map "font_revision", to: :font_revision
         map "permissions", to: :permissions
         map "units_per_em", to: :units_per_em
+        map "collection_offset", to: :collection_offset
       end
     end
   end

data/lib/fontisan/models/hint.rb

@@ -76,7 +76,7 @@ module Fontisan
           {
             type: h.type,
             data: h.data,
-            source_format: h.source_format
+            source_format: h.source_format,
           }
         end
         glyph_hints_hash[glyph_id.to_s] = hints_data
@@ -124,6 +124,7 @@ module Fontisan
       # Parse glyph hints JSON
       def parse_glyph_hints
         return {} if @glyph_hints.nil? || @glyph_hints.empty? || @glyph_hints == "{}"
+
         JSON.parse(@glyph_hints)
       rescue JSON::ParserError
         {}
@@ -202,7 +203,7 @@ module Fontisan
         when :interpolate
           # IUP instruction
           axis = data[:axis] || :y
-          axis == :x ? [0x31] : [0x30]  # IUP[x] or IUP[y]
+          axis == :x ? [0x31] : [0x30] # IUP[x] or IUP[y]
         when :shift
           # SHP instruction
           data[:instructions] || []
@@ -268,23 +269,22 @@ module Fontisan
 
       # Convert stem hint to TrueType instructions
       def convert_stem_to_truetype
-        position = data[:position] || 0
-        width = data[:width] || 0
+        data[:position] || 0
+        data[:width] || 0
         orientation = data[:orientation] || :vertical
 
         # TrueType uses MDAP (Move Direct Absolute Point) and MDRP (Move Direct Relative Point)
         # to control stem positioning
         instructions = []
 
-        if orientation == :vertical
-          # Vertical stem: use Y-axis instructions
-          instructions << 0x2E # MDAP[rnd] - mark reference point
-          instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
-        else
-          # Horizontal stem: use X-axis instructions
-          instructions << 0x2F # MDAP[rnd]
-          instructions << 0xC0 # MDRP[min,rnd,black]
-        end
+        instructions << if orientation == :vertical
+                          # Vertical stem: use Y-axis instructions
+                          0x2E # MDAP[rnd] - mark reference point
+                        else
+                          # Horizontal stem: use X-axis instructions
+                          0x2F # MDAP[rnd]
+                        end
+        instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
 
         instructions
       end
@@ -313,16 +313,15 @@ module Fontisan
         # Generate MDAP/MDRP pairs for each stem
         instructions = []
 
-        stems.each do |stem|
-          if orientation == :vertical
-            # Vertical stem: use Y-axis instructions
-            instructions << 0x2E # MDAP[rnd] - mark reference point
-            instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
-          else
-            # Horizontal stem: use X-axis instructions
-            instructions << 0x2F # MDAP[rnd]
-            instructions << 0xC0 # MDRP[min,rnd,black]
-          end
+        stems.each do |_stem|
+          instructions << if orientation == :vertical
+                            # Vertical stem: use Y-axis instructions
+                            0x2E # MDAP[rnd] - mark reference point
+                          else
+                            # Horizontal stem: use X-axis instructions
+                            0x2F # MDAP[rnd]
+                          end
+          instructions << 0xC0 # MDRP[min,rnd,black] - move relative point
         end
 
         instructions

data/lib/fontisan/models/outline.rb

@@ -121,7 +121,10 @@ module Fontisan
 
         # Get path from CharString
         path = charstring.path
-        raise ArgumentError, "CharString has no path data" if path.nil? || path.empty?
+        if path.nil? || path.empty?
+          raise ArgumentError,
+                "CharString has no path data"
+        end
 
         commands = convert_cff_path_to_commands(path)
 

data/lib/fontisan/models/validation_report.rb

@@ -29,7 +29,7 @@ module Fontisan
         attribute :severity, :string
         attribute :category, :string
         attribute :message, :string
-        attribute :location, :string, default: -> { nil }
+        attribute :location, :string, default: -> {}
 
         yaml do
           map "severity", to: :severity

data/lib/fontisan/open_type_font.rb

@@ -211,7 +211,8 @@ module Fontisan
           batch_entries.each do |entry|
             relative_offset = entry.offset - batch_offset
             tag_key = entry.tag.dup.force_encoding("UTF-8")
-            @table_data[tag_key] = batch_data[relative_offset, entry.table_length]
+            @table_data[tag_key] =
+              batch_data[relative_offset, entry.table_length]
           end
         end
 
@@ -286,6 +287,7 @@ module Fontisan
     # @return [Boolean] true if table is available in current mode
     def table_available?(tag)
       return false unless has_table?(tag)
+
       LoadingModes.table_allowed?(@loading_mode, tag)
     end
 

data/lib/fontisan/optimizers/pattern_analyzer.rb

@@ -222,7 +222,8 @@ module Fontisan
                 if @stack_aware
                   tracker = @stack_trackers[glyph_id]
                   next unless tracker
-                  next unless tracker.stack_neutral?(start_pos, start_pos + length)
+                  next unless tracker.stack_neutral?(start_pos,
+                                                     start_pos + length)
                 end
 
                 pattern_bytes = charstring[start_pos, length]

data/lib/fontisan/optimizers/subroutine_generator.rb

@@ -74,7 +74,7 @@ module Fontisan
         # 2. Analyze patterns
         analyzer = PatternAnalyzer.new(
           min_length: @min_pattern_length,
-          stack_aware: true
+          stack_aware: true,
         )
         patterns = analyzer.analyze(charstrings)
 

data/lib/fontisan/pipeline/output_writer.rb

@@ -69,7 +69,10 @@ module Fontisan
       # @return [Integer] Number of bytes written
       def write_svg(result)
         svg_xml = result[:svg_xml] || result["svg_xml"]
-        raise ArgumentError, "SVG result must contain :svg_xml key" unless svg_xml
+        unless svg_xml
+          raise ArgumentError,
+                "SVG result must contain :svg_xml key"
+        end
 
         File.write(@output_path, svg_xml)
       end
@@ -80,7 +83,8 @@ module Fontisan
       # @return [Integer] Number of bytes written
       def write_sfnt(tables)
         sfnt_version = determine_sfnt_version
-        FontWriter.write_to_file(tables, @output_path, sfnt_version: sfnt_version)
+        FontWriter.write_to_file(tables, @output_path,
+                                 sfnt_version: sfnt_version)
       end
 
       # Write WOFF format
@@ -145,7 +149,8 @@ module Fontisan
           when :otf
             OpenTypeFont.from_tables(tables)
           else
-            raise ArgumentError, "Cannot determine font type for format: #{@format}"
+            raise ArgumentError,
+                  "Cannot determine font type for format: #{@format}"
           end
         end
       end

data/lib/fontisan/pipeline/transformation_pipeline.rb

@@ -294,7 +294,8 @@ module Fontisan
         when ".woff" then :woff
         when ".woff2" then :woff2
         else
-          raise ArgumentError, "Cannot determine target format from extension: #{ext}"
+          raise ArgumentError,
+                "Cannot determine target format from extension: #{ext}"
         end
       end
 
@@ -304,7 +305,10 @@ module Fontisan
       def variation_options
         opts = {}
         opts[:coordinates] = @options[:coordinates] if @options[:coordinates]
-        opts[:instance_index] = @options[:instance_index] if @options[:instance_index]
+        if @options[:instance_index]
+          opts[:instance_index] =
+            @options[:instance_index]
+        end
         opts
       end
 
@@ -344,7 +348,8 @@ module Fontisan
           when :otf
             OpenTypeFont.from_tables(tables)
           else
-            raise ArgumentError, "Cannot determine font type: format=#{format}, has_cff=#{has_cff}, has_glyf=#{has_glyf}"
+            raise ArgumentError,
+                  "Cannot determine font type: format=#{format}, has_cff=#{has_cff}, has_glyf=#{has_glyf}"
           end
         end
       end

data/lib/fontisan/subset/table_subsetter.rb

@@ -122,11 +122,11 @@ module Fontisan
         data = table.to_binary_s.dup
 
         # Calculate new numberOfHMetrics
-        new_num_h_metrics = if hmtx && hmtx.h_metrics
-                             hmtx.h_metrics.size
-                           else
-                             calculate_number_of_h_metrics
-                           end
+        new_num_h_metrics = if hmtx&.h_metrics
+                              hmtx.h_metrics.size
+                            else
+                              calculate_number_of_h_metrics
+                            end
 
         # Update numberOfHMetrics field (at offset 34, uint16)
         data[34, 2] = [new_num_h_metrics].pack("n")

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