fontist 3.0.30 → 3.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d858c57f16d09454000112d1047f120b1a752a76331e3788f65cb441fe7a668c
-  data.tar.gz: 60c5f0e33198e6b7b8ad24db123280a5fff7c4eaf8b56581d3ab8c9108114b44
+  metadata.gz: ccd5b693c5cc7ffa551f7a24c4e1366cee390bba84c2cdd2969fda96fdb8798d
+  data.tar.gz: 493d3d3683bf368eaa553602084c8a457ddcb911d3e73be0308423263a176a2a
 SHA512:
-  metadata.gz: 581ebfd99f20a966cea6574294b4a3de879cdcea6051f916645e84ac9bd5e9ee16d4d0bfcbbd82f0291b6d6ae3e72dcf1c5524d02f6e1d67d3fbcfd880b03d73
-  data.tar.gz: 7188a89be063579e76ffd351c5ddd0c7296836a4c6162c1974ca54f79ca5cddd6134a71b3d48d04455fbc1ac8debbe1e6f2922d414a16aea2e85c83a62742fc2
+  metadata.gz: 2d13031416210a2c8996623593c27c93bb963dac09b108c55a6a80833262c664c7e478a8e8eb316f69963e73b77c2295790da77e8bad07289ca24ab1865371be
+  data.tar.gz: f2e34e0d2946338a0a2ab047ab48dbe5e5701899c2ed2731867d3389fcbc1caa0f92107ba8a8a992db2b74a78920f4b8105f8191d5636e1ec4b2a88952e80bc5

data/fontist.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fontisan", "~> 0.4", ">= 0.4.47"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "git", "~> 6.0"
-  spec.add_dependency "lutaml-model", "~> 0.8.0"
+  spec.add_dependency "lutaml-model", "~> 0.8.162"
   spec.add_dependency "marcel", "~> 1.0"
-  spec.add_dependency "nokogiri", "~> 1.0"
+  spec.add_dependency "moxml", "~> 0.6"
   spec.add_dependency "octokit", "~> 10.0"
   spec.add_dependency "paint", "~> 2.3"
   spec.add_dependency "parallel", "~> 1.24"

data/lib/fontist/font_file.rb

@@ -63,14 +63,30 @@ module Fontist
           font = validate_and_load_single_font(path)
         end
         names = extract_names_from_font(font)
-        # WOFF and WOFF2 fonts from Fontisan hold no open file to close.
+        # `has_table?` consults the table directory, which survives the
+        # metadata-mode load, so the fvar check is cheap; only an actual
+        # variable font pays for the follow-up full read. WOFF and WOFF2
+        # fonts from Fontisan hold no open file to close.
+        variable = font.has_table?("fvar")
         font.close if font.respond_to?(:close)
+        names[:variable_instances] = extract_variable_instances_from_path(path) if
+          variable && names[:family_name]
         names
       rescue StandardError => e
         raise_font_file_error(e)
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+      def extract_variable_instances_from_path(path)
+        # Full mode: the metadata-mode loader gates fvar data out, so the
+        # instance pass needs the real table read; this runs only for
+        # fonts already identified as variable by the cheap directory check.
+        font = Fontisan::FontLoader.load(path, mode: :full, lazy: true)
+        extract_variable_instances(font)
+      ensure
+        font.close if font.respond_to?(:close)
+      end
+
       # rubocop:disable Metrics/MethodLength
       def validate_and_load_single_font(path)
         # Load font first (we need to validate it, not the file path)
@@ -183,6 +199,62 @@ module Fontist
       end
       # rubocop:enable Metrics/MethodLength
 
