fontisan 0.4.6 → 0.4.7

data/lib/fontisan/ufo/compile/sbix.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Fontisan
+  module Ufo
+    module Compile
+      # Builds the OpenType `sbix` (Apple Bitmap) table.
+      #
+      # sbix stores bitmap strikes (PNG/JPEG) at multiple sizes. Each
+      # strike is a set of glyph-to-bitmap mappings at a specific ppem
+      # and resolution.
+      #
+      # Layout:
+      #   Header (8 bytes):
+      #     uint16 version (= 1)
+      #     uint16 flags
+      #     uint32 numStrikes
+      #     Offset32 strikeOffsets[numStrikes]
+      #
+      #   Strike (per ppem):
+      #     uint16 ppem
+      #     uint16 resolution (ppi)
+      #     Offset32 glyphDataOffsets[numGlyphs + 1]
+      #
+      #   Glyph Data (per glyph):
+      #     int16 originOffsetX
+      #     int16 originOffsetY
+      #     uint16 graphicType ("png " or "jpeg")
+      #     uint8 bitmapData[]
+      #
+      # @see https://learn.microsoft.com/en-us/typography/opentype/spec/sbix
+      module Sbix
+        VERSION = 1
+        PNG_TYPE = "png "
+        JPEG_TYPE = "jpeg"
+
+        # @param strikes [Array<Hash>] each with :ppem, :resolution,
+        #   and :glyphs (Array<Hash> with :origin_x, :origin_y,
+        #   :graphic_type, :data per glyph)
+        # @param num_glyphs [Integer] total glyph count
+        # @return [String, nil] sbix bytes, or nil if no strikes
+        def self.build(strikes:, num_glyphs:)
+          return nil if strikes.nil? || strikes.empty?
+
+          num_strikes = strikes.size
+          header_size = 4 + 4 + (num_strikes * 4) # version + flags + offsets
+
+          strike_bytes = strikes.map { |s| build_strike(s, num_glyphs) }
+
+          io = +""
+          io << [VERSION, 0, num_strikes].pack("nnN")
+
+          offset = header_size
+          strike_bytes.each do |s|
+            io << [offset].pack("N")
+            offset += s.bytesize
+            io << s
+          end
+          io
+        end
+
+        def self.build_strike(strike, num_glyphs)
+          glyphs = strike[:glyphs] || []
+          ppem = strike[:ppem] || 0
+          resolution = strike[:resolution] || 72
+
+          # Offset table: ppem(2) + resolution(2) + (numGlyphs+1) × offset(4)
+          offset_table_size = 4 + ((num_glyphs + 1) * 4)
+
+          offsets = []
+          glyph_data = +""
+          current_offset = offset_table_size
+
+          num_glyphs.times do |gid|
+            glyph = glyphs[gid]
+            if glyph && glyph[:data]
+              offsets << current_offset
+              data = glyph[:data].b
+              glyph_data << [glyph[:origin_x] || 0, glyph[:origin_y] || 0].pack("nn")
+              glyph_data << (glyph[:graphic_type] || PNG_TYPE).ljust(4)[0, 4]
+              glyph_data << data
+              current_offset += 8 + data.bytesize
+            else
+              offsets << current_offset
+            end
+          end
+          offsets << current_offset # sentinel
+
+          io = +""
+          io << [ppem, resolution].pack("nn")
+          offsets.each { |o| io << [o].pack("N") }
+          io << glyph_data
+          io
+        end
+
+        private_class_method :build_strike
+      end
+    end
+  end
+end

