fontist 3.0.28 → 3.0.30

data/lib/fontist/import/google/variable_font_source.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+module Fontist
+  module Import
+    module Google
+      # The real variable font files of a family as published in the
+      # google/fonts repository (METADATA.pb `fonts` entries whose filename
+      # carries an axis list, e.g. "Roboto[wdth,wght].ttf").
+      #
+      # The Google Fonts API only serves static per-weight instances, so these
+      # files are the only genuine variable sources. Google publishes them as
+      # TTF only.
+      class VariableFontSource
+        RAW_BASE = "https://raw.githubusercontent.com/google/fonts"
+        AXIS_LIST = /\[([^\]]+)\]/
+
+        attr_reader :directory, :commit, :files, :axes
+
+        # @param directory [String] repo-relative family dir, e.g. "ofl/roboto"
+        # @param commit [String] google/fonts commit SHA the URLs are pinned to
+        # @param files [Array<Models::FontFileMetadata>] METADATA.pb fonts
+        # @param axes [Array<Models::AxisMetadata>] METADATA.pb axes
+        def self.from_metadata(metadata, directory:, commit:)
+          files = Array(metadata.fonts).select do |font|
+            font.filename.to_s.match?(AXIS_LIST)
+          end
+          return nil if files.empty? || commit.to_s.empty?
+
+          new(directory: directory, commit: commit, files: files,
+              axes: Array(metadata.axes))
+        end
+
+        def initialize(directory:, commit:, files:, axes:)
+          @directory = directory
+          @commit = commit
+          @files = files
+          @axes = axes
+        end
+
+        def urls
+          files.map { |file| url_for(file.filename) }
+        end
+
+        # Axis tags in METADATA.pb order, limited to those the files carry.
+        def axis_tags
+          present = files.flat_map { |file| tags_in(file.filename) }.uniq
+          declared = axes.map(&:tag)
+          (declared & present) + (present - declared)
+        end
+
+        # Resource entry for a v5 formula (TTF only).
+        def resource(family_name)
+          {
+            "source" => "google",
+            "family" => family_name,
+            "files" => urls,
+            "urls" => urls,
+            "format" => "ttf",
+            "variable_axes" => axis_tags,
+          }
+        end
+
+        # One style per variable file, described by METADATA.pb.
+        def styles
+          files.map { |file| style_for(file) }
+        end
+
+        private
+
+        def style_for(file)
+          names_of(file).merge(
+            "font" => file.filename,
+            "formats" => ["ttf"],
+            "variable_font" => true,
+            "variable_axes" => tags_in(file.filename),
+            "source_resource" => "ttf_variable",
+          ).compact
+        end
+
+        def names_of(file)
+          {
+            "family_name" => file.name,
+            "type" => file.style.to_s == "italic" ? "Italic" : "Regular",
+            "full_name" => file.full_name,
+            "post_script_name" => file.post_script_name,
+            "copyright" => file.copyright,
+          }
+        end
+
+        def tags_in(filename)
+          filename[AXIS_LIST, 1].to_s.split(",")
+        end
+
+        def url_for(filename)
+          # Brackets stay literal: the installer matches style files against
+          # the URL basename, which must equal the downloaded file name.
+          encoded = filename.gsub(/[^A-Za-z0-9._,\-\[\]]/) do |char|
+            char.bytes.map { |b| format("%%%02X", b) }.join
+          end
+          "#{RAW_BASE}/#{commit}/#{directory}/#{encoded}"
+        end
+      end
+    end
+  end
+end

data/lib/fontist/import/google.rb

@@ -7,6 +7,7 @@ module Fontist
       autoload :MetadataAdapter, "#{__dir__}/google/metadata_adapter"
       autoload :MetadataParser, "#{__dir__}/google/metadata_parser"
       autoload :Models, "#{__dir__}/google/models"
+      autoload :VariableFontSource, "#{__dir__}/google/variable_font_source"
 
       DEFAULT_MAX_COUNT = 100
 

data/lib/fontist/import/helpers/hash_helper.rb

@@ -4,7 +4,7 @@ module Fontist
       module HashHelper
         class << self
           def stringify_keys(hash)
-            JSON.parse(hash.to_json)
+            Fontist::JSON.parse(Fontist::JSON.dump(hash))
           end
         end
       end

data/lib/fontist/import/sil_importer.rb

