rabbit 1.0.1 → 1.0.2

data/Rakefile

@@ -159,6 +159,7 @@ EOC
        "--exclude", "*.svg",
        "--exclude", "*.rab",
        "--exclude", "/download/",
+       "--exclude", "/samples/",
        "doc/_site/",
        rsync_base_path)
   end

data/data/rabbit/image/rubykaigi2011-images/property.rb

@@ -0,0 +1,4 @@
+@category = N_("Image")
+@title = N_("RubyKaigi2011Image")
+@abstract = N_("Images related to RubyKaigi2011")
+@description = N_("Provides images related to RubyKaigi2011.")

data/data/rabbit/image/rubykaigi2011-images/rubykaigi2011-images.rb

@@ -0,0 +1,2 @@
+# empty theme to add load path to images in the directory.
+

data/doc/_layouts/en.html

@@ -22,7 +22,7 @@ country: US
   {{ content }}
   <nav id="sidebar">
     <h3>The Latest Release</h3>
-    <p><a href="en/news.html">1.0.1</a> is the latest release. It had been released at 2011-07-15.</p>
+    <p><a href="en/news.html">1.0.2</a> is the latest release. It had been released at 2011-07-15.</p>
     <h3>Links</h3>
     <ul>
       <li><a href="/en/">README</a></li>

data/doc/_layouts/ja.html

@@ -22,7 +22,7 @@ country: JP
   {{ content }}
   <nav id="sidebar">
     <h3>最新リリース</h3>
-    <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.1</a>が最新リリースです。</p>
+    <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.2</a>が最新リリースです。</p>
     <h3>リンク</h3>
     <ul>
       <li><a href="/ja/">はじめに</a></li>

data/doc/en/news.rd

@@ -3,6 +3,37 @@ layout: en
 title: News
 apply_data: false
 ---
+== 1.0.2: 2011-07-15
+
+RubyKaigi2011 release.
+
+=== Improvements
+
+==== Core
+
+  * Re-supported GTK+ 2.20. (For Debian GNU/Linux squeeze)
+    [Reported by akira yamada]
+
+==== Theme
+
+  * title-slide-background-image: Added. It shows background
+    image with title slide slide.
+  * table: Supported font color customize.
+  * rubykaigi2011: Added. It's for RubyKaigi2011.
+
+=== Fixes
+
+==== Theme
+
+  * default-item-mark-setup: Fixed duplicated font name
+    specified error.
+  * edge-info-toolkit: Fixed duplicated font name
+    specified error.
+
+=== Thanks
+
+  * yamada akira
+
 == 1.0.1: 2011-07-15
 
 A bug fix release of 1.0.0.
@@ -124,8 +155,8 @@ The first major release! We spent seven years for it!
 
 === Thanks
 
-  * おばたさん
-  * znzさん
+  * OBATA Akio
+  * znz
 
 == 0.9.3: 2011-06-25
 

data/doc/index.html.en

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p><a href="/en/news.html">1.0.1</a> is the latest release. It had been released at 2011-07-15.</p>
+  <p><a href="/en/news.html">1.0.2</a> is the latest release. It had been released at 2011-07-15.</p>
 </div>
 
 <section class="screenshots">

data/doc/index.html.ja

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.1</a>が最新リリースです。</p>
+  <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.2</a>が最新リリースです。</p>
 </div>
 
 <section class="screenshots">

data/doc/ja/news.rd

@@ -3,6 +3,35 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 1.0.2: 2011-07-15
+
+日本Ruby会議2011リリース。
+
+=== 改良
+
+==== 本体
+
+  * GTK+ 2.20を再サポート。（Debian GNU/Linux squeezeのため）
+    [やまだあきらさんが報告]
+
+==== テーマ
+
+  * title-slide-background-image: 追加。タイトルスライドのス
+    ライドいっぱいに背景画像を表示する。
+  * table: 文字の色のカスタマイズに対応。
+  * rubykaigi2011: 追加。日本Ruby会議2011用テーマ。
+
+=== 修正
+
+==== テーマ
+
+  * default-item-mark-setup: フォント名の重複指定エラーを修正。
+  * edge-info-toolkit: フォント名の重複指定エラーを修正。
+
+=== 感謝
+
+  * やまだあきらさん
+
 == 1.0.1: 2011-07-15
 
 1.0.0のバグフィックスバージョン。

data/lib/rabbit/keys.rb

@@ -1,6 +1,14 @@
 require "gtk2"
 require "rabbit/utils"
 
+# For GTK+ < 2.22
+unless Gdk::Keyval.const_defined?(:GDK_KEY_Escape)
+  Gdk::Keyval.constants.each do |name|
+    Gdk::Keyval.const_set(name.to_s.sub(/\AGDK_/, "GDK_KEY_"),
+                          Gdk::Keyval.const_get(name))
+  end
+end
+
 module Rabbit
   module Keys
 

data/lib/rabbit/rabbit.rb

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

data/lib/rabbit/theme/base/base.rb

@@ -44,11 +44,13 @@ set_background(@background)
 @table_cell_padding_right = screen_x(2)
 @table_cell_padding_top = screen_y(0.5)
 @table_cell_padding_bottom = screen_y(0.5)
+@table_cell_font_props = {}
 
 @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_header_font_props = {}
 
 @table_caption_space = screen_y(2)
 @table_caption_color = "black"

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