data/lib/fontisan/ufo/compile/svg_table.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Fontisan
+  module Ufo
+    module Compile
+      # Builds the OpenType `SVG ` table for SVG-in-OpenType color glyphs.
+      #
+      # Layout:
+      #   Header (10 bytes):
+      #     uint16 version (= 0)
+      #     Offset32 documentListOffset (= 10, immediately after header)
+      #     uint32 reserved (= 0)
+      #
+      #   Document List:
+      #     uint16 numEntries
+      #     DocumentRecord[numEntries]:
+      #       uint16 startGlyphID
+      #       uint16 endGlyphID
+      #       Offset32 svgDocOffset (from start of SVG table)
+      #       uint32 svgDocLength
+      #
+      #   SVG Documents (raw XML, optionally gzipped)
+      #
+      # @see https://learn.microsoft.com/en-us/typography/opentype/spec/svg
+      module SvgTable
+        VERSION = 0
+        HEADER_SIZE = 10
+        DOCUMENT_RECORD_SIZE = 12
+
+        # @param entries [Array<Hash>] each with :start_gid (Integer),
+        #   :end_gid (Integer), :svg (String — raw SVG XML)
+        # @return [String, nil] SVG table bytes, or nil if no entries
+        def self.build(entries:)
+          return nil if entries.nil? || entries.empty?
+
+          num_entries = entries.size
+          doc_list_size = 2 + (num_entries * DOCUMENT_RECORD_SIZE)
+          doc_data_offset = HEADER_SIZE + doc_list_size
+
+          header = [VERSION, HEADER_SIZE, 0].pack("nNN")
+
+          records = +""
+          docs = +""
+          offset = doc_data_offset
+          entries.each do |entry|
+            svg_bytes = entry[:svg].b
+            records << [entry[:start_gid], entry[:end_gid],
+                        offset, svg_bytes.bytesize].pack("nnNN")
+            docs << svg_bytes
+            offset += svg_bytes.bytesize
+          end
+
+          doc_list = [num_entries].pack("n") + records
+
+          header + doc_list + docs
+        end
+      end
+    end
+  end
+end

data/lib/fontisan/ufo/compile/variable_otf.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "tmpdir"
+
+module Fontisan
+  module Ufo
+    module Compile
+      # VariableOtf — produces a variable OTF with CFF2 outlines.
+      #
+      # The orchestrator assembles a default-master UFO plus variation
+      # masters into a variable OpenType font with:
+      #   - CFF2 outlines (static — blend/vsindex operators are TODO 07/18)
+      #   - fvar (axes + instances)
+      #   - STAT (style attributes)
+      #   - avar (axis remapping, when maps are provided)
+      #
+      # NOTE: the CFF2 table currently contains static outlines (no
+      # VariationStore, no blend operators). Full variable CFF2 requires
+      # TODO 07 (blend/vsindex) and TODO 18 (blend integration) to be
+      # wired into the charstring builder.
+      #
+      # @see https://learn.microsoft.com/en-us/typography/opentype/spec/cff2
+      class VariableOtf
+        # @param default_font [Fontisan::Ufo::Font] the default master
+        # @param master_fonts [Array<Fontisan::Ufo::Font>] variation masters
+        # @param axes [Array<Hash>] fvar axes (tag, min, default, max, name_id)
+        # @param instances [Array<Hash>] named instances
+        def initialize(default_font, master_fonts: [], axes: [], instances: [])
+          @default = default_font
+          @masters = master_fonts
+          @axes = axes
+          @instances = instances
+        end
+
+        # Compile the variable OTF directly to the output path.
+        # @param output_path [String] output file path
+        # @return [String] the output path
+        def compile(output_path:)
+          tables = build_tables
+          Fontisan::FontWriter.write_to_file(
+            tables.transform_values { |t| t.is_a?(String) ? t : t.to_binary_s },
+            output_path,
+            sfnt_version: 0x4F54544F,
+          )
+          output_path
+        end
+
+        # Build all tables for the variable OTF.
+        # @return [Hash<String,String>] table tag → bytes
+        def build_tables
+          glyphs = @default.glyphs.values
+
+          tables = {
+            "head" => Head.build(@default, glyphs: glyphs, loca_format: Head::LOCA_FORMAT_LONG),
+            "hhea" => Hhea.build(@default, glyphs: glyphs),
+            "maxp" => Maxp.build(@default, glyphs: glyphs, version: Maxp::VERSION_OPEN_TYPE),
+            "OS/2" => Os2.build(@default, glyphs: glyphs),
+            "name" => Name.build(@default),
+            "post" => Post.build(@default),
+            "hmtx" => Hmtx.build(@default, glyphs: glyphs),
+            "cmap" => Cmap.build(@default, glyphs: glyphs),
+            "CFF2" => Cff2.build(@default, glyphs: glyphs),
+            "fvar" => Fvar.build(@default, axes: @axes, instances: @instances),
+            "STAT" => Stat.build(axes: @axes),
+          }
+
+          avar_bytes = Avar.build(axes: @axes)
+          tables["avar"] = avar_bytes if avar_bytes
+
+          tables
+        end
+      end
+    end
+  end
+end

