prawn-emoji 3.3.0 → 5.0.0

data/lib/prawn/emoji/drawable.rb

@@ -5,9 +5,16 @@ require_relative 'drawer'
 module Prawn
   module Emoji
     module Drawable
+      # == Additional Options
+      # <tt>:emoji</tt>:: <tt>boolean</tt>. Whether or not to draw an emoji [true]
       def draw_text!(text, options)
-        text_without_emoji = emoji_drawer.draw(text.to_s, options)
-        super text_without_emoji, options
+        draw_emoji = options.delete(:emoji) { true }
+
+        if draw_emoji && Emoji::Drawer.drawable?(text)
+          emoji_drawer.draw(text.to_s, options)
+        else
+          super
+        end
       end
 
       private

data/lib/prawn/emoji/drawer.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'substitution'
 require_relative 'index'
 require_relative 'image'
 require_relative 'text'
@@ -8,58 +7,56 @@ require_relative 'text'
 module Prawn
   module Emoji
     class Drawer
+      def self.drawable?(text)
+        text.encoding == ::Encoding::UTF_8 && Emoji.regex.match?(text)
+      end
+
       def initialize(document)
         @document = document
         @emoji_index = Emoji::Index.new
       end
 
       def draw(text, text_options)
-        return text unless text.encoding == ::Encoding::UTF_8
-        return text unless Emoji.regex.match?(text)
+        cursor_x, cursor_y = text_options[:at]
 
-        result = []
-        target = Emoji::Text.new(text)
+        emoji_text = Emoji::Text.new(text, document.font_size)
 
-        while target.contains_emoji? do
-          if emoji_index.include?(target.emoji.codepoint)
-            draw_emoji(
-              target,
-              text_options: text_options,
-              base_text: result.join
-            )
-            result << target.left + Emoji::Substitution.new(@document).to_s
+        while emoji_text.contains_emoji? do
+          if emoji_index.include?(emoji_text.emoji_char.codepoint)
+            cursor_x += draw_text(emoji_text.left, at: [cursor_x, cursor_y], text_options: text_options)
+            cursor_x += draw_emoji(emoji_text.emoji_char, at: [cursor_x, cursor_y])
           else
-            result << target.left_with_emoji
+            cursor_x += draw_text(emoji_text.left_with_emoji, at: [cursor_x, cursor_y], text_options: text_options)
           end
 
-          target = Emoji::Text.new(target.remaining)
+          emoji_text = Emoji::Text.new(emoji_text.remaining, document.font_size)
         end
 
-        result.join + target.to_s
+        draw_text!(emoji_text.to_s, at: [cursor_x, cursor_y], text_options: text_options)
       end
 
       private
 
-      attr_reader :emoji_index
+      attr_reader :emoji_index, :document
+
+      def draw_text!(text, at:, text_options:)
+        document.draw_text!(text, text_options.merge(emoji: false, at: at))
+      end
 
-      def draw_emoji(text, text_options:, base_text:)
-        image = Emoji::Image.new(text.emoji, @document.font_size)
+      def draw_text(text, at:, text_options:)
+        draw_text!(text, at: at, text_options: text_options)
 
-        base_x, base_y = text_options[:at]
+        width = document.width_of(text, text_options)
+        # In prawn v2.3.0, the character spacing at the end of the text is not included in the calculated text width.
+        # https://github.com/prawnpdf/prawn/pull/1117
+        width > 0 ? width + document.character_spacing : width
+      end
 
-        x = image.adjust_x(base_x + @document.width_of(base_text + text.left, text_options))
-        y = image.adjust_y(base_y)
+      def draw_emoji(emoji_char, at:)
+        emoji_image = Emoji::Image.new(emoji_char)
+        emoji_image.render(document, at: at)
 
-        # Prawn 2.2 does not close the image file when Pathname is passed to Document#image method.
-        #
-        # FIXME: This issue has been fixed by https://github.com/prawnpdf/prawn/pull/1090 but not released.
-        # Fix as follows after the PR released.
-        #
-        #   @document.image(image_file.path, at: [x, y], width: image.width)
-        #
-        File.open(image.path, 'rb') do |image_file|
-          @document.image(image_file, at: [x, y], width: image.width)
-        end
+        emoji_image.width + document.character_spacing
       end
     end
   end

