rabbit 1.0.3 → 1.0.4

data/doc/_site/screenshot.en.rab

@@ -0,0 +1,10 @@
+= Rabbit
+
+: subtitle
+   A presentation tool for Rubyist
+
+: author
+   Kouhei Sutou
+
+: institution
+   COZMIXNG

data/doc/_site/screenshot.ja.rab

@@ -0,0 +1,10 @@
+= Rabbit
+
+: subtitle
+   Rubyist用プレゼンツール
+
+: author
+   須藤功平
+
+: institution
+   COZMIXNG

data/doc/en/how-to-make/theme.rd

@@ -39,7 +39,7 @@ page except the title page.
 
 You can set some properties by using
 (({prop_set})). ((<Pango Text Attribute
-Markup|URL:http://developer.gnome.org/doc/API/2.4/pango/PangoMarkupFormat.html>))
+Markup|URL:http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>))
 has more information.
 
 : font_desc

data/doc/en/index.rd

@@ -280,3 +280,5 @@ Here is a contributor list. Thanks to them!!!
     * Contributed Rabbit control command by Wii Remote.
   * Nobuyoshi Nakada:
     * Suggested about console availability check way on Windows.
+  * Ken Muryoi:
+    * Fixed a bug in document.

data/doc/en/news.rd

@@ -3,6 +3,31 @@ layout: en
 title: News
 apply_data: false
 ---
+== 1.0.4: 2011-08-06
+
+Theme improvements release!
+
+=== Improvements
+
+==== Theme
+
+  * nari: Added. This is for nari. [Created by nari]
+  * image-slide-number: Changed the default here to a cute here.
+  * image-slide-number: Supported flag color customize.
+  * image-timer: Changed the default tortoise to a cute tortoise.
+  * rubykaigi2011: Supported the tortoise and the here.
+
+=== Fixes
+
+==== Documentation
+
+  * Fixed Pango link. [Patch by Ken Muryoi]
+
+=== Thanks
+
+  * nari
+  * Ken Muryoi
+
 == 1.0.3: 2011-07-17
 
 A bug fix release of 1.0.2.

data/doc/en/users.rd

@@ -13,8 +13,12 @@ some other active spots.
 
 === Mailing list
 