@@ -5,6 +5,9 @@ module Fontist
   module Import
     class SilImporter
       ROOT = "https://software.sil.org/fonts/".freeze
+      CARD_LINK_SELECTOR = "a.inner-card".freeze
+      CARD_TITLE_SELECTOR = ".title-text".freeze
+      LEGACY_LINK_SELECTOR = "table.products div.title > a".freeze
 
       def initialize(options = {})
         @output_path = options[:output_path]
@@ -99,7 +102,7 @@ module Fontist
       end
 
       def process_single_font(link, current, total)
-        family_name = link.content
+        family_name = link_name(link)
 
         # Display progress
         ImportDisplay.progress(current, total, family_name) if @verbose
@@ -257,7 +260,8 @@ module Fontist
       end
 
       def empty_result
-        { successful: 0, failed: 0, errors: [], duration: 0 }
+        { successful: 0, failed: 0, errors: [], duration: 0,
+          no_fonts_found: true }
       end
 
       def build_results(duration)
@@ -274,12 +278,21 @@ 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.css("table.products div.title > a")
+        links = document.css(CARD_LINK_SELECTOR)
+        links = document.css(LEGACY_LINK_SELECTOR) if links.empty?
+        links
+      end
+
+      # Font name of a product link. Cards on the current site also carry a
+      # description, so the name is taken from the card title only.
+      def link_name(link)
+        title = link.at_css(CARD_TITLE_SELECTOR)
+        (title || link).text.strip
       end
 
       def filter_by_name(links)
         links.select do |link|
-          link.content.downcase.include?(@font_name.downcase)
+          link_name(link).downcase.include?(@font_name.downcase)
         end
       end
 
@@ -342,7 +355,7 @@ module Fontist
       end
 
       def find_archive_url_by_page_link(link)
-        family_name = link.content
+        family_name = link_name(link)
 
         # Skip known index pages that just link to other fonts
         if index_page?(family_name)

data/lib/fontist/import/v4_to_v5_migrator.rb

@@ -95,7 +95,7 @@ module Fontist
       def load_yaml_without_aliases(path)
         data = YAML.safe_load(File.read(path), aliases: true,
                                                permitted_classes: [Date])
-        JSON.parse(JSON.generate(data))
+        Fontist::JSON.parse(Fontist::JSON.dump(data))
       end
 
       def file_has_yaml_aliases?(path)

data/lib/fontist/import/windows.rb

@@ -53,7 +53,7 @@ module Fontist
       def base_attrs(description)
         {
           schema_version: 5,
-          name: description,
+          name: formula_name(description),
           description: "#{description} for Windows",
           homepage: HOMEPAGE,
           platforms: ["windows"],
@@ -119,7 +119,7 @@ module Fontist
       end
 
       def formula_path(description)
-        filename = "#{normalize_key(description)}.yml"
+        filename = "#{formula_key(description)}.yml"
         formula_dir.join(filename)
       end
 
@@ -135,6 +135,17 @@ module Fontist
                          end
       end
 
+      # Formula names keep to letters, digits and spaces, so the file key the
+      # formulas repository derives from them (lowercase, spaces as
+      # underscores) needs no shell escaping in its CI.
+      def formula_name(description)
+        description.tr("-", " ").delete("^A-Za-z0-9 ").squeeze(" ").strip
+      end
+
+      def formula_key(description)
+        formula_name(description).downcase.tr(" ", "_")
+      end
+
       def normalize_key(name)
         name.downcase.gsub(/[^a-z0-9]+/, "_").gsub(/^_|_$/, "")
       end

data/lib/fontist/import_cli.rb

@@ -122,6 +122,24 @@ module Fontist
       CLI::STATUS_UNKNOWN_ERROR
     end
 
+    desc "windows", "Import Windows font extension packs (Features on Demand)"
+    option :output_path,
+           type: :string,
+           desc: "Output directory for generated formulas " \
+                 "(default: formulas/windows)"
+
+    def windows
+      handle_class_options(options)
+      require_relative "import/windows"
+
+      Import::Windows.new(formulas_dir: options[:output_path]).call
+
+      CLI::STATUS_SUCCESS
+    rescue StandardError => e
+      Fontist.ui.error("Import error: #{e.message}")
+      CLI::STATUS_UNKNOWN_ERROR
+    end
+
     desc "sil", "Import formulas from SIL International"
     option :output_path,
            type: :string,
@@ -158,6 +176,7 @@ module Fontist
       )
 
       result = importer.call