data/lib/prawn/emoji/image.rb

@@ -1,35 +1,32 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require_relative 'unicode'
+require 'forwardable'
 
 module Prawn
   module Emoji
     class Image
+      extend Forwardable
+
       STORE = Emoji.root.join 'emoji', 'images'
 
-      attr_reader :unicode, :font_size
+      def_delegators :emoji_char, :width, :height
 
-      def initialize(unicode, font_size)
-        @unicode = unicode
-        @font_size = font_size
+      def initialize(emoji_char)
+        @emoji_char = emoji_char
       end
 
-      def path
-        STORE.join("#{unicode.codepoint}.png").to_s
+      def render(document, at:)
+        x, y = at
+        document.image(path, at: [x, y + height], width: width)
       end
 
-      def adjust_x(base_x)
-        base_x + (font_size - width) / 2
+      def path
+        STORE.join("#{emoji_char.codepoint}.png").to_s
       end
 
-      def adjust_y(base_y)
-        base_y + font_size * 0.8
-      end
+      private
 
-      def width
-        font_size * 0.85
-      end
+      attr_reader :emoji_char
     end
   end
 end

data/lib/prawn/emoji/index.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'unicode'
+require 'yaml'
 
 module Prawn
   module Emoji

data/lib/prawn/emoji/text.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
-require_relative 'unicode'
+require_relative 'char'
 
 module Prawn
   module Emoji
     class Text
-      attr_reader :left, :emoji, :remaining
+      attr_reader :left, :emoji_char, :remaining
 
-      def initialize(text)
-        @left, emoji_char, @remaining = partition_by_emoji(text)
-        @emoji = Emoji::Unicode.new(emoji_char) unless emoji_char.empty?
+      def initialize(text, font_size)
+        @text = text
+        @left, emoji, @remaining = partition_by_emoji(text)
+        @emoji_char = Emoji::Char.new(emoji, font_size) unless emoji.empty?
       end
 
       def contains_emoji?
-        !emoji.nil?
+        !emoji_char.nil?
       end
 
       def left_with_emoji
-        left + emoji.to_s
+        left + emoji_char.to_s
       end
 
       def to_s
-        left_with_emoji + remaining
+        @text
       end
 
       private

data/lib/prawn/emoji/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Emoji
-    VERSION = '3.3.0'
+    VERSION = '5.0.0'
   end
 end

data/prawn-emoji.gemspec

@@ -11,19 +11,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/hidakatsuya/prawn-emoji'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 2.6'
 
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^test/}) }
   end
   spec.require_path  = 'lib'
 
-  spec.add_runtime_dependency 'prawn', '~> 2.2.0'
-  spec.add_runtime_dependency 'unicode-emoji', '~> 2.5.0'
+  spec.add_runtime_dependency 'prawn', '~> 2.3'
+  spec.add_runtime_dependency 'unicode-emoji', '~> 2.8.0'
 
-  spec.add_development_dependency 'bundler', '>= 1.0.0'
-  spec.add_development_dependency 'rake', '>= 0'
-  spec.add_development_dependency 'minitest', '>= 5.12.2'
-  spec.add_development_dependency 'rr', '>= 0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit', '>= 3.3.9'
+  spec.add_development_dependency 'test-unit-rr', '>= 1.0.5'
   spec.add_development_dependency 'rubyzip', '>= 1.0.0'
+  spec.add_development_dependency 'pdf_matcher-testing', '>= 1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-emoji
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Katsuya HIDAKA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -16,86 +16,86 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.9
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.12.2
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.12.2
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: pdf_matcher-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,7 +114,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -1018,6 +1018,16 @@ files:
 - emoji/images/1f468-1f3fb-200d-2695.png
 - emoji/images/1f468-1f3fb-200d-2696.png
 - emoji/images/1f468-1f3fb-200d-2708.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
 - emoji/images/1f468-1f3fb.png
 - emoji/images/1f468-1f3fc-200d-1f33e.png
 - emoji/images/1f468-1f3fc-200d-1f373.png
