rabbit 2.2.1 → 3.0.0

data/lib/rabbit/html/generator.rb

@@ -1,15 +1,32 @@
-require 'erb'
-require 'fileutils'
+# Copyright (C) 2005-2018  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 "erb"
+require "fileutils"
 
 begin
-  require 'rss/maker'
+  require "rss/maker"
 rescue LoadError
 end
 
-require 'rabbit/rabbit'
-require 'rabbit/front'
-require 'rabbit/utils'
-require 'rabbit/keys'
+require "rabbit/filename"
+require "rabbit/front"
+require "rabbit/keys"
+require "rabbit/rabbit"
+require "rabbit/utils"
 
 module Rabbit
   module HTML
@@ -21,7 +38,14 @@ module Rabbit
       path = ["rabbit", "html", "template.erb"]
       template_path = Utils.find_path_in_load_path(*path)
       raise CantFindHTMLTemplate.new(File.join(*path)) if template_path.nil?
-      erb = File.open(template_path) {|f| ERB.new(f.read, nil, "-")}
+      erb = File.open(template_path) do |f|
+        parameters = ERB.instance_method(:initialize).parameters
+        if parameters.include?([:key, :trim_mode])
+          ERB.new(f.read, trim_mode: "-")
+        else
+          ERB.new(f.read, nil, "-")
+        end
+      end
       erb.def_method(self, "to_html", template_path)
 
       attr_accessor :pdf_filename, :source_filename
@@ -40,7 +64,7 @@ module Rabbit
         @output_index_html = output_index_html
         @pdf_filename = nil
         @source_filename = nil
-        FileUtils.mkdir_p(to_filename_encoding(@base_dir))
+        FileUtils.mkdir_p(Filename.new(@base_dir).encode)
       end
 
       def save
@@ -193,7 +217,7 @@ module Rabbit
         if Object.const_defined?(:RSS)
           rss = make_rss
           name = File.join(@base_dir, @rss_filename)
-          File.open(to_filename_encoding(name), "w") do |f|
+          File.open(Filename.new(name).encode, "w") do |f|
             f.print(rss.to_s)
           end
           true
@@ -209,31 +233,15 @@ module Rabbit
         format << "-%0#{number_of_places(slide_size)}d%s.%s"
       end
 
-      def to_filename_encoding(utf8_filename)
-        if GLib.const_defined?(:Win32)
-          GLib::Win32.locale_filename_from_utf8(utf8_filename)
-        else
-          if Utils.windows?
-            GLib.locale_from_utf8(utf8_filename)
-          else
-            GLib.filename_from_utf8(utf8_filename)
-          end
-        end
-      end
-
-      def make_filename(slide_number, suffix, optional=nil, convert=true)
+      def make_filename(slide_number, suffix, optional=nil)
         optional = "-#{optional}" if optional
         name = filename_format % [slide_number, optional || '', suffix]
-        if convert
-          to_filename_encoding(name)
-        else
-          name
-        end
+        Filename.new(name).encode
       end
 
       def slide_filename(slide_number=@slide_number)
         if !outputting_index? and slide_number.zero?
-          File.join(to_filename_encoding(@base_dir), "index.#{@suffix}")
+          Filename.new(File.join(@base_dir, "index.#{@suffix}")).encode
         else
           make_filename(slide_number, @suffix)
         end
@@ -244,7 +252,7 @@ module Rabbit
       end
 
       def pixbuf_filename(slide_number=@slide_number, optional=nil)
-        make_filename(slide_number, @image_type, optional, !Utils.windows?)
+        make_filename(slide_number, @image_type, optional)
       end
 
       def output_html(filename)

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

@@ -18,11 +18,15 @@ require "gdk_pixbuf2"
 
 module Rabbit
   class ImageDataLoader
-    attr_reader :width, :height, :pixbuf
+    attr_reader :width
+    attr_reader :height
+    attr_reader :pixbuf
+    attr_reader :animation
     def initialize(data)
       @width = 0
       @height = 0
       @pixbuf = nil
+      @animation = nil
       @data = data
     end
 
@@ -40,6 +44,7 @@ module Rabbit
       end
       loader.signal_handler_disconnect(id)
       @pixbuf = loader.pixbuf
+      @animation = loader.animation
       @pixbuf
     end
   end

data/lib/rabbit/image.rb

@@ -1,11 +1,29 @@
+# Copyright (C) 2004-2017  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 "forwardable"
 require "tempfile"
 require 'thread'
 