@@ -93,7 +93,7 @@ def setup_default_enum_item_mark(items, name, indent, space_ratio, props,
   indent_width = screen_x(indent)
   indent_width = option_value.call("indent_width", indent_width) || indent_width
   default_props = {
-    "font_family" => @font_family,
+    "font-family" => @font_family,
   }.merge(props)
 
   delete_pre_draw_proc_by_name(name)

data/lib/rabbit/theme/edge-info-toolkit/edge-info-toolkit.rb

@@ -32,7 +32,7 @@ match(SlideElement) do |slides|
                            line_color, line_params.merge(line_width_params))
 
           props = {
-            "font_family" => applier[:font_family],
+            "font-family" => applier[:font_family],
             "size" => text_size,
             "color" => text_color,
           }

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

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

data/lib/rabbit/theme/rubykaigi2011/rubykaigi2011.rb

@@ -0,0 +1,47 @@
+add_image_path("rubykaigi2011-images")
+
+line_color = "#999999"
+dark_color = "#160F0D"
+fill_color = "#ffffff4d"
+
+@foreground = dark_color
+
+@default_headline_line_color ||= line_color
+@description_term_line_color ||= line_color
+
+@default_description_item1_mark_color ||= dark_color
+@default_block_quote_item1_mark_color ||= dark_color
+
+@preformatted_frame_color ||= line_color
+@preformatted_fill_color ||= fill_color
+
+@block_quote_frame_color ||= line_color
+@block_quote_fill_color ||= fill_color
+
+@table_frame_color = line_color
+@table_fill_color = fill_color
+@table_head_frame_color = line_color
+@table_head_fill_color = dark_color
+@table_header_font_props[:color] = "white"
+
+@slide_number_uninstall = true
+
+include_theme("default")
+
+@lightning_talk_proc_name = "lightning-rabbit"
+@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
+
+background_image = "rubykaigi2011-background-white.jpg"
+@title_slide_background_image = background_image
+@slide_background_image = background_image
+include_theme("title-slide-background-image")
+include_theme("slide-background-image")

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

@@ -75,6 +75,7 @@ match(*(all_table + [TableHead, TableRow, TableHeader])) do |headers|
   headers.delete_post_draw_proc_by_name(name)
   
   headers.prop_set("size", @normal_font_size)
+  headers.font(@table_header_font_props)
   set_font_family(headers)
   
   draw_frame(headers, params) do |header, canvas, x, y, w, h|
@@ -116,6 +117,7 @@ match(*(all_table + [TableBody, TableRow, TableCell])) do |cells|
 
   cells.prop_set("size", @normal_font_size)
   set_font_family(cells)
+  cells.font(@table_cell_font_props)
 
   cells.padding_left = @table_cell_padding_left
   cells.padding_right = @table_cell_padding_right

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

@@ -0,0 +1,10 @@
+@category = N_("Toolkit")
+@title = N_("TitleSlideBackgroundImage")
+@abstract = N_("Toolkit to display an image as a background of the title slide")
+@description = N_("Displays an image as a background of the title slide.")
+@parameters = {
+  "@title_slide_background_image" => {
+    :default => N_("(Must be specified.)"),
+    :description => N_("Image file name."),
+  },
+}

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

@@ -0,0 +1,25 @@
+proc_name = "title-slide-background-image"
+
+if @title_slide_background_image.nil?
+  theme_exit("must specify @title_slide_background_image!!")
+end
+
+match(TitleSlide) do |slides|
+  loader = ImageLoader.new(find_file(@title_slide_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

data/sample/theme-bench-en.rab

@@ -84,7 +84,7 @@ For benchmarking a theme
 
 = Source
 
-  # enscript ruby
+  # coderay ruby
   class You
     def love?(it)
       it == "Rabbit"

data/sample/theme-bench.rab

@@ -84,7 +84,7 @@
 
 = ソース
 
-  # enscript ruby
+  # coderay ruby
   class You
     def love?(it)
       it == "Rabbit"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rabbit
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -337,6 +337,10 @@ files:
 - data/rabbit/image/ruby-images/ruby-pink-polygon-logo.png
 - data/rabbit/image/ruby-images/ruby-pink-polygon-small-icon.png
 - data/rabbit/image/ruby-images/ruby-pink-polygon.png
+- data/rabbit/image/rubykaigi2011-images/property.rb
+- data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-black.jpg
+- data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-white.jpg
+- data/rabbit/image/rubykaigi2011-images/rubykaigi2011-images.rb
 - doc/_config.yml
 - doc/_layouts/en.html
 - doc/_layouts/ja.html
@@ -823,6 +827,8 @@ files:
 - lib/rabbit/theme/ruby-gnome2-slide/ruby-gnome2-slide.rb
 - lib/rabbit/theme/ruby-gnome2/property.rb
 - lib/rabbit/theme/ruby-gnome2/ruby-gnome2.rb
+- lib/rabbit/theme/rubykaigi2011/property.rb
+- lib/rabbit/theme/rubykaigi2011/rubykaigi2011.rb
 - lib/rabbit/theme/scroll-effect/property.rb
 - lib/rabbit/theme/scroll-effect/scroll-effect.rb
 - lib/rabbit/theme/searcher.rb
@@ -864,6 +870,8 @@ files:
 - lib/rabbit/theme/title-on-image-toolkit/title-on-image-toolkit.rb
 - lib/rabbit/theme/title-shadow/property.rb
 - lib/rabbit/theme/title-shadow/title-shadow.rb
+- lib/rabbit/theme/title-slide-background-image/property.rb
+- lib/rabbit/theme/title-slide-background-image/title-slide-background-image.rb
 - lib/rabbit/theme/twitter-comment/property.rb
 - lib/rabbit/theme/twitter-comment/twitter-comment.rb
 - lib/rabbit/trackball.rb