+      return CLI::STATUS_UNKNOWN_ERROR if result[:no_fonts_found]
 
       # Report results only in non-verbose mode (verbose mode already has rich summary)
       unless options[:verbose]

data/lib/fontist/index_cli.rb

@@ -205,7 +205,7 @@ module Fontist
       case options[:format].downcase
       when "json"
         require "json"
-        puts JSON.pretty_generate(fonts_data)
+        puts Fontist::JSON.pretty(fonts_data)
       when "yaml"
         require "yaml"
         puts YAML.dump(fonts_data)

data/lib/fontist/indexes/index_mixin.rb

@@ -103,13 +103,13 @@ module Fontist
           return entries if entries
 
           parse_sidecar_entries(sidecar_path)
-        rescue JSON::ParserError, TypeError
+        rescue Fontist::JSON::ParseError, TypeError
           nil
         end
 
         def rebuild_sidecar_entries
           entries_hash = from_file(path).entries_hash
-          File.write("#{path}.json", JSON.dump("entries" => entries_hash))
+          File.write("#{path}.json", Fontist::JSON.dump("entries" => entries_hash))
           entries_hash
         end
 
@@ -135,7 +135,7 @@ module Fontist
         # as read-only
         def parse_sidecar_entries(sidecar_path)
           mtime = File.mtime(sidecar_path)
-          entries = JSON.parse(File.read(sidecar_path))["entries"]
+          entries = Fontist::JSON.parse(File.read(sidecar_path))["entries"]
 
           sidecar_cache_mutex.synchronize do
             sidecar_cache[sidecar_path] = { mtime: mtime, entries: entries }
@@ -244,7 +244,7 @@ module Fontist
 
       def write_lookup_sidecar(file_path)
         File.write("#{file_path}.json",
-                   JSON.dump("entries" => entries_hash))
+                   Fontist::JSON.dump("entries" => entries_hash))
       end
 
       # key -> formula paths, in the sidecar's JSON-friendly shape

data/lib/fontist/json.rb

@@ -0,0 +1,76 @@
+require "yeptris"
+require "yeptris/json"
+
+module Fontist
+  # JSON encoding and decoding through yeptris's native engine, replacing
+  # the json gem as fontist's JSON backend. The yeptris parser and
+  # generator produce and accept the same plain Ruby structures as the
+  # json gem (string keys, arrays, scalars), so this module is a
+  # drop-in surface; call sites rescue the module's error classes
+  # instead of JSON::ParserError and JSON::GeneratorError.
+  module JSON
+    class Error < StandardError; end
+    class ParseError < Error; end
+    class DumpError < Error; end
+
+    class << self
+      def parse(source)
+        unless source.is_a?(String)
+          raise ParseError,
+                "cannot parse #{source.class}"
+        end
+
+        Yeptris::JSON.load(source)
+      rescue Yeptris::Error, TypeError => e
+        raise ParseError, e.message
+      end
+
+      def dump(object)
+        Yeptris::JSON.dump(object)
+      rescue Yeptris::Error, TypeError => e
+        raise DumpError, e.message
+      end
+
+      # Two-space-indented JSON for human-facing CLI output; yeptris's
+      # generator is compact-only, so the indentation is applied here
+      def pretty(object)
+        pretty_value(object, 0)
+      end
+
+      private
+
+      def pretty_value(value, depth)
+        case value
+        when Hash then pretty_object(value, depth)
+        when Array then pretty_array(value, depth)
+        else dump(value)
+        end
+      end
+
+      def pretty_object(hash, depth)
+        return "{}" if hash.empty?
+
+        inner = hash.map do |key, value|
+          "#{indent(depth + 1)}#{dump(key.to_s)}: #{pretty_value(value,
+                                                                 depth + 1)}"
+        end
+
+        "{\n#{inner.join(",\n")}\n#{indent(depth)}}"
+      end
+
+      def pretty_array(array, depth)
+        return "[]" if array.empty?
+
+        inner = array.map do |value|
+          "#{indent(depth + 1)}#{pretty_value(value, depth + 1)}"
+        end
+
+        "[\n#{inner.join(",\n")}\n#{indent(depth)}]"
+      end
+
+      def indent(depth)
+        "  " * depth
+      end
+    end
+  end
+end

