rabbit 0.9.2 → 0.9.3

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

@@ -1,6 +1,5 @@
 require 'rabbit/renderer/engine'
 require 'rabbit/renderer/display/drawing-area-base'
-require 'rabbit/renderer/display/comment'
 
 module Rabbit
   module Renderer
@@ -8,7 +7,6 @@ module Rabbit
       class DrawingArea
         include Renderer::Engine.renderer_module
         include DrawingAreaBase
-        include Comment
 
         class << self
           def priority

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

@@ -136,10 +136,6 @@ module Rabbit
           set_keys(keys, mod) do |group, obj, val, modifier|
             @canvas.activate("CacheAllSlides")
           end
-          keys = Keys::TOGGLE_COMMENT_FRAME_KEYS
-          set_keys(keys, mod) do |group, obj, val, modifier|
-            @canvas.activate("ToggleCommentFrame")
-          end
           keys = Keys::SEARCH_SLIDE_FORWARD_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
             @canvas.activate("SearchSlideForward")
@@ -169,10 +165,6 @@ module Rabbit
           set_keys(keys, mod) do |group, obj, val, modifier|
             @canvas.activate("ToggleBlackout")
           end
-          keys = Keys::Shift::TOGGLE_COMMENT_VIEW_KEYS
-          set_keys(keys, mod) do |group, obj, val, modifier|
-            @canvas.activate("ToggleCommentView")
-          end
           keys = Keys::Shift::EXPAND_HOLE_KEYS
           set_keys(keys, mod) do |group, obj, val, modifier|
             @canvas.activate("ExpandHole")

data/lib/rabbit/source/base.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'tmpdir'
 
 require 'rabbit/rabbit'
 
@@ -109,6 +110,9 @@ module Rabbit
         else
           @tmp_base = "."
         end
+        unless ::File.writable?(@tmp_base)
+          @tmp_base = Dir.tmpdir
+        end
       end
 
       def parse_uri(str)

data/lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb

@@ -12,14 +12,10 @@ def apply_background_image_property(element, options={})
   end
   return if background_image.nil?
 
-  if options.has_key?(:properties)
-    properties = options[:properties]
-  else
-    properties = {}
-    element.user_property.each do |name, value|
-      if /\Abackground-image-/ =~ name
-        properties[$POSTMATCH.gsub(/-/, '_')] = value
-      end
+  properties = options[:properties] || {}
+  element.user_property.each do |name, value|
+    if /\Abackground-image-/ =~ name
+      properties[$POSTMATCH.gsub(/-/, '_')] = value
     end
   end
 

data/lib/rabbit/theme/clutter-comment/clutter-comment.rb

