lib/fontist/import/otf/font_file.rb in fontist-1.9.3 vs lib/fontist/import/otf/font_file.rb in fontist-1.10.0
- old
+ new
@@ -8,11 +8,12 @@
class FontFile
REQUIREMENTS = {
otfinfo: Otfinfo::OtfinfoRequirement.new,
}.freeze
- STYLE_ATTRIBUTES = %i[family_name type full_name post_script_name
+ STYLE_ATTRIBUTES = %i[family_name type preferred_family_name
+ preferred_type full_name post_script_name
version description copyright font
source_font].freeze
COLLECTION_ATTRIBUTES = STYLE_ATTRIBUTES.reject do |a|
%i[font source_font].include?(a)
@@ -33,14 +34,22 @@
def to_collection_style
COLLECTION_ATTRIBUTES.map { |name| [name, send(name)] }.to_h.compact
end
def family_name
- info["Preferred family"] || info["Family"]
+ info["Family"]
end
def type
- info["Preferred subfamily"] || info["Subfamily"]
+ info["Subfamily"]
+ end
+
+ def preferred_family_name
+ info["Preferred family"]
+ end
+
+ def preferred_type
+ info["Preferred subfamily"]
end
def full_name
info["Full name"]
end