data/lib/fontist/manifest.rb

@@ -18,6 +18,12 @@ module Fontist
     # Collection options
     attribute :collection_index, :integer
 
+    # Font operations (subsetting, conversion failure handling)
+    attribute :subset_unicodes, :string
+    attribute :subset_text, :string
+    attribute :fallback_to_original, :boolean, default: false
+    attribute :instance, :string
+
     # Build FormatSpec from attributes
     def format_spec
       FormatSpec.new(
@@ -27,6 +33,10 @@ module Fontist
         transcode_path: transcode_path,
         keep_original: keep_original,
         collection_index: collection_index,
+        subset_unicodes: subset_unicodes,
+        subset_text: subset_text,
+        fallback_to_original: fallback_to_original,
+        instance: instance,
       )
     end
 
@@ -129,6 +139,57 @@ module Fontist
       }
     end
 
+    # Font options a manifest entry can carry next to its styles:
+    #
+    #   Roboto:
+    #     styles: [Regular, Bold]
+    #     format: woff2
+    #
+    # The plain form `Roboto: [Regular, Bold]` stays valid.
+    FONT_OPTIONS = %w[format variable_axes prefer_variable transcode_path
+                      keep_original collection_index subset_unicodes
+                      subset_text fallback_to_original instance].freeze
+
+    def self.from_yaml(content, options = {})
+      data = YAML.safe_load(content)
+      return super unless data.is_a?(Hash) && data.values.any?(Hash)
+
+      plain, font_options = split_font_options(data)
+      super(plain.to_yaml, options).tap do |manifest|
+        manifest.apply_font_options(font_options)
+      end
+    end
+
+    def self.split_font_options(data)
+      font_options = {}
+      plain = data.to_h do |name, value|
+        next [name, value] unless value.is_a?(Hash)
+
+        font_options[name] = font_options_of(name, value)
+        [name, value["styles"] || value[:styles]]
+      end
+      [plain, font_options]
+    end
+
+    def self.font_options_of(name, value)
+      value = value.transform_keys(&:to_s)
+      unknown = value.keys - FONT_OPTIONS - ["styles"]
+      unless unknown.empty?
+        raise Fontist::Errors::ManifestCouldNotBeReadError,
+              "Unknown option(s) for '#{name}': #{unknown.join(', ')}"
+      end
+
+      value.slice(*FONT_OPTIONS)
+    end
+
+    def apply_font_options(font_options)
+      Array(fonts).each do |font|
+        font_options.fetch(font.name, {}).each do |key, value|
+          font.public_send(:"#{key}=", value)
+        end
+      end
+    end
+
     def self.from_file(path, locations: false)
       Fontist.ui.debug("Manifest: #{path}")
 
@@ -159,8 +220,10 @@ module Fontist
 
     def self.from_hash(data, options = {})
       locations = options.delete(:locations) || false
+      data, font_options = split_font_options(data) if data.is_a?(Hash)
 
       model = super
+      model.apply_font_options(font_options) if font_options
 
       # Use performance optimizations for faster manifest compilation
       with_performance_optimizations do

data/lib/fontist/resource.rb

@@ -6,7 +6,12 @@ module Fontist
     attribute :name, :string
     attribute :source, :string
     attribute :urls, :string, collection: true
-    attribute :sha256, :string, collection: true
+    # Declared scalar: the corpus writes one digest per resource almost
+    # everywhere, and consumers render it verbatim. A handful of
+    # resources pair one digest with each mirror URL and write a list;
+    # a scalar-typed attribute keeps both forms as written instead of
+    # normalizing every single digest into a one-element Array.
+    attribute :sha256, :string
     attribute :file_size, :integer
     attribute :family, :string
     attribute :files, :string, collection: true

data/lib/fontist/validate_cli.rb

@@ -189,7 +189,7 @@ module Fontist
 
     def output_json_report(report, output_file)
       require "json"
-      json_content = JSON.pretty_generate(report.to_hash)
+      json_content = Fontist::JSON.pretty(report.to_hash)
 
       if output_file
         File.write(output_file, json_content)

data/lib/fontist/version.rb

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

data/lib/fontist/yaml_backend.rb

@@ -14,13 +14,26 @@ module Fontist
     ENABLED_VALUE = "yeptris"
 
     class << self