@@ -0,0 +1,76 @@
+theme_exit unless display?
+
+proc_name = "clutter-comment"
+
+canvas.delete_on_comment_proc_by_name(proc_name)
+
+theme_exit if @clutter_comment_uninstall
+
+canvas.on_comment(proc_name) do |comment|
+  stage = canvas.renderer.widget.stage
+
+  color = Clutter::Color.new(rand(256), rand(256), rand(256),
+                             128 + rand(128))
+  size = 36 + rand(72)
+  actor = Clutter::Label.new("Sans #{size}", comment, color)
+  actor.x = canvas.width
+  actor.y = (canvas.height / 2.0) * rand
+  actor.show
+  stage.add(actor)
+
+  n = 150 + rand(150)
+  delta = (canvas.width + actor.width) / n.to_f
+
+  do_rotate_x = rand(5).zero?
+  do_rotate_y = rand(5).zero?
+  do_rotate_z = rand(5).zero?
+  do_scale = rand(5).zero?
+
+  x_axis = actor.x
+  y_axis = actor.y - (actor.height * 0.5)
+  if do_rotate_x
+    actor.set_rotation(Clutter::X_AXIS, rand(360), 0, y_axis, 0)
+  end
+  if do_rotate_y
+    actor.set_rotation(Clutter::Y_AXIS, rand(360), x_axis, 0, 0)
+  end
+  if do_rotate_z
+    actor.set_rotation(Clutter::Z_AXIS, rand(360), x_axis, y_axis, 0)
+  end
+  if do_scale
+    x_sign = 1
+    y_sign = 1
+    actor.set_scale(-2 + rand(5), -2 + rand(5))
+  end
+  GLib::Timeout.add(1000 / 50) do
+    actor.raise_top
+    actor.x -= delta
+
+    x_angle, x_x, x_y, x_z = actor.get_rotation(Clutter::X_AXIS)
+    y_angle, y_x, y_y, y_z = actor.get_rotation(Clutter::Y_AXIS)
+    z_angle, z_x, z_y, z_z = actor.get_rotation(Clutter::Z_AXIS)
+    x_angle = (x_angle + rand(5)) % 360
+    y_angle = (y_angle + rand(5)) % 360
+    z_angle = (z_angle + rand(5)) % 360
+    x_axis = actor.x
+    if do_rotate_x
+      actor.set_rotation(Clutter::X_AXIS, x_angle, 0, y_axis, 0)
+    end
+    if do_rotate_y
+      actor.set_rotation(Clutter::Y_AXIS, y_angle, x_axis, 0, 0)
+    end
+    if do_rotate_z
+      actor.set_rotation(Clutter::Z_AXIS, z_angle, x_axis, y_axis, 0)
+    end
+    if do_scale
+      x_scale, y_scale = actor.scale
+      x_sign *= -1 if x_scale.abs > 2
+      y_sign *= -1 if y_scale.abs > 2
+      actor.set_scale(x_scale + (0.1 * x_sign),
+                      y_scale + (0.1 * y_sign))
+    end
+    n -= 1
+    stage.remove(actor) if n.zero?
+    not n.zero?
+  end
+end

data/lib/rabbit/theme/clutter-comment/property.rb

@@ -0,0 +1,3 @@
+@category = N_("Comment")
+@title = N_("Clutter Comment")
+@description = N_("Show comment as a rolling Clutter actor.")

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

@@ -25,6 +25,9 @@ set_progress_background(@color_circle_bright_color)
 
 include_theme("default-icon")
 
+include_theme("newline-in-slides")
+include_theme("tag")
+
 include_theme("image")
 include_theme("table")
 

data/lib/rabbit/theme/dark-gradation/dark-gradation.rb

