rabbit 0.6.4 → 0.9.0

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

@@ -0,0 +1,8 @@
+match(Slide, Body) do |bodies|
+  options = {
+    :proc_name => "body-background-image",
+  }
+  bodies.each do |body|
+    apply_background_image_property(body, options)
+  end
+end

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

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

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

@@ -5,10 +5,6 @@ set_foreground(@default_foreground)
 set_background(@default_background)
 
 add_image_path("ruby-images")
-include_theme("image")
-include_theme("table")
-include_theme("newline-in-slides")
-include_theme("slide-number")
 include_theme("default-icon")
 include_theme("default-title-text")
 include_theme("default-text")
@@ -20,3 +16,15 @@ 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("slide-number")
+
+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")

data/lib/rabbit/theme/per-slide-background-image/per-slide-background-image.rb

@@ -1,39 +1,11 @@
-proc_name = "per-slide-background-image"
-
 match(Slide) do |slides|
-  slides.each do |slide|
-    slide.delete_pre_draw_proc_by_name(proc_name)
-
-    background_image = slide["background-image"]
-    next if background_image.nil?
-
-    properties = {}
-    slide.user_property.each do |name, value|
-      if /\Abackground-image-/ =~ name
-        properties[$POSTMATCH.gsub(/-/, '_')] = value
-      end
-    end
-    image = Image.new(canvas.full_path(background_image), properties)
-    image.horizontal_centering = true
-    image.vertical_centering = true
-    slide.add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
-      if simulation
-        _x, _y, _w, _h = 0, 0, canvas.width, canvas.height
-        image.compile(canvas, _x, _y, _w, _h)
-        if image.do_vertical_centering?
-          adjust_height = ((_h - image.height - image.padding_bottom) / 2.0).ceil
-          if _y + adjust_height > 0
-            _y += adjust_height
-            _h -= adjust_height
-            image.compile(canvas, _x, _y, _w, _h)
-          end
-        end
-        if image.do_horizontal_centering?
-          image.do_horizontal_centering(canvas, _x, _y, _w, _h)
-        end
-      end
-      image.draw(simulation)
-      [x, y, w, h]
+  options = {
+    :proc_name => "per-slide-background-image",
+    :compute_initial_geometry => Proc.new do |canvas, x, y, w, h|
+      [0, 0, canvas.width, canvas.height]
     end
+  }
+  slides.each do |slide|
+    apply_background_image_property(slide, options)
   end
 end

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

@@ -96,6 +96,12 @@ match(*(all_table + [TableHead, TableRow, TableHeader])) do |headers|
     end
     [x, y, w, h]
   end
+
+  headers.add_post_draw_proc(name) do |header, canvas, x, y, w, h, simulation|
+    moved_x = header.width + header.padding_left + header.padding_right
+    moved_y = header.height - header.padding_top - header.padding_bottom
+    [x + moved_x, y - moved_y, w - moved_x, h + moved_y]
+  end
 end
 
 match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
@@ -123,7 +129,9 @@ match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
 
   cells.each do |cell|
     orig_x = nil
+    orig_y = nil
     orig_w = nil
+    orig_h = nil
     cell_w = nil
     width_not_set = true
 
@@ -132,21 +140,15 @@ match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
     
     cell.add_pre_draw_proc(name) do |canvas, x, y, w, h, simulation|
       orig_x = x
+      orig_y = y
       orig_w = w
+      orig_h = h
       if simulation
         cell_w = table.available_w / row.elements.size
         base_y = y + cell.padding_top
         text_width = cell_w - cell.padding_left - cell.padding_right
-        
-        need_recompile = false
-        if cell.layout.nil? or cell.layout.pixel_size[0] > text_width
-          need_recompile = true
-        elsif width_not_set
-          need_recompile = true
-          width_not_set = false
-        end
-        
-        if need_recompile
+
+        if cell.layout.nil? or cell.width > text_width
           cell.dirty!
           cell.text_compile(canvas, x, base_y, text_width, h)
         end
@@ -155,7 +157,7 @@ match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
     end
 
     cell.add_post_draw_proc(name) do |canvas, x, y, w, h, simulation|
-      [orig_x + cell_w, y, orig_w - cell_w, h]
+      [orig_x + cell_w, orig_y, orig_w - cell_w, orig_h]
     end
 
     draw_frame(cell, params) do |_, canvas, x, y, w, h|

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

@@ -0,0 +1,4 @@
+@category = N_("Toolkit")
+@title = N_("Tag")
+@abstract = N_("Toolkit to apply custom tag")
+@description = N_("Applyes custom tag style.")

data/lib/rabbit/theme/tag/tag.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+@tag_uninstall ||= false
+
+theme_exit if @tag_uninstall
+
+match("**", CustomTag) do |tags|
+  find_block_element = lambda do |tag|
+    element = tag
+    while element.inline_element?
+      element = element.parent
+    end
+    element
+  end
+
+  find_markup_target = lambda do |tag|
+    if tag.elements.empty?
+      tag.parent
+    else
+      tag
+    end
+  end
+
+  tags.each do |tag|
+    case tag.name
+    when "center"
+      find_block_element.call(tag).horizontal_centering = true
+    when "right"
+      find_block_element.call(tag).align = "right"
+    when "x-large"
+      find_markup_target.call(tag).prop_set("size", @x_large_font_size)
+    end
+  end
+end
+

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

@@ -1,25 +1,27 @@
-proc_name = "title-background-image"
-
 if @title_background_image.nil?
   theme_exit("must specify @title_background_image!!")
 end
 
-match(TitleSlide) do |slides|
-  loader = ImageLoader.new(find_file(@title_background_image))
-  resized = false
-
-  slides.delete_pre_draw_proc_by_name(proc_name)
+@title_background_image_properties ||= {}
+default_title_backgroud_image_properties = {
+  "as_large_as_possible" => true,
+  "align" => "center",
+  "assign_box" => false,
+  "keep_ratio" => true,
+}
 
-  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
+match(TitleSlide) do |slides|
+  slides.each do |slide|
+    image_properties = default_title_backgroud_image_properties.dup
+    @title_background_image_properties.each do |key, value|
+      value = value.to_s if value.is_a?(Symbol)
+      image_properties[key.to_s.gsub(/-/, "_")] = value
     end
-    [x, y, w, h]
+    properties = {
+      :file_name => find_file(@title_background_image),
+      :proc_name => "title-background-image",
+      :properties => image_properties,
+    }
+    apply_background_image_property(slide, properties)
   end
 end

data/sample/rabbit-en.rd

@@ -1,6 +1,6 @@
 # To run with it without system install.
 #  % ruby -I./lib bin/rabbit -f sample/rabbit-en.rd
-# $Id: rabbit-en.rd 1260 2009-06-27 13:38:12Z kou $
+# $Id: rabbit-en.rd 1409 2010-09-25 12:49:27Z kou $
 
 = Rabbit(en)
 
@@ -106,6 +106,14 @@ A presentation tool
   * Theme reload
   * Change theme
 
+= Features: Tag
+
+(('tag:x-large:Large Text'))
+
+(('tag:center'))Centerized Text
+
+(('tag:right'))Right-Justified Text
+
 = ToDo
 
   * Inline images
@@ -134,6 +142,38 @@ A presentation tool
   # relative_height = 80
   # reflect_ratio = 0.5
 
+= Image: Background (1)
+
+  * Background image
+  * Centering by default
+
+== Properties
+
+: background-image
+   lavie.png
+
+: background-image-relative-width
+   50
+
+# : background-image-align
+#    right
+
+: background-image-relative-margin-right
+   3
+
+= Image: Background (2)
+
+    # image
+    # src = lavie.png
+    # relative-width = 30
+    # align = right
+#    # vertical-align = top
+    # relative-margin-right = -5
+
+  * Right justified backgorund image
+  * Specify in slide
+    * align = right
+
 = Image size
 
 Relative image sizes
@@ -206,6 +246,25 @@ Create EPS ahead of time((-needs gs-))
   # src = rabbit.xcf
   # relative_height = 100
 
+= aafigure
+
+  # aafigure
+  # relative_width = 90
+#  # foreground = #ff3333
+  A   B   C   D   E   F   G   H   I   J   K   L   M
+   AA  BB  CC  DD  EE  FF  GG  HH  II  JJ  KK  LL  MM
+   AA  BB  CC  DD  EE  FF  GG  HH  II  JJ  KK  LL  MM
+
+   aa  bb  cc  dd  ee  ff  gg  hh  ii  jj  kk  ll  mm
+   aa  bb  cc  dd  ee  ff  gg  hh  ii  jj  kk  ll  mm
+
+  N   O   P   Q   R   S   T   U   V   W   X   Y   Z
+   NN  OO  PP  QQ  RR  SS  TT  UU  VV  WW  XX  YY  ZZ
+   NN  OO  PP  QQ  RR  SS  TT  UU  VV  WW  XX  YY  ZZ
+
+   nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
+   nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
+
 = Word Wrapping
 
 looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong
@@ -317,6 +376,35 @@ End of source code.
 : Toggle info window
    I
 
+= Op.: On stage (3)
+
+: Magnifier
+   Ctrl + right click
+
+   Change scale by wheel
+
+: Spotlight
+   Double right clicks
+
+   Change radius by wheel
+
+= Op.: On stage (4)
+
+: Graffiti
+   Popup menu (right click) (('→'))\n
+   "Graffiti mode"
+
+: Mouse gesture
+   Right button drag
+
+= Op.: On stage (5)
+
+: Whiteout
+   W
+
+: Blackout
+   B
+
 = Op.: Save
 
 : Screenshot

data/sample/rabbit.rd

@@ -1,6 +1,6 @@
 # To run with it without system install.
-#  % ruby -I./lib bin/rabbit -f sample/rabbit.rd 
-# $Id: rabbit.rd 1260 2009-06-27 13:38:12Z kou $
+#  % ruby -I./lib bin/rabbit -f sample/rabbit.rd
+# $Id: rabbit.rd 1409 2010-09-25 12:49:27Z kou $
 
 = Rabbit
 
@@ -107,6 +107,14 @@
   * テーマの再読み込み
   * テーマの切り替え
 
+= 機能: タグ
+
+(('tag:x-large:大きなテキスト'))
+
+(('tag:center'))中央寄せされたテキスト
+
+(('tag:right'))右寄せされたテキスト
+
 = ToDo
 
   * インラインでの画像表示
@@ -134,6 +142,38 @@
   # relative_height = 80
   # reflect_ratio = 0.5
 
+= 画像: 背景（1）
+
+  * 背景画像
+  * デフォルトはセンタリング
+
+== プロパティ
+
+: background-image
+   lavie.png
+
+: background-image-relative-width
+   50
+
+# : background-image-align
+#    right
+
+# : background-image-relative-margin-right
+#    3
+
+= 画像: 背景（2）
+
+    # image
+    # src = lavie.png
+    # relative-width = 30
+    # align = right
+#    # vertical-align = top
+    # relative-margin-right = -5
+
+  * 右寄せ背景画像
+  * スライド内で指定
+    * align = right
+
 = 画像サイズ
 
 スライドサイズに応じて変更可能
@@ -203,6 +243,27 @@ URL先の画像をダウンロード
   # src = rabbit.xcf
   # relative_height = 100
 
+= aafigure
+
+  # aafigure
+  # relative_width = 90
+#  # foreground = #ff3333
+#  # option = font=mikachan
+  あいうえお
+  A   B   C   D   E   F   G   H   I   J   K   L   M
+   AA  BB  CC  DD  EE  FF  GG  HH  II  JJ  KK  LL  MM
+   AA  BB  CC  DD  EE  FF  GG  HH  II  JJ  KK  LL  MM
+
+   aa  bb  cc  dd  ee  ff  gg  hh  ii  jj  kk  ll  mm
+   aa  bb  cc  dd  ee  ff  gg  hh  ii  jj  kk  ll  mm
+
+  N   O   P   Q   R   S   T   U   V   W   X   Y   Z
+   NN  OO  PP  QQ  RR  SS  TT  UU  VV  WW  XX  YY  ZZ
+   NN  OO  PP  QQ  RR  SS  TT  UU  VV  WW  XX  YY  ZZ
+
+   nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
+   nn  oo  pp  qq  rr  ss  tt  uu  vv  ww  xx  yy  zz
+
 = 折り返し
 
 なーーーーーーーーーーーーーーーーーーーーーーーーーーーーーがーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーい行
@@ -324,6 +385,34 @@ URL先の画像をダウンロード
 : 情報ウィンドウ表示切替え
    I
 
+= 操作: 本番用（3）
+
+: 虫眼鏡
+   Ctrl+右クリック
+
+   ホイールで拡大率変更
+
+: スポットライト
+   ダブル右クリック
+
+   ホイールで半径変更
+
+= 操作: 本番用（4）
+
+: 落書き
+   ポップアップ（右クリック）→\n落書きモード
+
+: マウスジェスチャー
+   右ドラッグ
+
+= 操作: 本番用（5）
+
+: ホワイトアウト
+   W
+
+: ブラックアウト
+   B
+
 = 操作: 保存
 
 : スクリーンショット