-      # Returns the activated adapter class, or nil when the standard
-      # engine stays in place (flag unset, or yeptris unavailable)
+      # Pins the YAML adapter explicitly: lutaml-model auto-selects
+      # yeptris for a format whenever the yeptris gem is in the bundle,
+      # which would silently switch YAML parsing and dumping (and its
+      # line-wrap behavior) for every model in the process. The yeptris
+      # YAML engine activates only when explicitly enabled with
+      # FONTIST_YAML=yeptris; otherwise the standard Psych engine is
+      # pinned, because the yeptris x86_64-linux and Windows builds
+      # currently mis-parse some plain scalars as single-element Arrays
+      # (leptris/yeptris#863). Flip the default once that parity fix
+      # lands.
+      #
+      # Returns the activated adapter class.
       def activate!
-        return nil unless enabled?
-        return nil unless yeptris_available?
+        adapter =
+          if enabled? && yeptris_available?
+            Yaml::YeptrisAdapter
+          else
+            Lutaml::Yaml::Adapter::StandardAdapter
+          end
 
-        adapter = Yaml::YeptrisAdapter
         Lutaml::Model::AdapterResolver.set_adapter_class(:yaml, adapter)
 
         adapter

data/lib/fontist.rb

@@ -17,6 +17,8 @@ require_relative "fontist/yaml_backend"
 module Fontist
   # Core classes
   autoload :Config, "#{__dir__}/fontist/config"
+  autoload :Css, "#{__dir__}/fontist/css"
+  autoload :JSON, "#{__dir__}/fontist/json"
   autoload :Font, "#{__dir__}/fontist/font"
   autoload :FontCollection, "#{__dir__}/fontist/font_collection"
   autoload :FontFile, "#{__dir__}/fontist/font_file"
@@ -25,6 +27,7 @@ module Fontist
   autoload :FontPath, "#{__dir__}/fontist/font_path"
   autoload :FontStyle, "#{__dir__}/fontist/font_style"
   autoload :Fontconfig, "#{__dir__}/fontist/fontconfig"
+  autoload :FontOperations, "#{__dir__}/fontist/font_operations"
   autoload :FormatSpec, "#{__dir__}/fontist/format_spec"
   autoload :Formula, "#{__dir__}/fontist/formula"
   autoload :FormulaCollection, "#{__dir__}/fontist/formula"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.28
+  version: 3.0.30
 platform: ruby
 authors:
 - Ribose Inc.
@@ -53,7 +53,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.4.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.4.47
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +343,10 @@ files:
 - lib/fontist/collection_file.rb
 - lib/fontist/config.rb
 - lib/fontist/config_cli.rb
+- lib/fontist/css.rb
+- lib/fontist/css/google_family.rb
+- lib/fontist/css/local.rb
+- lib/fontist/css/styles.rb
 - lib/fontist/errors.rb
 - lib/fontist/exclude.yml
 - lib/fontist/extract.rb
@@ -366,6 +356,12 @@ files:
 - lib/fontist/font_finder.rb
 - lib/fontist/font_installer.rb
 - lib/fontist/font_model.rb
+- lib/fontist/font_operations.rb
+- lib/fontist/font_operations/convert.rb
+- lib/fontist/font_operations/extract.rb
+- lib/fontist/font_operations/instance.rb
+- lib/fontist/font_operations/pack.rb
+- lib/fontist/font_operations/subset.rb
 - lib/fontist/font_path.rb
 - lib/fontist/font_style.rb
 - lib/fontist/fontconfig.rb
@@ -414,6 +410,7 @@ files:
 - lib/fontist/import/google/models/font_variant.rb
 - lib/fontist/import/google/models/metadata.rb
 - lib/fontist/import/google/models/source_metadata.rb
+- lib/fontist/import/google/variable_font_source.rb
 - lib/fontist/import/google_fonts_importer.rb
 - lib/fontist/import/google_import.rb
 - lib/fontist/import/helpers.rb
@@ -462,6 +459,7 @@ files:
 - lib/fontist/install_locations/fontist_location.rb
 - lib/fontist/install_locations/system_location.rb
 - lib/fontist/install_locations/user_location.rb
+- lib/fontist/json.rb
 - lib/fontist/macos.rb
 - lib/fontist/macos/catalog.rb
 - lib/fontist/macos/catalog/asset.rb