@@ -0,0 +1,187 @@
+#--------------------------------------
+# font family setup
+#--------------------------------------
+# using font name in `fc-list -v`
+@default_font = "Sans"
+@font_family = find_font_family(@default_font)
+@bold_font = "Sans"
+@bold_font_family = find_font_family(@bold_font)
+@monospace_font = "Monospace"
+@monospace_font_family = find_font_family(@monospace_font)
+#-------------------------
+# forground color
+#-------------------------
+@default_foreground = "#ffeeee"
+set_foreground(@default_foreground)
+@default_emphasis_color = "#00ffff"
+@default_link_color = "#00ffff"
+@slide_headline_hide = true
+@default_headline_line_width = 0
+#-------------------------
+# slide margin
+#-------------------------
+@space = screen_y(1)
+@margin_top = screen_x(1)
+@margin_right = screen_y(1)
+@margin_bottom = screen_x(1)
+@margin_left = screen_y(1)
+#-------------------------
+# image
+#-------------------------
+@image_with_frame = nil
+@image_caption_space = screen_y(1)
+@image_caption_color = "#ffffff"
+@image_frame_color = "black"
+@image_frame_shadow_color = "gray"
+@image_frame_padding = screen_x(1)
+@image_frame_shadow_width = 4
+@image_frame_shadow_offset = 2
+#-------------------------
+# table
+#-------------------------
+@table_frame_color = "#ff00ff"
+@table_fill_color = "#444444"
+@table_padding_left = screen_x(5) * 0
+@table_padding_right = screen_x(5) * 0
+@table_padding_top = screen_y(2) * 0
+@table_padding_bottom = screen_y(2) * 0
+@table_head_frame_color = "#ff00ff"
+@table_body_frame_color = "#ff00ff"
+@table_head_fill_color = "#646464"
+@table_body_fill_color = nil
+@table_cell_padding_left = screen_x(2)
+@table_cell_padding_right = screen_x(2)
+@table_cell_padding_top = screen_y(0.5)
+@table_cell_padding_bottom = screen_y(0.5)
+@table_header_padding_left = screen_x(2) * 0
+@table_header_padding_right = screen_x(2) * 0
+@table_header_padding_top = screen_y(0.5)
+@table_header_padding_bottom = screen_y(0.5)
+@table_caption_space = screen_y(2)
+@table_caption_color = "#ffffff"
+#-------------------------
+# preformatted config
+#-------------------------
+@preformatted_frame_color = "#0ff"
+@preformatted_frame_width = 1
+@preformatted_fill_color  = "#040404"
+@preformatted_shadow_color = nil
+@centering_preformatted_block = false
+#-------------------------
+@default_item1_mark_color = "#ff69b4"
+@default_item2_mark_color = "#836fff"
+@default_item3_mark_color = "#7ccd7c"
+@default_enum_item1_mark_color = "#836fff"
+@default_enum_item2_mark_color = "#7ccd7c"
+@default_item1_mark_type = "circle"
+@default_item2_mark_type = "circle"
+@default_item3_mark_type = "circle"
+@default_enum_item1_mark_type = "circle"
+@default_enum_item2_mark_type = "circle"
+@block_quote_frame_color = "#ff5300"
+@block_quote_frame_width = 1
+@block_quote_fill_color = "#222"
+@block_quote_title_color = "#fff"
+@block_quote_title_font_size = @xx_small_font_size
+@block_quote_padding_left   = screen_x(4)
+@block_quote_padding_right  = screen_x(4)
+@block_quote_padding_top    = screen_y(4)
+@block_quote_padding_bottom = screen_y(4)
+
+@block_quote_margin_left    = screen_x(3)
+@block_quote_margin_right   = screen_x(3)
+@block_quote_open_quote_image = nil
+@block_quote_close_quote_image = nil
+@block_quote_image_max_width = canvas.width * 0.1
+#-------------------------
+# include defaul theme!
+#-------------------------
+include_theme("default")
+#-------------------------
+# title shadow
+#-------------------------
+include_theme("title-shadow")
+@title_shadow_color = "#c09090"
+#-------------------------
+# background images
+#-------------------------
+add_image_path("dark-gradation-images")
+@slide_background_image ||= "background-gradation.png"
+@title_background_image ||= "background-gradation.png"
+# title background grad
+proc_name = "title-background-image"
+match(TitleSlide) do |slides|
+  loader = ImageLoader.new(find_file(@title_background_image))
+  resized = false
+  slides.delete_pre_draw_proc_by_name(proc_name)
+  slides.add_pre_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
+    unless simulation
+      unless loader.nil?
+        unless resized
+          loader.resize(canvas.width, canvas.height)
+          resized = true
+        end
+        loader.draw(canvas, 0, 0)
+      end
+    end
+    [x, y, w, h]
+  end
+end
+#---------------------------
+# slide number props
+#---------------------------
+@slide_number_props = {
+  "size" => @xx_small_font_size * 0.8,
+  "font_family" => @font_family,
+}
+#-------------------------
+# overwrite default settings
+#-------------------------
+match(TitleSlide, "*") do |texts|
+  texts.prop_set("style", "normal")
+end
+match(TitleSlide, Title) do |titles|
+  titles.margin_bottom = @space * 2
+end
+
+match("**", ReferText) do |texts|
+  texts.prop_set("underline", "single")
+  texts.prop_set("foreground", @default_link_color)
+end
+
+match("**", HeadLine) do |heads|
+  heads.horizontal_centering = true
+  heads.prop_set("size", @large_font_size * 1.25)
+  heads.margin_bottom = @space
+end
+
+match("**", Emphasis) do |texts|
+  texts.prop_set("foreground", @default_emphasis_color)
+end
+
+slide_body = [Slide, Body]
+match(*slide_body) do |bodies|
+  bodies.vertical_centering = true
+end
+
+# I don't like blodize, it's bit dirty...
+match(Slide, "**") do |elems|
+  elems.prop_set("weight", "normal")
+end
+#-------------------------
+# lightning talk setting(Takahashi method)
+#-------------------------
+@lightning_talk_proc_name = "lightning-dark-gradation"
+@lightning_talk_as_large_as_possible = true
+@lightning_talk_color = "#ffffffffffff"
+include_theme("lightning-talk-toolkit")
+
+match(Slide) do |slides|
+  slides.each do |slide|
+    if slide.lightning_talk?
+      slide.lightning_talk
+    end
+  end
+end
+# set background-image in slide using Takahashi method
+include_theme("slide-background-image") # 2nd!

