rabbit 3.0.5 → 4.0.1

data/lib/rabbit/theme/applier.rb

@@ -1,12 +1,28 @@
-require 'delegate'
-require 'forwardable'
-
-require 'rabbit/utils'
-require 'rabbit/element'
-require 'rabbit/image'
-require 'rabbit/theme/searcher'
-require 'rabbit/renderer/color'
-require "rabbit/size"
+# Copyright (C) 2004-2025  Sutou Kouhei <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 "delegate"
+require "forwardable"
+
+require_relative "../utils"
+require_relative "../element"
+require_relative "../image"
+require_relative "../theme/searcher"
+require_relative "../renderer/color"
+require_relative "../size"
 
 module Rabbit
   module Theme
@@ -359,7 +375,7 @@ module Rabbit
       end
 
       def slides
-        @theme.slides
+        canvas.slides
       end
 
       def canvas
@@ -367,7 +383,7 @@ module Rabbit
       end
 
       def logger
-        canvas.logger
+        Rabbit.logger
       end
 
       def print?

data/lib/rabbit/theme/clear-blue/clear-blue.rb

@@ -94,7 +94,7 @@ end
 include_theme("slide-logo")
 
 @icon_images = ["clear-blue-icon.png"]
-include_theme("icon")
+# include_theme("icon")
 
 @slide_footer_info_left_text ||= canvas.title.gsub(/\n/, " ")
 @slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"

data/lib/rabbit/theme/color-circle/color-circle.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2005-2025  Sutou Kouhei <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.
+
 must_set_variables = %w(foreground background color light_color bright_color
                         graffiti_color)
 
@@ -14,7 +30,7 @@ end
 
 unless not_set_variables.empty?
   format = _("required variables aren't set: %s")
-  canvas.logger.error(format % not_set_variables.inspect)
+  Rabbit.logger.error(format % not_set_variables.inspect)
   theme_exit
 end
 
@@ -29,6 +45,7 @@ include_theme("newline-in-slides")
 include_theme("tag")
 
 include_theme("image")
+include_theme("video")
 include_theme("table")
 
 include_theme("color-circle-title-slide")

data/lib/rabbit/theme/cozmixng/cozmixng.rb

@@ -19,7 +19,7 @@ include_theme("cozmixng-powered-by")
 include_theme("title-logo")
 
 @icon_images = ["cozmixchu.png"]
-include_theme("icon")
+# include_theme("icon")
 
 
 match(Slide, HeadLine) do |heads|

data/lib/rabbit/theme/default/default.rb

@@ -18,6 +18,7 @@ include_theme("default-block-quote")
 include_theme("default-foot-text")
 include_theme("default-description")
 include_theme("image")
+include_theme("video")
 include_theme("table")
 include_theme("newline-in-slides")
 

data/lib/rabbit/theme/default-icon/default-icon.rb

@@ -1,4 +1,4 @@
 add_image_path("ruby-images")
 
 @icon_images = ["ruby-pink-circle-small-icon.png", "ruby-pink-polygon-icon.png"]
-include_theme("icon")
+# include_theme("icon")

data/lib/rabbit/theme/default-item-mark-setup/default-item-mark-setup.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2005-2025  Sutou Kouhei <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.
+
 def setup_default_item_mark_get_option_value(options, name, *args)
   value = options[name]
   if value and value.respond_to?(:call)
@@ -30,7 +46,7 @@ def setup_default_item_mark_type(type, item, canvas, x, y, w, h, color)
   else
     format = _("unknown item mark type: %s\n" \
                "Rectangle type is used as fallback")
-    canvas.logger.warn(format % type.inspect)
+    Rabbit.logger.warn(format % type.inspect)
     setup_default_item_mark_type("rectangle")
   end
 end

data/lib/rabbit/theme/default-preformatted/default-preformatted.rb

@@ -42,7 +42,15 @@ match("**", PreformattedBlock) do |blocks|
   blocks.margin_top = @space
   blocks.margin_bottom = @space
 
-  blocks.keep_in_size if @preformatted_keep_in_size
+  blocks.each do |block|
+    keep_in_size = block.user_property["keep-in-size"]
+    if keep_in_size.nil?
+      keep_in_size = @preformatted_keep_in_size
+    else
+      keep_in_size = (keep_in_size == "true")
+    end
+    block.keep_in_size if keep_in_size
+  end
 
   draw_frame(blocks, params)
 end

data/lib/rabbit/theme/enishi-green/enishi-green.rb

@@ -12,7 +12,7 @@ match(TitleSlide) do |slides|
   slides.margin_top = canvas.height * 0.1
 
   slides.add_pre_draw_proc do |slide, canvas, x, y, w, h, simulation|