@@ -1048,6 +1058,16 @@ files:
 - emoji/images/1f468-1f3fc-200d-2695.png
 - emoji/images/1f468-1f3fc-200d-2696.png
 - emoji/images/1f468-1f3fc-200d-2708.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
 - emoji/images/1f468-1f3fc.png
 - emoji/images/1f468-1f3fd-200d-1f33e.png
 - emoji/images/1f468-1f3fd-200d-1f373.png
@@ -1078,6 +1098,16 @@ files:
 - emoji/images/1f468-1f3fd-200d-2695.png
 - emoji/images/1f468-1f3fd-200d-2696.png
 - emoji/images/1f468-1f3fd-200d-2708.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
 - emoji/images/1f468-1f3fd.png
 - emoji/images/1f468-1f3fe-200d-1f33e.png
 - emoji/images/1f468-1f3fe-200d-1f373.png
@@ -1108,6 +1138,16 @@ files:
 - emoji/images/1f468-1f3fe-200d-2695.png
 - emoji/images/1f468-1f3fe-200d-2696.png
 - emoji/images/1f468-1f3fe-200d-2708.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
 - emoji/images/1f468-1f3fe.png
 - emoji/images/1f468-1f3ff-200d-1f33e.png
 - emoji/images/1f468-1f3ff-200d-1f373.png
@@ -1138,6 +1178,16 @@ files:
 - emoji/images/1f468-1f3ff-200d-2695.png
 - emoji/images/1f468-1f3ff-200d-2696.png
 - emoji/images/1f468-1f3ff-200d-2708.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f468-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
 - emoji/images/1f468-1f3ff.png
 - emoji/images/1f468-200d-1f33e.png
 - emoji/images/1f468-200d-1f373.png
@@ -1215,6 +1265,26 @@ files:
 - emoji/images/1f469-1f3fb-200d-2695.png
 - emoji/images/1f469-1f3fb-200d-2696.png
 - emoji/images/1f469-1f3fb-200d-2708.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f469-1f3ff.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fb-200d-2764-200d-1f48b-200d-1f469-1f3ff.png
 - emoji/images/1f469-1f3fb.png
 - emoji/images/1f469-1f3fc-200d-1f33e.png
 - emoji/images/1f469-1f3fc-200d-1f373.png
@@ -1249,6 +1319,26 @@ files:
 - emoji/images/1f469-1f3fc-200d-2695.png
 - emoji/images/1f469-1f3fc-200d-2696.png
 - emoji/images/1f469-1f3fc-200d-2708.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f469-1f3ff.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fc-200d-2764-200d-1f48b-200d-1f469-1f3ff.png
 - emoji/images/1f469-1f3fc.png
 - emoji/images/1f469-1f3fd-200d-1f33e.png
 - emoji/images/1f469-1f3fd-200d-1f373.png
@@ -1283,6 +1373,26 @@ files:
 - emoji/images/1f469-1f3fd-200d-2695.png
 - emoji/images/1f469-1f3fd-200d-2696.png
 - emoji/images/1f469-1f3fd-200d-2708.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f469-1f3ff.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fd-200d-2764-200d-1f48b-200d-1f469-1f3ff.png
 - emoji/images/1f469-1f3fd.png
 - emoji/images/1f469-1f3fe-200d-1f33e.png
 - emoji/images/1f469-1f3fe-200d-1f373.png
@@ -1317,6 +1427,26 @@ files:
 - emoji/images/1f469-1f3fe-200d-2695.png
 - emoji/images/1f469-1f3fe-200d-2696.png
 - emoji/images/1f469-1f3fe-200d-2708.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f469-1f3ff.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3fe-200d-2764-200d-1f48b-200d-1f469-1f3ff.png
 - emoji/images/1f469-1f3fe.png
 - emoji/images/1f469-1f3ff-200d-1f33e.png
 - emoji/images/1f469-1f3ff-200d-1f373.png