data/lib/rabbit/theme/dark-gradation/property.rb

@@ -0,0 +1,3 @@
+@category = N_("Theme")
+@title = N_("Dark Gradation")
+@description = N_("Dark Gradation background theme")

data/lib/rabbit/theme/debian/debian.rb

@@ -1,79 +1,108 @@
-# #--------------------------------------
-# # font size setup
-# #--------------------------------------
-# @xxxx_large_font_size = screen_size(6.5 * Pango::SCALE)
-# @xxx_large_font_size = screen_size(5 * Pango::SCALE)
-# @xx_large_font_size = screen_size(4.5.* Pango::SCALE)
-# @x_large_font_size = screen_size(4 * Pango::SCALE)
-# @large_font_size = screen_size(3.5 * Pango::SCALE)
-# @normal_font_size = screen_size(3 * Pango::SCALE)
-# @small_font_size = screen_size(2.8  * Pango::SCALE)
-# @x_small_font_size = screen_size(2.5 * Pango::SCALE)
-# @xx_small_font_size = screen_size(2.2 * Pango::SCALE)
-# @xxx_small_font_size = screen_size(2 * Pango::SCALE)
-# @script_font_size = @xxx_small_font_size
-# @large_script_font_size = @xx_small_font_size
-# @x_large_script_font_size = @xsmall_font_size
-# #--------------------------------------
-# @title_slide_font_size = @xx_large_font_size
-# @title_slide_title_font_size = @xxxx_large_font_size 
-# @title_slide_subtitle_font_size = @normal_font_size 
-# @title_slide_author_font_size = @xx_large_font_size 
-# @title_slide_content_source_font_size = @_small_font_size
-# @title_slide_institution_font_size = @small_font_size
-# @title_slide_place_font_size = @xx_small_font_size
-# @title_slide_date_font_size = @xx_small_font_size
-# @title_slide_note_font_size = @xxx_small_font_size
+# -*- coding: utf-8 -*-
+#--------------------------------------
+# font size setup
+#--------------------------------------
+@xxxx_large_font_size = screen_size(10 * Pango::SCALE)
+@xxx_large_font_size = screen_size(8 * Pango::SCALE)
+@xx_large_font_size = screen_size(6 * Pango::SCALE)
+@x_large_font_size = screen_size(5 * Pango::SCALE)
+@large_font_size = screen_size(4.5 * Pango::SCALE)
+@normal_font_size = screen_size(3.5 * Pango::SCALE)
+@small_font_size = screen_size(3.2  * Pango::SCALE)
+@x_small_font_size = screen_size(3 * Pango::SCALE)
+@xx_small_font_size = screen_size(2.8 * Pango::SCALE)
+@xxx_small_font_size = screen_size(2.5 * Pango::SCALE)
+@script_font_size = @xxx_small_font_size
+@large_script_font_size = @xx_small_font_size
+@x_large_script_font_size = @xsmall_font_size
+#--------------------------------------
+@title_slide_title_font_size = @xxx_large_font_size
 #--------------------------------------
 # font family setup
 #--------------------------------------