-    unless
+    unless simulation
       canvas.draw_rectangle(true, 0, 0, canvas.width, canvas.height,
                             green_background_color)
     end

data/lib/rabbit/theme/entry.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2005-2025  Sutou Kouhei <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
@@ -14,11 +14,11 @@
 # 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 "erb"
 
-require 'rabbit/rabbit'
-require "rabbit/gem-finder"
-require "rabbit/theme-configuration"
+require_relative '../rabbit'
+require_relative "../gem-finder"
+require_relative "../theme-configuration"
 
 module Rabbit
   module Theme
@@ -35,10 +35,8 @@ module Rabbit
       attr_reader :name, :title, :description
       attr_reader :abstract
       attr_reader :dependencies, :parameters
-      attr_accessor :logger
 
-      def initialize(logger, theme_dir, name)
-        @logger = logger
+      def initialize(theme_dir, name)
         @theme_dir = theme_dir
         @name = name
         @title = @name
@@ -111,7 +109,7 @@ module Rabbit
           begin
             instance_eval(content, file)
           rescue SyntaxError
-            @logger.warn($!) if @logger
+            Rabbit.logger.warn($!)
           end
         end
       end
@@ -155,10 +153,10 @@ module Rabbit
     end
 
     class GemEntry < Entry
-      def initialize(logger, name)
+      def initialize(name)
         @spec = nil
         if valid_gem_name?(name)
-          finder = GemFinder.new(logger)
+          finder = GemFinder.new
           begin
             @spec = finder.find(name, "#{ThemeConfiguration::GEM_NAME_PREFIX}-")
           rescue Gem::GemNotFoundException
@@ -166,7 +164,7 @@ module Rabbit
         end
         theme_dir = nil
         theme_dir = @spec.gem_dir if @spec
-        super(logger, theme_dir, name)
+        super(theme_dir, name)
       end
 
       def available?

data/lib/rabbit/theme/icon/icon.rb

@@ -1,8 +1,3 @@
-@icon_images ||= []
-if @icon_image
-  @icon_images.unshift(@icon_image)
-end
-
-canvas.icon_list = @icon_images.collect do |filename|
-  ImageLoader.new(find_file(filename)).pixbuf
-end
+# warn("icon theme is deprecated. " +
+#      "You can't set custom window icon. " +
+#      "Please remove 'include_theme(\"icon\")'.")

data/lib/rabbit/theme/image-slide-number/image-slide-number.rb

@@ -51,10 +51,10 @@ match(Slide) do |slides|
 
   start_flag_width = 0
   goal_flag_width = 0
-  if canvas.slide_size < 2
+  if canvas.n_slides < 2
     max_text_length = 1
   else
-    max_text_length = Math.log10(canvas.slide_size - 1).truncate + 1
+    max_text_length = Math.log10(canvas.n_slides - 1).truncate + 1
   end
   text_attributes = {
     "size" => @image_slide_number_font_size / max_text_length,
@@ -71,7 +71,7 @@ match(Slide) do |slides|
       if @image_slide_number_show_text
         props = {
           "flag_type" => @image_slide_number_flag_type,
-          "text" => "%#{max_text_length}d" % canvas.slide_size.to_s,
+          "text" => "%#{max_text_length}d" % canvas.n_slides.to_s,
           "text_attributes" => text_attributes,
         }
         start_flag_width, _ = canvas.flag_size(image_height, props)
@@ -102,7 +102,7 @@ match(Slide) do |slides|
           }
           canvas.draw_flag(start_base_x, base_y, loader.height, props)
 
-          props["text"] = (canvas.slide_size - 1).to_s
+          props["text"] = (canvas.n_slides - 1).to_s
           props["flag_color"] = @image_slide_number_goal_flag_color
           canvas.draw_flag(goal_base_x, base_y, loader.height, props)
         else
@@ -113,7 +113,7 @@ match(Slide) do |slides|
         end
       end
 
-      target_n_slides ||= canvas.slide_size
+      target_n_slides ||= canvas.n_slides
       if target_n_slides < 3
         ratio = 1
       else

data/lib/rabbit/theme/image-timer/image-timer.rb

@@ -80,11 +80,11 @@ match(*@image_timer_target_paths) do |slides|
       loader.draw(canvas, base_x, base_y, @image_timer_draw_parameters)
 
       if @image_timer_auto_scroll
-        if canvas.slide_size < 3
+        if canvas.n_slides < 3
           slide_ratio = 1
         else