data/lib/fontisan/ufo/compile.rb

@@ -46,6 +46,17 @@ module Fontisan
       autoload :Cmap,         "fontisan/ufo/compile/cmap"
       autoload :GlyfLoca,     "fontisan/ufo/compile/glyf_loca"
       autoload :Cff,          "fontisan/ufo/compile/cff"
+      autoload :Cff2,         "fontisan/ufo/compile/cff2"
+      autoload :Otf2Compiler, "fontisan/ufo/compile/otf2_compiler"
+      autoload :Cpal,         "fontisan/ufo/compile/cpal"
+      autoload :Meta,         "fontisan/ufo/compile/meta"
+      autoload :SvgTable,     "fontisan/ufo/compile/svg_table"
+      autoload :Sbix,         "fontisan/ufo/compile/sbix"
+      autoload :MathTable,    "fontisan/ufo/compile/math"
+      autoload :CbdtCblc,     "fontisan/ufo/compile/cbdt_cblc"
+      autoload :Colr,         "fontisan/ufo/compile/colr"
+      autoload :Cff2Subrs,    "fontisan/ufo/compile/cff2_subroutines"
+      autoload :VariableOtf,  "fontisan/ufo/compile/variable_otf"
       autoload :Avar,         "fontisan/ufo/compile/avar"
       autoload :Hvar,         "fontisan/ufo/compile/hvar"
       autoload :Mvar,         "fontisan/ufo/compile/mvar"

data/lib/fontisan/version.rb

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

data/lib/fontisan.rb

@@ -70,6 +70,8 @@ module Fontisan
   autoload :CorruptedVariationDataError, "fontisan/error"
   autoload :InvalidVariationDataError, "fontisan/error"
   autoload :VariationDataCorruptedError, "fontisan/error"
+  autoload :MultipleCbdtSourcesError, "fontisan/error"
+  autoload :GlyphLimitExceededError, "fontisan/error"
 
   # Namespace hubs (each hub declares its own child autoloads)
   autoload :Binary, "fontisan/binary"
@@ -86,6 +88,7 @@ module Fontisan
   autoload :Pipeline, "fontisan/pipeline"
   autoload :Subset, "fontisan/subset"
   autoload :Svg, "fontisan/svg"
+  autoload :SvgToGlyf, "fontisan/svg_to_glyf"
   autoload :Tables, "fontisan/tables"
   autoload :Type1, "fontisan/type1"
   autoload :Ufo, "fontisan/ufo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontisan
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -125,11 +125,15 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- BUG-stitcher-drops-isolated-cps.md
+- BUG-stitcher-drops-plane1-codepoints.md
+- BUG-stitcher-gid-cap-65535.md
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.adoc
 - Rakefile
+- benchmark/compile_benchmark.rb
 - benchmark/variation_quick_bench.rb
 - docs/.gitignore
 - docs/.vitepress/config.ts
@@ -141,12 +145,16 @@ files:
 - docs/.vitepress/theme/index.ts
 - docs/.vitepress/theme/style.css
 - docs/APPLE_LEGACY_FONTS.adoc
+- docs/CFF2_SUPPORT.adoc
 - docs/COLLECTION_VALIDATION.adoc
 - docs/COLOR_FONTS.adoc
 - docs/CONVERSION_GUIDE.adoc
 - docs/EXTRACT_TTC_MIGRATION.md
 - docs/FONT_HINTING.adoc
+- docs/STITCHER_GUIDE.adoc
+- docs/SVG_TO_GLYF.adoc
 - docs/TYPE1_FONTS.adoc
+- docs/UFO_COMPILATION.adoc
 - docs/VALIDATION.adoc
 - docs/VARIABLE_FONT_OPERATIONS.adoc
 - docs/WOFF_WOFF2_FORMATS.adoc
@@ -436,6 +444,9 @@ files:
 - lib/fontisan/sfnt_font.rb
 - lib/fontisan/sfnt_table.rb
 - lib/fontisan/stitcher.rb
+- lib/fontisan/stitcher/deduplicator.rb
+- lib/fontisan/stitcher/glyph_limit.rb
+- lib/fontisan/stitcher/glyph_signature.rb
 - lib/fontisan/stitcher/selector.rb
 - lib/fontisan/stitcher/selector/codepoints.rb
 - lib/fontisan/stitcher/selector/gid.rb
