lib/fontist/import/create_formula.rb in fontist-1.5.0 vs lib/fontist/import/create_formula.rb in fontist-1.5.1

@@ -6,13 +6,13 @@
 require_relative "formula_builder"
 
 module Fontist
   module Import
     class CreateFormula
-      FONT_PATTERN = /(\.ttf|\.otf)$/i.freeze
-      FONT_COLLECTION_PATTERN = /\.ttc$/i.freeze
-      LICENSE_PATTERN = /(OFL\.txt|UFL\.txt|LICENSE\.txt)$/i.freeze
+      FONT_PATTERN = /(\.ttf|\.otf)/i.freeze
+      FONT_COLLECTION_PATTERN = /\.ttc/i.freeze
+      LICENSE_PATTERN = /(OFL\.txt|UFL\.txt|LICENSE\.txt|COPYING)$/i.freeze
 
       def initialize(url, options = {})
         @url = url
         @options = options
       end
@@ -40,10 +40,10 @@
 
         Fontist::Utils::Downloader.download(url, progress_bar: true).path
       end
 
       def extractor(archive)
-        RecursiveExtraction.new(archive)
+        RecursiveExtraction.new(archive, subarchive: @options[:subarchive])
       end
 
       def font_files(extractor)
         extractor.extract(FONT_PATTERN) do |path|
           Otf::FontFile.new(path)