-          slide_ratio = (slide.index - 1.0) / (canvas.slide_size - 2.0)
-          next_slide_ratio = (slide.index) / (canvas.slide_size - 2.0)
+          slide_ratio = (slide.index - 1.0) / (canvas.n_slides - 2.0)
+          next_slide_ratio = (slide.index) / (canvas.n_slides - 2.0)
         end
 
         if ratio > slide_ratio and !canvas.last_slide? and

data/lib/rabbit/theme/lightning-simple/lightning-simple.rb

@@ -1,4 +1,5 @@
 include_theme("image")
+include_theme("video")
 include_theme("table")
 
 normal_font_size = @normal_font_size

data/lib/rabbit/theme/lightning-talk/lightning-talk.rb

@@ -3,6 +3,7 @@ include_theme("default-slide")
 include_theme("default-title-text")
 include_theme("default-text")
 include_theme("image")
+include_theme("video")
 include_theme("lightning-talk-toolkit")
 
 match(TitleSlide) do |slides|

data/lib/rabbit/theme/manager.rb

@@ -1,14 +1,28 @@
+# Copyright (C) 2005-2025  Sutou Kouhei <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 'rabbit/theme/applier'
+require_relative "applier"
 
 module Rabbit
   module Theme
     class Manager
       extend Forwardable
 
-      def_delegators(:@canvas, :logger)
-      
       attr_reader :canvas, :name
       def initialize(canvas, &callback)
         @canvas = canvas
@@ -21,15 +35,11 @@ module Rabbit
         begin
           @applier.apply_theme(name)
         rescue ThemeExit
-          logger.info($!.message) if $!.have_message?
+          Rabbit.logger.info($!.message) if $!.have_message?
         rescue StandardError, LoadError, SyntaxError
-          logger.warn($!)
+          Rabbit.logger.warn($!)
         end
       end
-    
-      def slides
-        @canvas.slides
-      end
     end
   end
 end

data/lib/rabbit/theme/rabbit-icon/rabbit-icon.rb

@@ -1,4 +1,4 @@
 add_image_path("rabbit-images")
 
 @icon_images = ["lavie-icon.png"]
-include_theme("icon")
+# include_theme("icon")

data/lib/rabbit/theme/ranguba/ranguba.rb

@@ -52,7 +52,7 @@ end
 include_theme("default")
 
 @icon_images = ["ranguba-mark.png"]
-include_theme("icon")
+# include_theme("icon")
 
 @slide_logo_image = "ranguba-mark.png"
 @slide_logo_position = Proc.new do |slide, canvas|

data/lib/rabbit/theme/red-frame/red-frame.rb

@@ -4,8 +4,6 @@ shadow_color = "#c09090"
 line_width = screen_size(0.8)
 line_width += 1 if (line_width % 2).zero?
 
-include_theme("image")
-include_theme("table")
 include_theme("default-title-text")
 include_theme("default-text")
 include_theme("default-title-slide")
@@ -25,6 +23,12 @@ include_theme("default-block-quote")
 include_theme("simple-item-mark")
 include_theme("rabbit-icon")
 
+include_theme("image")
+include_theme("video")
+include_theme("table")
+include_theme("tag")
+include_theme("newline-in-slides")
+
 set_progress_foreground("#ffff00000000")
 set_progress_background("#ffffeb29ffff")
 

data/lib/rabbit/theme/ruby-gnome2/ruby-gnome2.rb

@@ -2,6 +2,7 @@ add_image_path("ruby-images")
 add_image_path("rabbit-images")
 
 include_theme("image")
+include_theme("video")
 include_theme("table")
 include_theme("default-title-text")
 include_theme("default-text")

data/lib/rabbit/theme/ruby-gnome2-icon/ruby-gnome2-icon.rb

@@ -1,4 +1,4 @@
 add_image_path("ruby-images")
 
 @icon_images = ["ruby-pink-circle.png"]
-include_theme("icon")
+# include_theme("icon")

data/lib/rabbit/theme/searcher.rb

@@ -1,6 +1,22 @@
+# Copyright (C) 2004-2025  Sutou Kouhei <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 "pathname"
 
-require 'rabbit/theme/entry'
+require_relative "entry"
 
 module Rabbit
   module Theme
@@ -45,15 +61,15 @@ module Rabbit
       def find_theme(theme_name=name, only_image=false)
         if theme_name == "."
           if only_image
-            entry = ImageDirectoryEntry.new(@logger, ".", ".")
+            entry = ImageDirectoryEntry.new(".", ".")
           else
-            entry = DirectoryEntry.new(@logger, ".", ".")
+            entry = DirectoryEntry.new(".", ".")
           end
           return entry if entry.available?
         end
 
         unless only_image