-# using font name in `fc-list -v`
-@default_font = "Sans" 
+@default_font ||= "Sans"
 @font_family = find_font_family(@default_font)
-@bold_font = "Sans" 
+@bold_font ||= "Sans"
 @bold_font_family = find_font_family(@bold_font)
-@monospace_font = "Monospace"
+@monospace_font ||= "Monospace"
 @monospace_font_family = find_font_family(@monospace_font)
-
 #--------------------------------------
-# using default
+# add image path
 #--------------------------------------
 add_image_path("debian-images")
-#include_theme("default")
-# not need slide-number...
-include_theme("default-icon")
-include_theme("default-title-text")
-include_theme("default-text")
-include_theme("default-title-slide")
-include_theme("default-slide")
-include_theme("default-item-mark")
-include_theme("default-method-list")
-include_theme("default-preformatted")
-include_theme("default-block-quote")
-include_theme("default-foot-text")
-include_theme("default-description")
-include_theme("image")
-include_theme("table")
-include_theme("newline-in-slides")
-include_theme("per-slide-background-color")
-include_theme("background-image-toolkit")
-include_theme("per-slide-background-image")
-include_theme("body-background-image")
-include_theme("tag")
-
+add_image_path("ruby-images")
+add_image_path("rabbit-images")
+#--------------------------------------
+# set preformatted text area
+#--------------------------------------
 @preformatted_frame_color = "#242424"
 @preformatted_frame_width = 0.5
 @preformatted_fill_color  = "#fff"
 @preformatted_shadow_color = "#242424"
 @centering_preformatted_block = true
+#--------------------------------------
+# set blockqoute texts area
+#--------------------------------------
+@block_quote_frame_width = 1
+@block_quote_title_font_size = @x_small_font_size * 0.8
+@block_quote_padding_left = screen_x(2)
+@block_quote_padding_right = screen_x(2)
+#--------------------------------------
+# set color of description term underline
+#--------------------------------------
 @description_term_line_color ||= "#ff9900"
+#--------------------------------------
+# set image caption size
+#--------------------------------------
+# @image_frame_width = 0.0
+@image_caption_font_size = @xx_small_font_size * 0.8
+#--------------------------------------
+# use default theme but not use slide number
+#--------------------------------------
+include_theme("default")
+include_theme("title-shadow")
+include_theme("image-timer")
+#----------------------------------------
+# change reference text style
+#----------------------------------------
+match("**", ReferText) do |texts|
+  texts.prop_set("underline", "none")
+  texts.prop_set("foreground", "blue")
+end
+#----------------------------------------
+# change blockqoute text style
+#----------------------------------------
+block_quote = [Slide, Body, BlockQuote]
+item_list_item = [ItemList, ItemListItem]
 
+match(*(block_quote + (item_list_item * 1))) do |items|
+  name = "block-quote-item1"
+
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
 
+  draw_image_mark(items, "item1.png", name)
+end
+#----------------------------------------
+# item mark setup
+#----------------------------------------
+# item setup need update!!
+slide_body = [Slide, Body]
+item_list_item = [ItemList, ItemListItem]
+match(*(slide_body + (item_list_item * 1))) do |items|
+  name = "item1"
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+  draw_image_mark(items, "item1.png", name)
+end
 #--------------------------------------
-# title style changed
+# set title background-image
 #--------------------------------------
 @title_background_image = "debian-logo-pink.png"
 include_theme("title-background-image")