@@ -453,10 +464,23 @@ files:
 - lib/fontisan/svg/font_generator.rb
 - lib/fontisan/svg/glyph_generator.rb
 - lib/fontisan/svg/view_box_calculator.rb
+- lib/fontisan/svg_to_glyf.rb
+- lib/fontisan/svg_to_glyf/assembler.rb
+- lib/fontisan/svg_to_glyf/document.rb
+- lib/fontisan/svg_to_glyf/geometry.rb
+- lib/fontisan/svg_to_glyf/geometry/affine_transform.rb
+- lib/fontisan/svg_to_glyf/geometry/normalizer.rb
+- lib/fontisan/svg_to_glyf/geometry/transform_parser.rb
+- lib/fontisan/svg_to_glyf/path.rb
+- lib/fontisan/svg_to_glyf/path/command.rb
+- lib/fontisan/svg_to_glyf/path/contour_builder.rb
+- lib/fontisan/svg_to_glyf/path/parser.rb
+- lib/fontisan/svg_to_glyf/path/state.rb
 - lib/fontisan/tables.rb
 - lib/fontisan/tables/cbdt.rb
 - lib/fontisan/tables/cblc.rb
 - lib/fontisan/tables/cff.rb
+- lib/fontisan/tables/cff/cff2_charstring_builder.rb
 - lib/fontisan/tables/cff/cff_glyph.rb
 - lib/fontisan/tables/cff/charset.rb
 - lib/fontisan/tables/cff/charstring.rb
@@ -479,6 +503,10 @@ files:
 - lib/fontisan/tables/cff2.rb
 - lib/fontisan/tables/cff2/blend_operator.rb
 - lib/fontisan/tables/cff2/charstring_parser.rb
+- lib/fontisan/tables/cff2/dict_encoder.rb
+- lib/fontisan/tables/cff2/fd_select.rb
+- lib/fontisan/tables/cff2/header.rb
+- lib/fontisan/tables/cff2/index_builder.rb
 - lib/fontisan/tables/cff2/operand_stack.rb
 - lib/fontisan/tables/cff2/private_dict_blend_handler.rb
 - lib/fontisan/tables/cff2/region_matcher.rb
@@ -557,8 +585,13 @@ files:
 - lib/fontisan/ufo/compile.rb
 - lib/fontisan/ufo/compile/avar.rb
 - lib/fontisan/ufo/compile/base_compiler.rb
+- lib/fontisan/ufo/compile/cbdt_cblc.rb
 - lib/fontisan/ufo/compile/cff.rb
+- lib/fontisan/ufo/compile/cff2.rb
+- lib/fontisan/ufo/compile/cff2_subroutines.rb
 - lib/fontisan/ufo/compile/cmap.rb
+- lib/fontisan/ufo/compile/colr.rb
+- lib/fontisan/ufo/compile/cpal.rb
 - lib/fontisan/ufo/compile/filters.rb
 - lib/fontisan/ufo/compile/filters/cubic_to_quadratic.rb
 - lib/fontisan/ufo/compile/filters/decompose_components.rb
@@ -573,14 +606,20 @@ files:
 - lib/fontisan/ufo/compile/hmtx.rb
 - lib/fontisan/ufo/compile/hvar.rb
 - lib/fontisan/ufo/compile/item_variation_store.rb
+- lib/fontisan/ufo/compile/math.rb
 - lib/fontisan/ufo/compile/maxp.rb
+- lib/fontisan/ufo/compile/meta.rb
 - lib/fontisan/ufo/compile/mvar.rb
 - lib/fontisan/ufo/compile/name.rb
 - lib/fontisan/ufo/compile/os2.rb
+- lib/fontisan/ufo/compile/otf2_compiler.rb
 - lib/fontisan/ufo/compile/otf_compiler.rb
 - lib/fontisan/ufo/compile/post.rb
+- lib/fontisan/ufo/compile/sbix.rb
 - lib/fontisan/ufo/compile/stat.rb
+- lib/fontisan/ufo/compile/svg_table.rb
 - lib/fontisan/ufo/compile/ttf_compiler.rb
+- lib/fontisan/ufo/compile/variable_otf.rb
 - lib/fontisan/ufo/compile/variable_ttf.rb
 - lib/fontisan/ufo/component.rb
 - lib/fontisan/ufo/contour.rb