-          entry = FileEntry.new(@logger, base_directory, theme_name)
+          entry = FileEntry.new(base_directory, theme_name)
           return entry if entry.available?
         end
 
@@ -72,9 +88,9 @@ module Rabbit
 
         if found_entry.nil?
           if only_image
-            entry = ImageGemEntry.new(@logger, theme_name)
+            entry = ImageGemEntry.new(theme_name)
           else
-            entry = GemEntry.new(@logger, theme_name)
+            entry = GemEntry.new(theme_name)
           end
           return entry if entry.available?
           raise LoadError, "can't find theme: #{theme_name}."
@@ -145,7 +161,7 @@ module Rabbit
               next if theme_names.has_key?(theme)
               theme_dir = File.join(File.expand_path(base_name), theme)
               entry_classes.each do |entry_class|
-                entry = entry_class.new(@logger, theme_dir, theme)
+                entry = entry_class.new(theme_dir, theme)
                 if entry.available?
                   block.call(entry) if block
                   themes << entry

data/lib/rabbit/theme/slide-number/slide-number.rb

@@ -15,7 +15,7 @@ match(Slide) do |slides|
 
   slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
     unless simulation
-      text = Text.new("#{slide.index}/#{canvas.slide_size - 1}")
+      text = Text.new("#{slide.index}/#{canvas.n_slides - 1}")
       text.font @slide_number_props
       text.align = Pango::Alignment::RIGHT
       text.compile(canvas, x, y, w, h)

data/lib/rabbit/theme/slide-show/slide-show.rb

@@ -1,7 +1,7 @@
 theme_exit unless display?
 
 if canvas.allotted_time
-  default_slide_show_span = (canvas.allotted_time / canvas.slide_size.to_f).round
+  default_slide_show_span = (canvas.allotted_time / canvas.n_slides.to_f).round
 else
   default_slide_show_span = 60
 end

data/lib/rabbit/theme/table/table.rb

@@ -95,7 +95,7 @@ match(*(all_table + [TableHead, TableRow, TableHeader])) do |headers|
       header.dirty!
       header.text_compile(canvas, x, y, header_w, h)
     end
-    [x, y, w, h]
+    [x, y, header.width, h]
   end
 
   headers.add_post_draw_proc(name) do |header, canvas, x, y, w, h, simulation|
@@ -155,7 +155,7 @@ match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
           cell.text_compile(canvas, x, base_y, text_width, h)
         end
       end
-      [x, y, w, h]
+      [x, y, cell.width, h]
     end
 
     cell.add_post_draw_proc(name) do |canvas, x, y, w, h, simulation|

data/lib/rabbit/theme/video/property.rb

@@ -0,0 +1,3 @@
+@category = N_("Toolkit")
+@title = N_("Video")
+@description = N_("video rendering")

data/lib/rabbit/theme/video/video.rb

@@ -0,0 +1,5 @@
+proc_name = "video"
+
+match("**", Video) do |videos|
+  videos.horizontal_centering = true
+end

data/lib/rabbit/theme-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-2025  Sutou Kouhei <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
@@ -14,10 +14,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
-require "rabbit/author-configuration"
-require "rabbit/path-manipulatable"
-require "rabbit/yaml-loader"
+require_relative "rabbit"
+require_relative "author-configuration"
+require_relative "path-manipulatable"
+require_relative "yaml-loader"
 
 module Rabbit
   class ThemeConfiguration
@@ -26,12 +26,10 @@ module Rabbit
 
     GEM_NAME_PREFIX = "rabbit-theme"
 
-    attr_accessor :logger
     attr_accessor :id, :tags, :licenses
     attr_writer :version
     attr_accessor :author
-    def initialize(logger=nil)
-      @logger = logger || Logger.default
+    def initialize
       @id = nil
       @tags = []
       @version = nil
@@ -45,7 +43,7 @@ module Rabbit
       merge!(conf)
     rescue
       format = _("Failed to read slide configuration: %s: %s")
-      @logger.error(format % [path, $!.message])
+      Rabbit.logger.error(format % [path, $!.message])
     end
 
     def save(base_dir)
@@ -55,7 +53,7 @@ module Rabbit
       end
     rescue
       format = _("Failed to write slide configuration: %s: %s")
-      @logger.error(format % [config_path, $!.message])
+      Rabbit.logger.error(format % [config_path, $!.message])
     end
 
     def merge!(conf)
@@ -64,7 +62,7 @@ module Rabbit
       @version           = conf["version"]
       @licenses          = conf["licenses"]
 
-      @author = AuthorConfiguration.new(@logger)
+      @author = AuthorConfiguration.new
       @author.merge!(conf["author"] || {})
     end