[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@b70b2b3 [master] poppler: add Poppler::Page#get_text again

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-08-09 09:56:43 +0900 (Wed, 09 Aug 2017)

  New Revision: b70b2b3b97820b779661e3746a2d095917ea0ac7
  https://github.com/ruby-gnome2/ruby-gnome2/commit/b70b2b3b97820b779661e3746a2d095917ea0ac7

  Message:
    poppler: add Poppler::Page#get_text again

  Modified files:
    poppler/lib/poppler/deprecated.rb
    poppler/lib/poppler/page.rb

  Modified: poppler/lib/poppler/deprecated.rb (+7 -0)
===================================================================
--- poppler/lib/poppler/deprecated.rb    2017-08-09 09:57:03 +0900 (779c8a440)
+++ poppler/lib/poppler/deprecated.rb    2017-08-09 09:56:43 +0900 (3b2eac3d3)
@@ -56,5 +56,12 @@ module Poppler
     extend GLib::Deprecatable
 
     define_deprecated_method(:annotation_mapping, :annot_mapping)
+    define_deprecated_method_by_hash_args(:get_text,
+                                          "area=nil, style=nil",
+                                          ":area => Poppler::Rectangle, " +
+                                          ":style => Poppler::SelectionStyle"
+                                          ) do |page, *args, &block|
+      [{:area => args[0], :style => args[1]}]
+    end
   end
 end

  Modified: poppler/lib/poppler/page.rb (+14 -0)
===================================================================
--- poppler/lib/poppler/page.rb    2017-08-09 09:57:03 +0900 (60059c7ae)
+++ poppler/lib/poppler/page.rb    2017-08-09 09:56:43 +0900 (ba0cb508a)
@@ -34,5 +34,19 @@ module Poppler
       end
       mappings
     end
+
+    def get_text(options={})
+      area = options[:area]
+      style = options[:style]
+      if area
+        if style
+          get_selected_text(style, area)
+        else
+          get_text_for_area(area)
+        end
+      else
+        text
+      end
+    end
   end
 end