-require 'rabbit/utils'
-
-dir = File.join("rabbit", "image")
-Rabbit::Utils.require_files_under_directory_in_load_path(dir)
+require "rabbit/image/default"
+require "rabbit/image/dia"
+require "rabbit/image/eps"
+require "rabbit/image/gimp"
+require "rabbit/image/pdf"
+require "rabbit/image/svg"
 
 module Rabbit
   module ImageManipulable

data/lib/rabbit/image/base.rb

@@ -10,10 +10,14 @@ module Rabbit
       extend ModuleLoader
 
       attr_reader :width, :height, :original_width, :original_height
+      attr_reader :animation
 
       def initialize(filename, props)
         @filename = filename
         @props = normalize_props(props)
+        @animation = nil
+        @animation_iterator = nil
+        @animation_timeout = nil
         update_size
         @original_width = @width
         @original_height = @height
@@ -65,7 +69,13 @@ module Rabbit
           :width => width,
           :height => height,
         }
-        canvas.draw_pixbuf(pixbuf, x, y, default_params.merge(params))
+        target_pixbuf = pixbuf
+        if @animation_iterator
+          @animation_iterator.advance
+          target_pixbuf = @animation_iterator.pixbuf
+          update_animation_timeout(canvas)
+        end
+        canvas.draw_pixbuf(target_pixbuf, x, y, default_params.merge(params))
       end
 
       private
@@ -95,7 +105,29 @@ module Rabbit
 
         @width = loader.width
         @height = loader.height
-        loader.pixbuf
+        @pixbuf = loader.pixbuf
+        @animation = loader.animation
+        if @animation and not @animation.static_image?
+          @animation_iterator = @animation.get_iter
+        else
+          @animation_iterator = nil
+        end
+        if @animation_timeout
+          GLib::Source.remove(@animation_timeout)
+          @animation_timeout = nil
+        end
+      end
+
+      def update_animation_timeout(canvas)
+        delay_time = @animation_iterator.delay_time
+        if delay_time > 0 and @animation_timeout.nil?
+          @animation_timeout = GLib::Timeout.add(delay_time) do
+            canvas.redraw
+            @animation_timeout = nil
+            # update_animation_timeout(canvas)
+            GLib::Source::REMOVE
+          end
+        end
       end
     end
   end

data/lib/rabbit/image/default.rb

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

data/lib/rabbit/image/eps.rb

@@ -36,7 +36,7 @@ module Rabbit
 
       private
       def update_size
-        @pixbuf = load_image
+        load_image
       end
 
       def load_image(width=nil, height=nil)

data/lib/rabbit/image/gimp.rb

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

data/lib/rabbit/info-window.rb

@@ -1,4 +1,18 @@
-require 'erb'
+# Copyright (C) 2006-2018  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/gtk'
 require 'rabbit/dependency-canvas'
@@ -11,7 +25,6 @@ require 'rabbit/renderer/display/menu'
 
 module Rabbit
   class InfoWindow
-    include ERB::Util
     include GetText
 
     include Renderer::Display::HookHandler
@@ -191,17 +204,9 @@ module Rabbit
 
     def init_note_area
       @note_area = Gtk::DrawingArea.new
-      if @note_area.class.signals.include?("expose-event")
-        @note_area.signal_connect("expose-event") do |area, event|
-          context = area.window.create_cairo_context
-          draw_text_as_large_as_possible(area, context, note_text)
-          Gdk::Event::PROPAGATE
-        end
-      else
-        @note_area.signal_connect("draw") do |area, context|
-          draw_text_as_large_as_possible(area, context, note_text)
-          Gdk::Event::PROPAGATE
-        end
+      @note_area.signal_connect("draw") do |area, context|
+        draw_text_as_large_as_possible(area, context, note_text)
+        Gdk::Event::PROPAGATE
       end
     end
 
@@ -271,7 +276,7 @@ module Rabbit
       attrs["font_desc"] = ((height * font_size) / Pango::SCALE).to_s
       rest_time = @canvas.rest_time
       attrs["foreground"] = "red" if rest_time and rest_time < 0
-      "<span #{@canvas.to_attrs(attrs)}>#{h timer_label}</span>"
+      PangoMarkup.new("span", attrs, timer_label).to_s
     end
 
     def timer_label
@@ -292,7 +297,7 @@ module Rabbit
       end
       attrs = {}
       attrs["font_desc"] = ((height * 40) / Pango::SCALE).to_s
-      "<span #{@canvas.to_attrs(attrs)}>#{text}</span>"
+      PangoMarkup.new("span", attrs, text).to_s
     end
 
     def update_source
@@ -307,6 +312,13 @@ module Rabbit
       end
     end
 