@@ -1351,6 +1481,26 @@ files:
 - emoji/images/1f469-1f3ff-200d-2695.png
 - emoji/images/1f469-1f3ff-200d-2696.png
 - emoji/images/1f469-1f3ff-200d-2708.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f469-1f3ff.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fb.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fc.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fd.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3fe.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f468-1f3ff.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f469-1f3fb.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f469-1f3fc.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f469-1f3fd.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f469-1f3fe.png
+- emoji/images/1f469-1f3ff-200d-2764-200d-1f48b-200d-1f469-1f3ff.png
 - emoji/images/1f469-1f3ff.png
 - emoji/images/1f469-200d-1f33e.png
 - emoji/images/1f469-200d-1f373.png
@@ -1639,8 +1789,18 @@ files:
 - emoji/images/1f48c.png
 - emoji/images/1f48d.png
 - emoji/images/1f48e.png
+- emoji/images/1f48f-1f3fb.png
+- emoji/images/1f48f-1f3fc.png
+- emoji/images/1f48f-1f3fd.png
+- emoji/images/1f48f-1f3fe.png
+- emoji/images/1f48f-1f3ff.png
 - emoji/images/1f48f.png
 - emoji/images/1f490.png
+- emoji/images/1f491-1f3fb.png
+- emoji/images/1f491-1f3fc.png
+- emoji/images/1f491-1f3fd.png
+- emoji/images/1f491-1f3fe.png
+- emoji/images/1f491-1f3ff.png
 - emoji/images/1f491.png
 - emoji/images/1f492.png
 - emoji/images/1f493.png
@@ -1992,6 +2152,7 @@ files:
 - emoji/images/1f62b.png
 - emoji/images/1f62c.png
 - emoji/images/1f62d.png
+- emoji/images/1f62e-200d-1f4a8.png
 - emoji/images/1f62e.png
 - emoji/images/1f62f.png
 - emoji/images/1f630.png
@@ -1999,7 +2160,9 @@ files:
 - emoji/images/1f632.png
 - emoji/images/1f633.png
 - emoji/images/1f634.png
+- emoji/images/1f635-200d-1f4ab.png
 - emoji/images/1f635.png
+- emoji/images/1f636-200d-1f32b.png
 - emoji/images/1f636.png
 - emoji/images/1f637.png
 - emoji/images/1f638.png
@@ -2853,6 +3016,14 @@ files:
 - emoji/images/1f9d1-1f3fb-200d-2695.png
 - emoji/images/1f9d1-1f3fb-200d-2696.png
 - emoji/images/1f9d1-1f3fb-200d-2708.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f48b-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f48b-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f48b-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f48b-200d-1f9d1-1f3ff.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fb-200d-2764-200d-1f9d1-1f3ff.png
 - emoji/images/1f9d1-1f3fb.png
 - emoji/images/1f9d1-1f3fc-200d-1f33e.png
 - emoji/images/1f9d1-1f3fc-200d-1f373.png
@@ -2884,6 +3055,14 @@ files:
 - emoji/images/1f9d1-1f3fc-200d-2695.png
 - emoji/images/1f9d1-1f3fc-200d-2696.png
 - emoji/images/1f9d1-1f3fc-200d-2708.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f48b-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f48b-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f48b-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f48b-200d-1f9d1-1f3ff.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fc-200d-2764-200d-1f9d1-1f3ff.png
 - emoji/images/1f9d1-1f3fc.png
 - emoji/images/1f9d1-1f3fd-200d-1f33e.png
 - emoji/images/1f9d1-1f3fd-200d-1f373.png
@@ -2915,6 +3094,14 @@ files:
 - emoji/images/1f9d1-1f3fd-200d-2695.png
 - emoji/images/1f9d1-1f3fd-200d-2696.png
 - emoji/images/1f9d1-1f3fd-200d-2708.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f48b-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f48b-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f48b-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f48b-200d-1f9d1-1f3ff.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3fd-200d-2764-200d-1f9d1-1f3ff.png
 - emoji/images/1f9d1-1f3fd.png
 - emoji/images/1f9d1-1f3fe-200d-1f33e.png
 - emoji/images/1f9d1-1f3fe-200d-1f373.png
