lib/fontist/import/formula_builder.rb in fontist-1.6.0 vs lib/fontist/import/formula_builder.rb in fontist-1.7.0
- old
+ new
@@ -105,11 +105,14 @@
def font_collections
return if @font_collection_files.empty?
collections = @font_collection_files.map do |file|
fonts = fonts_from_files(file.fonts, :to_collection_style)
- { filename: file.filename, fonts: fonts }
+
+ { filename: file.filename,
+ source_filename: file.source_filename,
+ fonts: fonts }.compact
end
collections.sort_by do |x|
x[:filename]
end
@@ -150,11 +153,12 @@
unless @license_text
Fontist.ui.error("WARN: please add license manually")
return
end
- Fontist.ui.error("WARN: ensure it's an open license, otherwise change \
- to 'requires_license_agreement'")
+ Fontist.ui.error("WARN: ensure it's an open license, otherwise " \
+ "change the 'open_license' attribute to " \
+ "'requires_license_agreement'")
TextHelper.cleanup(@license_text)
end
end
end