+#--------------------------------------
+# override title slide font props
+#--------------------------------------
 match(TitleSlide) do |contents|
  contents.prop_set("style", "normal")
 end
@@ -81,14 +110,14 @@ match(TitleSlide, ContentSource) do |sources|
   sources.margin_bottom = 0
 end
 match(TitleSlide, Date) do |dates|
-  dates.margin_top = @space 
+  dates.margin_top = @space
 end
 match(TitleSlide, Place) do |places|
 end
 #--------------------------------------
-# title logo position changed
+# set debian logo in title slide
 #--------------------------------------
-@title_logo ||= "debian-whirl.png"
+@title_logo = "debian-whirl.png"
 logo_loader = ImageLoader.new(find_file(@title_logo))
 title_logo = Proc.new do |slide, canvas, x, y, w, h, simulation|
   unless simulation
@@ -103,12 +132,20 @@ match(TitleSlide) do |slides|
   slides.delete_pre_draw_proc_by_name(name2)
   slides.add_pre_draw_proc(name2, &title_logo)
 end
-
-## header/footer settings
-# image loader
-@slide_header ||= "top.png"
-@slide_footer ||= "bottom.png"
-@slide_banner ||= "debian-logo.png"
+#----------------------------------------
+# set slide number at top-right
+#----------------------------------------
+# copy from slide-number.rb
+@slide_number_props = {
+  "size" => @xx_small_font_size * 0.8,
+  "font_family" => @bold_font
+}
+@slide_number_position = :top
+@slide_number_color = "#fff"
+#----------------------------------------
+# per slide header/footer style settings
+#----------------------------------------
+@slide_header = "top.png"
 # Headline Settings
 loader_head = ImageLoader.new(find_file(@slide_header))
 match(Slide, HeadLine) do |heads|
@@ -116,7 +153,7 @@ match(Slide, HeadLine) do |heads|
     head.add_pre_draw_proc("header_bg") do |canvas, x, y, w, h, simulation|
       unless simulation
         loader_head.resize(canvas.width, nil)