@@ -2946,6 +3133,14 @@ files:
 - emoji/images/1f9d1-1f3fe-200d-2695.png
 - emoji/images/1f9d1-1f3fe-200d-2696.png
 - emoji/images/1f9d1-1f3fe-200d-2708.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f48b-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f48b-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f48b-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f48b-200d-1f9d1-1f3ff.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3fe-200d-2764-200d-1f9d1-1f3ff.png
 - emoji/images/1f9d1-1f3fe.png
 - emoji/images/1f9d1-1f3ff-200d-1f33e.png
 - emoji/images/1f9d1-1f3ff-200d-1f373.png
@@ -2977,6 +3172,14 @@ files:
 - emoji/images/1f9d1-1f3ff-200d-2695.png
 - emoji/images/1f9d1-1f3ff-200d-2696.png
 - emoji/images/1f9d1-1f3ff-200d-2708.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f48b-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f48b-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f48b-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f48b-200d-1f9d1-1f3fe.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f9d1-1f3fb.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f9d1-1f3fc.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f9d1-1f3fd.png
+- emoji/images/1f9d1-1f3ff-200d-2764-200d-1f9d1-1f3fe.png
 - emoji/images/1f9d1-1f3ff.png
 - emoji/images/1f9d1-200d-1f33e.png
 - emoji/images/1f9d1-200d-1f373.png
@@ -3017,11 +3220,23 @@ files:
 - emoji/images/1f9d3-1f3fe.png
 - emoji/images/1f9d3-1f3ff.png
 - emoji/images/1f9d3.png
+- emoji/images/1f9d4-1f3fb-200d-2640.png
+- emoji/images/1f9d4-1f3fb-200d-2642.png
 - emoji/images/1f9d4-1f3fb.png
+- emoji/images/1f9d4-1f3fc-200d-2640.png
+- emoji/images/1f9d4-1f3fc-200d-2642.png
 - emoji/images/1f9d4-1f3fc.png
+- emoji/images/1f9d4-1f3fd-200d-2640.png
+- emoji/images/1f9d4-1f3fd-200d-2642.png
 - emoji/images/1f9d4-1f3fd.png
+- emoji/images/1f9d4-1f3fe-200d-2640.png
+- emoji/images/1f9d4-1f3fe-200d-2642.png
 - emoji/images/1f9d4-1f3fe.png
+- emoji/images/1f9d4-1f3ff-200d-2640.png
+- emoji/images/1f9d4-1f3ff-200d-2642.png
 - emoji/images/1f9d4-1f3ff.png
+- emoji/images/1f9d4-200d-2640.png
+- emoji/images/1f9d4-200d-2642.png
 - emoji/images/1f9d4.png
 - emoji/images/1f9d5-1f3fb.png
 - emoji/images/1f9d5-1f3fc.png
@@ -3463,6 +3678,8 @@ files:
 - emoji/images/2755.png
 - emoji/images/2757.png
 - emoji/images/2763.png
+- emoji/images/2764-200d-1f525.png
+- emoji/images/2764-200d-1fa79.png
 - emoji/images/2764.png
 - emoji/images/2795.png
 - emoji/images/2796.png
@@ -3485,21 +3702,22 @@ files:
 - emoji/images/3299.png
 - emoji/images/e50a.png
 - emoji/index.yml
+- gemfiles/prawn-2.3.gemfile
+- gemfiles/prawn-2.4.gemfile
 - lib/prawn/emoji.rb
+- lib/prawn/emoji/char.rb
 - lib/prawn/emoji/drawable.rb
 - lib/prawn/emoji/drawer.rb
 - lib/prawn/emoji/image.rb
 - lib/prawn/emoji/index.rb
-- lib/prawn/emoji/substitution.rb
 - lib/prawn/emoji/text.rb
-- lib/prawn/emoji/unicode.rb
 - lib/prawn/emoji/version.rb
 - prawn-emoji.gemspec
 homepage: https://github.com/hidakatsuya/prawn-emoji
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -3507,15 +3725,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Adds Emoji support to Prawn
 test_files: []