fontist 3.0.28 → 3.0.29

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/version.rb

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

data/lib/fontist.rb

@@ -17,6 +17,7 @@ require_relative "fontist/yaml_backend"
 module Fontist
   # Core classes
   autoload :Config, "#{__dir__}/fontist/config"
+  autoload :Css, "#{__dir__}/fontist/css"
   autoload :Font, "#{__dir__}/fontist/font"
   autoload :FontCollection, "#{__dir__}/fontist/font_collection"
   autoload :FontFile, "#{__dir__}/fontist/font_file"
@@ -25,6 +26,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.29
 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
@@ -357,6 +357,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 +370,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 +424,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