+    def reload_theme
+      @canvas.reload_theme
+      each do |canvas|
+        canvas.reload_theme
+      end
+    end
+
     def adjust_slide(base_index=nil)
       base_index ||= @canvas.current_index
       @previous_canvas.move_to_if_can([base_index - 1, 0].max)

data/lib/rabbit/logger/gui.rb

@@ -11,7 +11,6 @@ module Rabbit
 
       attr_accessor :start_gui_main_loop_automatically
       def initialize(level=nil, width=450, height=400)
-        Gtk.init
         super(*[level].compact)
         @width = width
         @height = height
@@ -61,8 +60,8 @@ module Rabbit
       end
 
       def append(text, *tags)
-        iter = @buffer.get_iter_at_offset(-1)
-        @buffer.insert_with_tags(iter, text.encode("UTF-8"), *tags)
+        iter = @buffer.get_iter_at(offset: -1)
+        @buffer.insert(iter, text.encode("UTF-8"), tags: tags)
       end
 
       def title
@@ -70,13 +69,12 @@ module Rabbit
       end
 
       def init_dialog(width=@width, height=@height)
-        flags = 0
-        buttons = [
-          [Gtk::Stock::CLEAR, Gtk::Dialog::RESPONSE_CANCEL],
-          [Gtk::Stock::CLOSE, Gtk::Dialog::RESPONSE_CLOSE],
-        ]
-        @dialog = Gtk::Dialog.new(title, nil, flags, *buttons)
-        @dialog.vbox.add(init_buffer)
+        @dialog = Gtk::Dialog.new(title: title,
+                                  buttons: [
+                                    [Gtk::Stock::CLEAR, :cancel],
+                                    [Gtk::Stock::CLOSE, :close],
+                                  ])
+        @dialog.child.add(init_buffer)
         @dialog.set_default_size(width, height)
         @dialog.title = title
         set_dialog_delete
@@ -86,7 +84,7 @@ module Rabbit
 
       def set_dialog_delete
         @dialog.signal_connect("destroy") do |widget, event|
-          exit if @current_severity >= Severity::FATAL
+          exit(false) if @current_severity >= Severity::FATAL
           true
         end
       end
@@ -94,9 +92,9 @@ module Rabbit
       def set_dialog_response
         @dialog.signal_connect("response") do |widget, event|
           case event
-          when Gtk::Dialog::RESPONSE_CANCEL
+          when Gtk::ResponseType::CANCEL
             clear_buffer
-          when Gtk::Dialog::RESPONSE_CLOSE
+          when Gtk::ResponseType::CLOSE
             quit
           end
           true
@@ -109,7 +107,7 @@ module Rabbit
         flags = Gtk::AccelFlags::VISIBLE
         Keys::QUIT_KEYS.each do |val|
           accel_group.connect(val, mod, flags) do
-            @dialog.signal_emit("response", Gtk::Dialog::RESPONSE_CLOSE)
+            @dialog.signal_emit("response", Gtk::ResponseType::CLOSE)
             true
           end
         end
@@ -119,39 +117,39 @@ module Rabbit
       def init_buffer
         textview = Gtk::TextView.new
         textview.set_editable(false)
-        textview.set_wrap_mode(Gtk::TextTag::WrapMode::WORD)
+        textview.set_wrap_mode(:word)
         @buffer = textview.buffer
         create_tags
         scrolled_window = Gtk::ScrolledWindow.new
-        scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC)
+        scrolled_window.set_policy(:automatic, :automatic)
         scrolled_window.add(textview)
         scrolled_window
       end
 
       def create_tags
         @buffer.create_tag("DEBUG",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD,
+                           "weight" => :bold,
                            "foreground" => "blue")
         @buffer.create_tag("INFO", "foreground" => "blue")
-        @buffer.create_tag("WARN", "foreground" => "red")
+        @buffer.create_tag("WARNING", "foreground" => "red")
         @buffer.create_tag("ERROR",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD,
+                           "weight" => :bold,
                            "foreground" => "red")
         @buffer.create_tag("FATAL",
                            "foreground" => "yellow",
                            "background" => "black")
         @buffer.create_tag("UNKNOWN",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD,
+                           "weight" => :bold,
                            "foreground" => "yellow",
                            "background" => "black")
         @buffer.create_tag("ANY",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD)
+                           "weight" => :bold)
         @buffer.create_tag("prog_name",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD,
+                           "weight" => :bold,
                            "foreground" => "blue",
                            "left_margin" => 10)
         @buffer.create_tag("message",
-                           "weight" => Pango::FontDescription::WEIGHT_BOLD,
+                           "weight" => :bold,
                            "left_margin" => 10,
                            "right_margin" => 10)
       end