+      # Named instances of a variable font, as `{family:, style:, full_name:}`
+      # triples. A variable file carries every named instance in one fvar
+      # table, but its name table exposes only the default instance's
+      # family, so an index built from the name table alone registers the
+      # file under a single family ("Fira Code Light") and every lookup of
+      # the other families/styles misses it. The RIBBI mapping follows the
+      # convention static families use: Regular/Bold live on the base
+      # family, every other weight becomes its own "Base Weight" family.
+      #
+      # @return [Array<Hash>] empty for a static font
+      # rubocop:disable Metrics/MethodLength
+      def extract_variable_instances(font)
+        return [] unless font.has_table?("fvar")
+
+        fvar = font.table("fvar")
+        name_table = font.table(Fontisan::Constants::NAME_TAG)
+        return [] unless name_table
+
+        base = name_table.english_name(Fontisan::Tables::Name::PREFERRED_FAMILY) ||
+          extract_any_name(name_table, Fontisan::Tables::Name::PREFERRED_FAMILY) ||
+          name_table.english_name(Fontisan::Tables::Name::FAMILY)
+        return [] unless base
+
+        ribbi = ["regular", "bold", "italic", "bold italic"]
+
+        fvar.instances.filter_map do |instance|
+          # fvar yields plain hashes ({name_id:, flags:, coordinates:,
+          # postscript_name_id:}), not message objects.
+          style = name_table.english_name(instance[:name_id]) ||
+            extract_any_name(name_table, instance[:name_id])
+          next unless style
+
+          if ribbi.include?(style.downcase)
+            family = base
+            type = style
+            full_name = "#{family} #{style}"
+          else
+            family = "#{base} #{style}"
+            type = "Regular"
+            full_name = family
+          end
+
+          {
+            family: family,
+            style: type,
+            full_name: full_name,
+          }
+        end
+      rescue StandardError => e
+        Fontist.ui.debug(
+          "Could not read variable instances: #{e.message}",
+        )
+        []
+      end
+      # rubocop:enable Metrics/MethodLength
+
       # Extract any available name for a given name ID by manually decoding the name record
       def extract_any_name(name_table, name_id)
         # Find any name record with the matching name_id
@@ -256,5 +328,11 @@ module Fontist
     def preferred_subfamily_name
       @info[:preferred_subfamily]
     end
+
+    # Named instances of a variable font (`{family:, style:, full_name:}`
+    # triples); empty for a static font.
+    def variable_instances
+      @info[:variable_instances] || []
+    end
   end
 end

data/lib/fontist/import/macos_importer.rb

@@ -1,5 +1,4 @@
 require "plist"
-require "nokogiri"
 require "paint"
 
 module Fontist

data/lib/fontist/import/sil_importer.rb

@@ -1,4 +1,4 @@
-require "nokogiri"
+require "moxml"
 require "paint"
 
 module Fontist
@@ -277,7 +277,7 @@ module Fontist
 
       def font_links
         html = URI.parse(ROOT).open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent).read
-        document = Nokogiri::HTML.parse(html)
+        document = Moxml.new.parse(html)
         links = document.css(CARD_LINK_SELECTOR)
         links = document.css(LEGACY_LINK_SELECTOR) if links.empty?
         links
@@ -408,7 +408,7 @@ module Fontist
         response = uri.open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent)
         current_url = response.base_uri
         html = response.read
-        document = Nokogiri::HTML.parse(html)
+        document = Moxml.new.parse(html)
 
         if @verbose
           # Debug: Show what selectors find using standardized method

data/lib/fontist/system_index.rb

@@ -729,9 +729,48 @@ spinner_index = nil)
     def detect_file_font(path)
       font_file = FontFile.from_path(path)
 
+      entries = variable_font_entries(font_file, path)
+      return entries unless entries.empty?
+
       parse_font(font_file, path)
     end
 
+    # One index entry per named instance of a variable font: a variable
+    # file answers every lookup only if each family/style pair it carries
+    # is indexed separately — the name table alone registers just the
+    # default instance ("Fira Code Light"), leaving find_styles blind to
+    # the rest of the set.
+    def variable_font_entries(font_file, path)
+      instances = font_file.variable_instances
+      return [] if instances.empty?
+
+      file_size = begin
+        File.size(path)
+      rescue StandardError
+        0
+      end
+      file_mtime = begin
+        File.mtime(path).to_i
+      rescue StandardError
+        0
+      end
+
+      base = font_file.preferred_family_name || font_file.family
+      instances.map do |instance|
+        family = instance[:family]
+        SystemIndexFont.new(
+          path: path,
+          full_name: instance[:full_name],
+          family_name: family,
+          subfamily: instance[:style],
+          preferred_family_name: base,
+          preferred_subfamily_name: instance[:style],
+          file_size: file_size,
+          file_mtime: file_mtime,
+        )
+      end
+    end
+
     def detect_collection_fonts(path)
       CollectionFile.from_path(path) do |collection|
         collection.map do |font_file|

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.30".freeze
+  VERSION = "3.0.32".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.30
+  version: 3.0.32
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-03 00:00:00.000000000 Z
+date: 2026-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.162
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.162
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -121,19 +121,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: moxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement