rabbit 2.1.2 → 2.1.3

data/lib/rabbit/image-data-loader.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2014  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "gdk_pixbuf2"
+
+module Rabbit
+  class ImageDataLoader
+    attr_reader :width, :height, :pixbuf
+    def initialize(data)
+      @width = 0
+      @height = 0
+      @pixbuf = nil
+      @data = data
+    end
+
+    def load
+      loader = Gdk::PixbufLoader.new
+      id = loader.signal_connect("size_prepared") do |l, width, height|
+        @width = width
+        @height = height
+      end
+      begin
+        loader.last_write(@data)
+      rescue Gdk::PixbufError => error
+        loader.close rescue Gdk::PixbufError
+        raise ImageLoadError.new(error.message)
+      end
+      loader.signal_handler_disconnect(id)
+      @pixbuf = loader.pixbuf
+      @pixbuf
+    end
+  end
+end

data/lib/rabbit/image/base.rb

@@ -1,6 +1,7 @@
 require "gdk_pixbuf2"
 
 require "rabbit/utils"
+require "rabbit/image-data-loader"
 
 module Rabbit
   module ImageManipulable
@@ -84,20 +85,17 @@ module Rabbit
         key.to_s.gsub(/-/, "_")
       end
 
-      def load_by_pixbuf_loader(data)
-        loader = Gdk::PixbufLoader.new
-        id = loader.signal_connect("size_prepared") do |l, width, height|
-          @width = width
-          @height = height
-        end
+      def load_data(data)
+        loader = ImageDataLoader.new(data)
         begin
-          loader.last_write(data)
-        rescue Gdk::PixbufError
-          loader.close rescue Gdk::PixbufError
+          loader.load
+        rescue ImageLoadError
           raise ImageLoadError.new("#{@filename}: #{$!.message}")
         end
-        loader.signal_handler_disconnect(id)
-        loader
+
+        @width = loader.width
+        @height = loader.height
+        loader.pixbuf
       end
     end
   end

data/lib/rabbit/image/default.rb

@@ -17,8 +17,7 @@ module Rabbit
       def update_size
         File.open(@filename, "rb") do |file|
           Dir.chdir(File.dirname(@filename)) do
-            loader = load_by_pixbuf_loader(file.read)
-            @pixbuf = loader.pixbuf
+            @pixbuf = load_data(file.read)
           end
         end
       end

data/lib/rabbit/image/eps.rb

@@ -34,7 +34,7 @@ module Rabbit
 
       private
       def update_size
-        @pixbuf = load_image.pixbuf
+        @pixbuf = load_image
       end
 
       def load_image(width=nil, height=nil)
@@ -43,7 +43,7 @@ module Rabbit
                rescue EPSCanNotHandleError
                  eps_to_pnm(width, height)
                end
-        load_by_pixbuf_loader(data)
+        load_data(data)
       end
       
       def eps_to_png(width=nil, height=nil)

data/lib/rabbit/image/gimp.rb

@@ -41,8 +41,7 @@ EOC
         if GIMP_COMMANDS.any? {|gimp| run(gimp, *args); File.exist?(png_path)}
           png_file.open
           png_file.binmode
-          loader = load_by_pixbuf_loader(png_file.read)
-          @pixbuf = loader.pixbuf
+          @pixbuf = load_data(png_file.read)
         else
           raise GIMPCanNotHandleError.new("gimp #{args.join(' ')}",
                                           GIMP_COMMANDS)

data/lib/rabbit/image/pdf.rb

@@ -2,6 +2,7 @@ require "rabbit/utils"
 
 Rabbit::Utils.require_safe "poppler"
 
+require "rabbit/gettext"
 require "rabbit/image/base"
 
 module Rabbit

data/lib/rabbit/info-window.rb

@@ -1,5 +1,6 @@
 require 'erb'
 
+require 'rabbit/gtk'
 require 'rabbit/dependency-canvas'
 require 'rabbit/renderer/display/drawing-area-view-only'
 require 'rabbit/renderer/display/hook-handler'
@@ -22,7 +23,8 @@ module Rabbit
     def initialize(canvas)
       @canvas = canvas
       @window = nil
-      @timer_started = false
+      @timer_id = nil
+      @note_area = nil
       init_hook_handler
       init_key_handler
       init_button_handler
@@ -48,7 +50,8 @@ module Rabbit
       @window.destroy
       @window = @window_destroy_id = nil
       @canvas_widgets = @outer_box = nil
-      @timer_started = false
+      GLib::Source.remove(@timer_id) if @timer_id
+      @timer_id = nil
       @previous_canvas = @current_canvas = @next_canvas = nil
     end
 
@@ -148,7 +151,7 @@ module Rabbit
 
     def init_widgets_on_note_mode(width, height)
       init_timer_label(width * (1.0 / 5.0), height * (2.0 / 5.0))
-      init_note_text(width * (5.0 / 5.0), height * (3.0 / 5.0))
+      init_note_area
       @outer_box = Gtk::VBox.new
 
       current_box = Gtk::HBox.new
@@ -168,8 +171,8 @@ module Rabbit
       @outer_box.pack_start(current_box, false, false)
 
       bottom_box = Gtk::HBox.new
-      bottom_box.pack_start(@note_label, false, true, 20)
-      @outer_box.pack_start(bottom_box, true, false)
+      bottom_box.pack_start(@note_area, true, true, 20)
+      @outer_box.pack_start(bottom_box, true, true, 20)
 
       @outer_box.show
     end
@@ -184,34 +187,72 @@ module Rabbit
       @timer_label = Gtk::Label.new
       @timer_label.justify = :center
       @timer_label.markup = markupped_timer_label(width, height)
-      @timer_started = false
-      check_timer
     end
 
-    def init_note_text(width, height)
-      @note_label = Gtk::Label.new
-      @note_label.justify = :left
-      @note_label.wrap = true
-      @note_label.markup = markupped_note_text(width, height)
-      @note_label.set_size_request(width, height)
+    def init_note_area
+      @note_area = Gtk::DrawingArea.new
+      @note_area.signal_connect("expose-event") do |area, event|
+        draw_text_as_large_as_possible(area, note_text)
+        Gdk::Event::PROPAGATE
+      end
     end
 
     def update(index=nil)
-      check_timer
-      update_note_text if on_note_mode?
+      start_timer if @timer_id.nil?
+      @note_area.queue_draw if @note_area
       adjust_slide(index)
     end
 
-    def update_note_text
-      @note_label.markup = markupped_note_text
+    def note_text
+      note = @canvas.current_slide["note"]
+      return note if note.nil?
+      note.gsub(/\\n/, "\n")
     end
 
-    def check_timer
-      return if @timer_started
+    def draw_text_as_large_as_possible(area, markupped_text)
+      return if markupped_text.nil?
+
+      area_width, area_height = area.window.size
+
+      context = area.window.create_cairo_context
+      layout = context.create_pango_layout
+      layout.context.resolution = @canvas.font_resolution
+      attributes, text = Pango.parse_markup(markupped_text)
+      layout.text = text
+      layout.attributes = attributes
+      layout.width = area_width * Pango::SCALE
+      layout.wrap = :word_char
+      set_as_large_as_font_description(layout, area_height)
+
+      context.update_pango_layout(layout)
+      context.show_pango_layout(layout)
+    end
 
-      Gtk.timeout_add(1000) do
+    def set_as_large_as_font_description(layout, max_height)
+      family = "Sans"
+      size = 14
+      last_font_description = nil
+      loop do
+        font_description = Pango::FontDescription.new("#{family} #{size}")
+        layout.font_description = font_description
+        layout_height = layout.pixel_size[1]
+        break if layout_height > max_height
+        last_font_description = font_description
+        size = [size * 1.2, size + 5].min
+      end
+      last_font_description ||= Pango::FontDescription.new("#{family} #{size}")
+      layout.font_description = last_font_description
+    end
+
+    def start_timer
+      @timer_id = GLib::Timeout.add(1000) do
         @timer_label.markup = markupped_timer_label if showing?
-        @timer_started = (showing? and @canvas.rest_time)
+        if showing? and @canvas.rest_time
+          GLib::Source::CONTINUE
+        else
+          @timer_id = nil
+          GLib::Source::REMOVE
+        end
       end
     end
 

data/lib/rabbit/logger.rb

@@ -1,19 +1,35 @@
+# Copyright (C) 2004-2014  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require "rabbit/utils"
 
+require "rabbit/logger/stderr"
+require "rabbit/logger/gui"
+
 module Rabbit
   module Logger
     extend Utils
 
-    dir = ::File.join("rabbit", "logger")
-    require_files_under_directory_in_load_path(dir)
-
     class << self
       def types
         collect_classes_under_module(self)
       end
 
       def default
-        if Utils.support_console_output? or !Logger.const_defined?(:GUI)
+        if Utils.support_console_output?
           Logger::STDERR.new
         else
           Logger::GUI.new

data/lib/rabbit/logger/gui.rb

@@ -54,24 +54,21 @@ module Rabbit
           append("#{prog_name}: ", "prog_name")
         end
       end
-      
+
       def log_message(message)
-        unless GLib.utf8_validate(message)
-          message = GLib.filename_to_utf8(message)
-        end
         append(message, "message")
         append("\n")
       end
 
       def append(text, *tags)
         iter = @buffer.get_iter_at_offset(-1)
-        @buffer.insert_with_tags(iter, text, *tags)
+        @buffer.insert_with_tags(iter, text.encode("UTF-8"), *tags)
       end
 
       def title
         _("Rabbit Error Dialog")
       end