-There is a rabbit-shockers-en mailing list for Shockers. You
-can subscribe the mailing list by sending the following mail:
+There is a rabbit-shockers-en mailing list for Shockers.
+(((<archive|URL:http://www.cozmixng.org/~w3ml/index.rb/rabbit-shockers-en/>)))
+
+
+You can subscribe the mailing list by sending the following
+mail:
 
   To: rabbit-shockers@ml.cozmixng.org
   Cc: kou@cozmixng.org

data/doc/index.html.en

@@ -35,6 +35,8 @@ no_sidebar: true
              alt="Red Frame theme" /></li>
     <li><img src="images/screenshots/en/ruby-gnome2.png"
              alt="Ruby-GNOME2 theme" /></li>
+    <li><img src="images/screenshots/en/rubykaigi2011.png"
+             alt="RubyKaigi2011 theme" /></li>
   </ul>
 </section>
 

data/doc/index.html.ja

@@ -35,6 +35,8 @@ no_sidebar: true
              alt="赤い枠テーマ" /></li>
     <li><img src="images/screenshots/ja/ruby-gnome2.png"
              alt="Ruby-GNOME2テーマ" /></li>
+    <li><img src="images/screenshots/ja/rubykaigi2011.png"
+             alt="日本Ruby会議2011テーマ" /></li>
   </ul>
 </section>
 

data/doc/ja/how-to-make/theme.rd

@@ -43,7 +43,7 @@ title: テーマの作り方
 
 (({prop_set}))では前景色（foreground）以外にも以下のものが指
 定できます．詳しくは((<Pango Text Attribute
-Markup|URL:http://developer.gnome.org/doc/API/2.4/pango/PangoMarkupFormat.html>))
+Markup|URL:http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>))
 を見てください．
 
 : font_desc

data/doc/ja/index.rd

@@ -286,3 +286,5 @@ data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-black.jpg
   * なかださん:
     * Windowsでコンソールが利用可能かどうかを検出する方法を
       教えてくれました。
+  * 無量井健さん:
+    * ドキュメントのバグを直してくれました。

data/doc/ja/news.rd

@@ -3,6 +3,31 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 1.0.4: 2011-08-06
+
+テーマ改良リリース！
+
+=== 改良
+
+==== テーマ
+
+  * nari: 追加。nariさん用テーマ。[nariさんが作成]
+  * image-slide-number: デフォルトのうさぎをかわいいうさぎに変更。
+  * image-slide-number: 旗の色をカスタマイズできるようにした。
+  * image-timer: デフォルトのかめをかわいいかめに変更。
+  * rubykaigi2011: うさぎとかめに対応。
+
+=== 修正
+
+==== ドキュメント
+
+  * Pangoのリンクを修正。[無量井さんが修正]
+
+=== 感謝
+
+  * nariさん
+  * 無量井さん
+
 == 1.0.3: 2011-07-17
 
 1.0.2のバグフィックスバージョン。

data/doc/ja/users.rd

@@ -14,8 +14,10 @@ Rabbitユーザのコミュニティとして「ショッカー」がありま
 === メーリングリスト
 
 ショッカーのためにrabbit-shockersというメーリングリストがあ
-ります。以下のようなメールを送るとメーリングリストへ参加でき
-ます。
+ります。
+（((<アーカイブ|URL:http://www.cozmixng.org/~w3ml/index.rb/rabbit-shockers/>))）
+
+以下のようなメールを送るとメーリングリストへ参加できます。
 
   To: rabbit-shockers@ml.cozmixng.org
   Cc: kou@cozmixng.org

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 
   TMP_DIR_NAME = ".tmp"
 

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

@@ -2,7 +2,7 @@ add_image_path("rabbit-images")
 
 proc_name = "image-slide-number"
 
-@image_slide_number_image ||= "mini-usagi.png"
+@image_slide_number_image ||= "mini-usa-taro.png"
 @image_slide_number_show_text ||= false
 @image_slide_number_font_size ||= @xx_small_font_size
 @image_slide_number_text_color ||= "white"
@@ -14,6 +14,8 @@ end
 @image_slide_number_start_image ||= "start-flag.png"
 @image_slide_number_goal_image ||= "goal-flag.png"
 @image_slide_number_space_ratio ||= 1.0 / 12.0
+@image_slide_number_start_flag_color ||= "red"
+@image_slide_number_goal_flag_color ||= "blue"
 
 @image_slide_number_margin_left ||= nil
 @image_slide_number_margin_right ||= nil
@@ -82,12 +84,12 @@ match(Slide) do |slides|
             "flag_type" => @image_slide_number_flag_type,
             "text" => "%0#{max_text_length}d" % slide.index,
             "text_attributes" => text_attributes,
-            "flag_color" => "red",
+            "flag_color" => @image_slide_number_start_flag_color,
           }
           canvas.draw_flag(start_base_x, base_y, loader.height, props)
 
           props["text"] = (canvas.slide_size - 1).to_s
-          props["flag_color"] = "blue"
+          props["flag_color"] = @image_slide_number_goal_flag_color
           canvas.draw_flag(goal_base_x, base_y, loader.height, props)
         else
           start_loader.draw(canvas, start_base_x, base_y,

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

@@ -20,7 +20,7 @@ end
 
 @image_timer_auto_scroll_direction ||= :left
 
-@image_timer_image ||= "kame.png"
+@image_timer_image ||= "mini-kame-taro.png"
 @image_timer_interval ||= 5
 @image_timer_space_ratio ||= 1.0 / 12.0
 

data/lib/rabbit/theme/nari/nari.rb

@@ -0,0 +1,213 @@
+# base
+base_color = "#458cff"
+base_light_color = "#666666"
+base_light_background_color = "#e9ffff"
+base_background_color = "#ffffff"
+
+set_graffiti_color("#{base_color}99")
+set_graffiti_line_width(30)
+
+set_progress_foreground(base_color)
+set_progress_background(base_background_color)
+
+@default_item1_mark_color = base_light_color
+@default_item1_mark_type = "check"
+@default_item2_mark_color = base_light_color
+@default_item2_mark_type = "check"
+@default_item3_mark_color = base_light_color
+@default_item3_mark_type = "check"
+@default_enum_item1_mark_color = base_light_color
+@default_enum_item1_mark_type = "check"
+@default_enum_item2_mark_color = base_light_color
+@default_enum_item2_mark_type = "check"
+@default_description_item1_mark_color = base_light_color
+@default_block_quote_item1_mark_color = base_light_color
+@description_term_line_color = base_light_color
+
+@default_emphasis_color = base_color
+
+@preformatted_frame_color = base_light_color
+@preformatted_fill_color = base_background_color
+
+@block_quote_frame_color = base_light_color
+@block_quote_fill_color = base_background_color
+
+@table_frame_color = base_light_color
+@table_fill_color = base_background_color
+@table_body_frame_color = base_light_color
+@table_body_fill_color = base_background_color
+@table_head_frame_color = base_light_color
+@table_head_fill_color = base_light_background_color
+
+add_image_path("rabbit-images")
+
+@block_quote_open_quote_image = "open-quote-blue.png"
+@block_quote_close_quote_image = "close-quote-blue.png"
+
+@margin_bottom = canvas.height * 0.05
+@font_family = find_font_family("Times")
+@monospace_font_family = find_font_family("Times")
+
+@slide_number_uninstall = !print?
+if print?
+  include_theme("slide-number")
+end
+
+include_theme("default")
+include_theme("newline-in-title")
+
+match(TitleSlide, "*") do |elements|
+  elements.horizontal_centering = false
+  elements.align = :right
+  set_font_family(elements)
+end
+
+match(TitleSlide, Title) do |titles|
+  titles.padding_bottom = @space * 2
+end
+
+match(Slide, HeadLine) do |heads|
+  name = "head-line"
+  heads.delete_post_draw_proc_by_name(name)
+  heads.horizontal_centering = true
+  set_font_family(heads)
+end
+
+match(Slide, Body) do |bodies|
+  bodies.vertical_centering = true
+  bodies.each do |body|
+    set_font_family(body)
+    next if body.elements.all? {|element| element.is_a?(Image)}
+    next if body.elements.any? {|element| element.is_a?(BlockQuote)}
+    next if body.elements.any? {|element| element.is_a?(PreformattedBlock)}
+    next if body.elements.any? {|element| element.is_a?(Table)}
+    body.margin_left = canvas.width * 0.05
+    body.margin_right = canvas.width * 0.05
+  end
+end
+
+add_image_path("nari-images")
+unless print?
+  @image_slide_number_image ||= "gc_kun.png"
+  @image_slide_number_start_image = "nari-start-flag.png"
+  @image_slide_number_goal_image = "nari-goal-flag.png"
+  include_theme("image-slide-number")
+  if canvas.allotted_time
+    @image_timer_image ||= "chibi_nari.png"
+    include_theme("image-timer")
+  end
+end
+
+@slide_footer_info_left_text ||= canvas.title
+@slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
+include_theme("slide-footer-info")
+
+# takahashi method
+@lightning_talk_proc_name = "lightning-simple"
+@lightning_talk_as_large_as_possible = true
+
+include_theme("lightning-talk-toolkit")
+
+match(Slide) do |slides|
+  slides.each do |slide|
+    if slide.lightning_talk?
+      slide.lightning_talk
+    end
+  end
+end
+
+@lightning_talk_nari_slide_params = {}
+
+def slide_params(slide)
+  res = {}
+  if !slide["size"].nil? && !slide["size"].empty?
+    res[:size] = screen_size(slide["size"].to_i * Pango::SCALE)
+  end
+  %w(color family backgroundcolor).each do |key|
+    unless slide[key].nil? || slide[key].empty?
+      slide_key = key == "backgroundcolor" ? "background_color" : key
+      res[slide_key.to_sym] = slide[key]
+    end
+  end
+  res[:as_large_as_possible] = false unless res.empty?
+  res
+end
+
+
+# All slide property were used first slide property.
+match(Slide) do |slides|
+  slides.each_with_index do |slide, index|
+    if index.zero?
+      @lightning_talk_nari_slide_params = slide_params(slide)
+    end
+    if slide.lightning_talk?
+      adhock_params = slide_params(slide)
+      slide.lightning_talk(
+        adhock_params.empty? ? @lightning_talk_nari_slide_params : adhock_params)
+    end
+  end
+end
+
+include_theme("per-slide-background-color")
+include_theme("per-slide-background-image")
+
+# headline-position
+#
+# Usage: 
+#  :headline-position
+#    bottom-right
+match(Slide) do |slides|
+  slides.each do |slide|
+    headline_position = slide["headline-position"]
+    next if headline_position.nil?
+
+    head = slide.headline
+    head.horizontal_centering = false
+    head.vertical_centering = false
+
+    case headline_position.split("-").first
+    when "top"
+      head.margin_bottom = canvas.height * 0.5
+    when "bottom"
+      head.align = :right
+      head.margin_top = canvas.height * 0.5
+    end
+
+    case headline_position.split("-")[1]
+    when "right"
+      head.align = :right
+      head.margin_right = canvas.width * 0.05
+    when "left"
+      head.align = :left
+      head.margin_left = canvas.width * 0.05
+    when "center"
+      head.align = :center
+    end
+  end
+end
+
+# background-image-credit
+#
+# Usage: 
+#  :background-image
+#    images/steal_rabbit.jpg
+#  :background-image-credit
+#    http://www.flickr.com/photos/ryanr/157458385/
+match(Slide) do |slides|
+  slides.each do |slide|
+    credit = slide["background-image-credit"]
+    next if credit.nil?
+
+    slide.add_pre_draw_proc(name) do |canvas, x, y, w, h, simulation|
+      props = {
+        "font_family" => slide[:family],
+        "size" => screen_size(1.5 * Pango::SCALE),
+        "color" => "#666",
+      }
+      right_layout = make_layout(span(props, credit))
+      text_width, text_height = right_layout.pixel_size
+      canvas.draw_layout(right_layout, (canvas.width - text_width - screen_x(1)), canvas.height - @margin_bottom)
+      [x, y, w, h]
+    end
+  end
+end