-        loader_head.draw(canvas, 
+        loader_head.draw(canvas,
           x + w - canvas.width + @margin_left + @margin_right, 0)
       end
       [x, y, w, h]
@@ -126,8 +163,16 @@ match(Slide, HeadLine) do |heads|
   delete_post_draw_proc_by_name(name)
   heads.margin_left = (canvas.width + @margin_left + @margin_right)/6.0
   heads.margin_right = @margin_right
-  heads.margin_top = @margin_top * 1.3
-  heads.prop_set("size", @xx_large_font_size)
+  heads.margin_bottom = @margin_bottom * 0.5
+  heads.margin_top = @margin_top
+  heads.each do |head|
+    headline_length = 0
+    head.text.split(//u).each_with_index do |chr, idx|
+      headline_length += chr.size > 1 ? 2 : 1
+    end
+    head.margin_top = @margin_top * 0.20 if headline_length >= 26
+  end
+  heads.prop_set("size", @xx_large_font_size )
   heads.prop_set("foreground", "#fff")
   loader_head.resize(canvas.width, nil)
   static_y = loader_head.height - @margin_top
@@ -140,31 +185,9 @@ match(Slide, HeadLine) do |heads|
     [x, static_y, w, original_h - static_y]
   end
 end
-# Slide number settings
-@slide_number_props = {
-  "size" => @x_small_font_size,
-  "font_family" => @bold_font
-}
-@slide_number_color = "#fff"
-match(Slide) do |slides|
-  break if @slide_number_uninstall
-  unless @not_use_slide_number
-    slides.add_post_draw_proc("slide_number") do |slide, canvas, x, y, w, h, simulation|
-      unless simulation
-        text = Text.new("#{canvas.current_index}/#{canvas.slide_size - 1}")
-        text.font @slide_number_props
-        text.align = Pango::Layout::ALIGN_RIGHT
-        text.compile(canvas, x, y, w, h)
-        layout = text.layout
-        layout.set_width(w * Pango::SCALE)
-        num_y = @margin_top
-        canvas.draw_layout(text.layout, x, num_y, @slide_number_color)
-      end
-    [x, y, w, h]
-    end
-  end
-end
 # Footer settings
+@slide_footer = "bottom.png"
+@slide_banner = "debian-logo.png"
 loader_foot = ImageLoader.new(find_file(@slide_footer))
 loader_banner = ImageLoader.new(find_file(@slide_banner))
 match(Slide) do |slides|
@@ -176,7 +199,7 @@ match(Slide) do |slides|
         loader_foot.draw(canvas, 0, canvas.height - footer_height)
         banner_height = canvas.height/26.0
         loader_banner.resize(nil, banner_height)
-        banner_pos_x = canvas.width - loader_banner.width 
+        banner_pos_x = canvas.width - loader_banner.width
         banner_pos_y = canvas.height - loader_banner.height - footer_height
         loader_banner.draw(canvas, banner_pos_x, banner_pos_y)
       end
@@ -184,70 +207,27 @@ match(Slide) do |slides|
     end
   end
 end
-
-# item setup need update!!
+#----------------------------------------
+# slide centering?
+#----------------------------------------
+@slide_centering = true
 slide_body = [Slide, Body]
-item_list_item = [ItemList, ItemListItem]
-match(*(slide_body + (item_list_item * 1))) do |items|
-  name = "item1"
-  items.delete_pre_draw_proc_by_name(name)
-  items.delete_post_draw_proc_by_name(name)
-  draw_image_mark(items, "item1.png", name)
-end
-
-match(*(slide_body + (item_list_item * 2))) do |items|
-  name = "item2"
-  items.delete_pre_draw_proc_by_name(name)
-  items.delete_post_draw_proc_by_name(name)
-  draw_image_mark(items, "item1.png", name)
-end
-
-match(*(slide_body + (item_list_item * 3))) do |items|
-  name = "item3"
-  items.delete_pre_draw_proc_by_name(name)
-  items.delete_post_draw_proc_by_name(name)
-  draw_image_mark(items, "item1.png", name)
-end
-
-enum_list_item = [EnumList, EnumListItem]
-match(*(slide_body + enum_list_item + item_list_item)) do |items|
-  name = "enum-item1"
-  items.delete_pre_draw_proc_by_name(name)
-  items.delete_post_draw_proc_by_name(name)
-  draw_image_mark(items, "item1.png", name)
-end
-
-match(*(slide_body + enum_list_item + (item_list_item * 2))) do |items|
-  name = "enum-item2"
-  items.delete_pre_draw_proc_by_name(name)
-  items.delete_post_draw_proc_by_name(name)
-  draw_image_mark(items, "item1.png", name)
+match(*slide_body) do |bodies|
+  bodies.vertical_centering = @slide_centering
 end
-
-# text changed
-match("**", ReferText) do |texts|
-  texts.prop_set("underline", "none")
-  texts.prop_set("foreground", "blue")
-end
-
-# �ⶶ�᥽�å�
+#----------------------------------------
+# TAKAHASHI method !!
+#----------------------------------------
 @lightning_talk_proc_name = "lightning-debian"
 @lightning_talk_as_large_as_possible = true
-include_theme("title-on-image-toolkit")
 include_theme("lightning-talk-toolkit")
-match(Slide) do |slides|
-  slides.each do |slide|
-    slide.title_on_image if slide.title_on_image?
-  end
-end
 match(Slide) do |slides|
   slides.each do |slide|
     if slide.lightning_talk?
-      # reset header.margin_left
       slide.headline.margin_left = @margin_left
       slide.lightning_talk
     end
   end
 end
-
+include_theme("per-slide-background-image")