-      
+
       def init_dialog(width=@width, height=@height)
         flags = 0
         buttons = [
@@ -93,7 +90,7 @@ module Rabbit
           true
         end
       end
-      
+
       def set_dialog_response
         @dialog.signal_connect("response") do |widget, event|
           case event
@@ -112,7 +109,7 @@ module Rabbit
           false
         end
       end
-      
+
       def set_dialog_accel_group
         accel_group = Gtk::AccelGroup.new
         mod = Gdk::Window::ModifierType.new

data/lib/rabbit/logger/stderr.rb

@@ -1,4 +1,4 @@
-require 'glib2'
+require "glib2"
 
 require "rabbit/logger/base"
 
@@ -9,19 +9,15 @@ module Rabbit
 
       private
       def do_log(severity, prog_name, message)
-        # TODO: Remove me. It is workaround until Ruby/GLib2 2.0.3 is released.
-        if message.encoding == Encoding::ASCII_8BIT
-          message.force_encoding("UTF-8")
-        end
         begin
           message = message.encode("locale")
         rescue EncodingError
           format = _("can't convert to current locale from UTF-8: %s")
-          ::STDERR.puts(format % message)
+          $stderr.puts(format % message.encode(format.encoding))
         end
-        ::STDERR.puts(format_severity(severity))
-        ::STDERR.print("[#{prog_name}]: ") if prog_name
-        ::STDERR.puts(message)
+        $stderr.puts(format_severity(severity))
+        $stderr.print("[#{prog_name}]: ") if prog_name
+        $stderr.puts(message)
         exit if severity >= Severity::FATAL
       end
     end

data/lib/rabbit/parser/rd.rb

@@ -23,7 +23,7 @@ module Rabbit
             if head.respond_to?(:force_encoding)
               head.force_encoding("ASCII-8BIT")
             end
-            /^= /.match(head)
+            /^=(?:\s+\S|[^=])/ === head
           else
             /\A(?:rd|rab|rbt)\z/i =~ extension
           end

data/lib/rabbit/renderer/display/button-handler.rb

@@ -129,9 +129,9 @@ module Rabbit
           else
             @button_handling = true
             @button_event_coming = false
-            Gtk.timeout_add(BUTTON_PRESS_ACCEPTING_TIME) do
+            GLib::Timeout.add(BUTTON_PRESS_ACCEPTING_TIME) do
               if @button_event_coming
-                Gtk.timeout_add(BUTTON_PRESS_ACCEPTING_TIME) do
+                GLib::Timeout.add(BUTTON_PRESS_ACCEPTING_TIME) do
                   call_button_handler
                   @button_handling = false
                   false

data/lib/rabbit/renderer/display/drawing-area-base.rb

@@ -305,12 +305,8 @@ module Rabbit
 
         def draw_slide(slide, simulation, &block)
           super do |*args|
-            # block.call(*args)
-            # magnify {block.call(*args)} unless simulation
-            ## the below codes are workaround for
-            ## http://redmine.ruby-lang.org/issues/show/2600
-            yield(*args)
-            magnify {yield(*args)} unless simulation
+            block.call(*args)
+            magnify {block.call(*args)} unless simulation
           end
         end
 

data/lib/rabbit/renderer/display/progress.rb

@@ -39,7 +39,7 @@ module Rabbit
 
         def end_progress
           @progress.end_progress
-          Gtk.timeout_add(100) do
+          GLib::Timeout.add(100) do
             @progress.window.hide
             update_menu
             false

data/lib/rabbit/renderer/engine/cairo.rb

@@ -1,6 +1,8 @@
-require 'cairo'
+require "cairo"
+require "stringio"
 
-require 'rabbit/renderer/kernel'
+require "rabbit/image-data-loader"
+require "rabbit/renderer/kernel"
 
 module Cairo
   class Context
@@ -340,10 +342,10 @@ module Rabbit
         end
 
         def make_layout(text)
-          attrs, text = Pango.parse_markup(text)
+          attributes, text = Pango.parse_markup(text)
           layout = @context.create_pango_layout
           layout.text = text
-          layout.set_attributes(attrs)
+          layout.attributes = attributes
           set_font_resolution(layout.context)
           @context.update_pango_layout(layout)
           layout
@@ -488,15 +490,17 @@ module Rabbit
           return unless params
 
           dim = handle.dimensions
-          surface = ::Cairo::ImageSurface.new(:argb32, width, height)
-          context = ::Cairo::Context.new(surface)
-          context.scale(width / dim.width, height / dim.height)
-          context.render_rsvg_handle(handle)
-          png = Tempfile.new("rabbit-cairo-svg-renderer")
-          context.target.write_to_png(png.path)
-          context.target.finish
-          pixbuf = Gdk::Pixbuf.new(png.path)
-          _draw_reflected_pixbuf(pixbuf, x, y, params)
+          ::Cairo::ImageSurface.new(:argb32, width, height) do |surface|
+            ::Cairo::Context.new(surface) do |context|
+              context.scale(width / dim.width, height / dim.height)
+              context.render_rsvg_handle(handle)
+              png = StringIO.new
+              context.target.write_to_png(png)
+              loader = ImageDataLoader.new(png.string)
+              loader.load
+              _draw_reflected_pixbuf(loader.pixbuf, x, y, params)
+            end
+          end
         end
 
         def set_line_options(params)