rabbit 0.9.1 → 0.9.2

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

@@ -0,0 +1,3 @@
+@category = N_("Theme")
+@title = N_("Debian Theme")
+@description = N_("Debian GNU/Linux Theme")

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

@@ -1,4 +1,9 @@
 @default_headline_line_color ||= "#ff9933"
+@default_headline_line_params ||= {}
+@default_headline_line_width ||= 1
+unless defined?(@default_headline_line_expand)
+  @default_headline_line_expand = false
+end
 
 match(Slide) do |slides|
   slides.each do |slide|
@@ -8,15 +13,29 @@ end
 
 match(Slide, HeadLine) do |headlines|
   name = "head-line"
-  
+
   delete_post_draw_proc_by_name(name)
 
   space = @space / 2.0
-  margin_with(:bottom => space * 3)
-  add_post_draw_proc(name) do |text, canvas, x, y, w, h, simulation|
+  top_space = space + @default_headline_line_width / 2.0
+  margin_with(:bottom => top_space * 2)
+  add_post_draw_proc(name) do |headline, canvas, x, y, w, h, simulation|
     unless simulation
-      canvas.draw_line(x, y + space, x + w, y + space,
-                       @default_headline_line_color)
+      if @default_headline_line_expand
+        line_x, line_w = 0, canvas.width
+      else
+        line_x, line_w = x, w
+      end
+      if @default_headline_line_params.respond_to?(:call)
+        params = @default_headline_line_params.call(headline, canvas,
+                                                    line_x, y + top_space,
+                                                    line_w, h - top_space)
+      else
+        params = @default_headline_line_params
+      end
+      canvas.draw_line(line_x, y + top_space, line_x + line_w, y + top_space,
+                       @default_headline_line_color,
+                       params.merge(:line_width => @default_headline_line_width))
     end
     [x, y, w, h]
   end

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

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

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

@@ -0,0 +1,230 @@
+# -*- coding: utf-8 -*-
+
+@font_family =
+  find_font_family("モトヤLマルベリ3等幅") ||
+  @font_family
+
+rroonga_color = "#ff5151"
+ranguba_color = "#f57900"
+background_color = "#ffffff"
+
+set_graffiti_color("#{rroonga_color}99")
+set_graffiti_line_width(30)
+
+set_progress_foreground(ranguba_color)
+set_progress_background(background_color)
+
+@title_slide_title_font_size = @x_large_font_size * 1.3
+@title_slide_content_source_font_size = @x_small_font_size
+@title_slide_date_font_size = @x_small_font_size
+
+@default_emphasis_color = rroonga_color
+
+add_image_path("ranguba-images")
+
+@block_quote_image_background_alpha = 0.3
+
+bar_line_width = @margin_bottom
+bar = ImageLoader.new(find_file("ranguba-bar.png"))
+bar.keep_ratio = true
+bar.resize(bar.width, bar_line_width)
+bar_pixbuf = bar.pixbuf.scale(bar.width, bar.height)
+@default_headline_line_width = bar_line_width
+@default_headline_line_params = Proc.new do |headline, canvas, x, y, w, h|
+  {
+    :line_cap => :square,
+    :pattern => {
+      :type => :pixbuf,
+      :pixbuf => bar_pixbuf,
+      :extend => :repeat,
+      :transformations => [
+                           [:translate, -x, -(y + bar.height / 2)],
+                          ],
+    },
+  }
+end
+@default_headline_line_expand = true
+
+@description_term_line_color = ranguba_color
+@default_description_item1_mark_color = ranguba_color
+@default_block_quote_item1_mark_color = ranguba_color
+
+@slide_number_uninstall = !print?
+
+include_theme("default")
+
+@icon_images = ["ranguba-mark.png"]
+include_theme("icon")
+
+@slide_logo_image = "ranguba-mark.png"
+@slide_logo_position = Proc.new do |slide, canvas|
+  [slide.margin_left, slide.margin_top]
+end
+@slide_logo_height = Proc.new do |slide, canvas|
+  slide[0].first_line_height
+end
+include_theme("slide-logo")
+
+unless print?
+  @image_slide_number_image ||= "mini-usa-taro.png"
+  @image_slide_number_show_text = true
+  include_theme("image-slide-number")
+  if canvas.allotted_time
+    @image_timer_image ||= "mini-kame-taro.png"
+    include_theme("image-timer")
+  end
+end
+
+@slide_footer_info_left_text ||= canvas.title.gsub(/\n+/, ' ')
+@slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
+include_theme("slide-footer-info")
+
+match(TitleSlide, Author) do |authors|
+  authors.horizontal_centering = false
+  authors.align = :left
+
+  authors.add_post_draw_proc do |author, canvas, x, y, w, h, simulation|
+    cancel_height = author.height + author.margin_bottom
+    [x, y - cancel_height, w, h + cancel_height]
+  end
+end
+
+match(TitleSlide, Institution) do |institutions|
+  institutions.horizontal_centering = false
+  institutions.align = :right
+end
+
+match(TitleSlide, Date) do |dates|
+  dates.horizontal_centering = false
+  dates.align = :right
+end
+
+match(TitleSlide, ContentSource) do |sources|
+  sources.horizontal_centering = false
+  sources.align = :right
+
+  sources.margin_top = @space
+  sources.margin_bottom = 0
+end
+
+match(Slide, HeadLine) do |heads|
+  heads.horizontal_centering = true
+end
+
+match(Slide, Body) do |bodies|
+  bodies.vertical_centering = true
+  bodies.each do |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.01
+    body.margin_right = canvas.width * 0.01
+  end
+end
+
+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, "ranguba-item-mark.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, "ranguba-item-mark-mini.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, "green-item.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, "red-item2.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, "green-item.png", name)
+# end
+
+desc_list_content = [DescriptionList, DescriptionListItem, DescriptionContent]
+
+match(*(slide_body + desc_list_content + item_list_item)) do |items|
+  name = "description-item1"
+
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+
+  draw_image_mark(items, "ranguba-item-mark.png", name,
+                  :indent => Proc.new {|item, loader| loader.width})
+end
+
+match(*(slide_body + desc_list_content + item_list_item * 2)) do |items|
+  name = "description-item2"
+
+  items.delete_pre_draw_proc_by_name(name)
+  items.delete_post_draw_proc_by_name(name)
+
+  draw_image_mark(items, "ranguba-item-mark-mini.png", name,
+                  :indent => Proc.new {|item, loader| loader.width})
+end
+
+@lightning_talk_proc_name = "lightning-clear-code"
+@lightning_talk_as_large_as_possible = true
+include_theme("lightning-talk-toolkit")
+
+match(Slide) do |slides|
+  slides.each_with_index do |slide, i|
+    if slide.lightning_talk?
+      slide.lightning_talk
+    end
+  end
+end
+
+# match(Slide, Body) do |bodies|
+#   bodies.each do |body|
+#     if body.elements.collect {|element| element.class} == [Paragraph]
+#       body.elements.each do |element|
+#         element.horizontal_centering = true
+#         if element.text.size > 50
+#           element.prop_set("size", @large_font_size)
+#         else
+#           element.prop_set("size", @x_large_font_size)
+#         end
+#         # element.as_large_as_possible("one-paragraph")
+#       end
+#     end
+#     body.margin_left *= 0.7
+#     body.margin_right *= 0.7
+#   end
+# end
+
+# match("**", Table, TableBody, TableRow, TableCell) do |cells|
+#   cells.horizontal_centering = true
+# end

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

@@ -14,16 +14,34 @@ match(SlideElement) do
   break if @slide_logo_image_uninstall
 
   loader = ImageLoader.new(find_file(@slide_logo_image))
-  loader.resize(@slide_logo_width, @slide_logo_height)
 
   add_pre_draw_proc(name) do |slide, canvas, x, y, w, h, simulation|
     unless simulation
-      if @slide_logo_position == :right
+      slide_logo_width = @slide_logo_width
+      slide_logo_height = @slide_logo_height
+      if slide_logo_width.respond_to?(:call)
+        slide_logo_width = slide_logo_width.call(slide, canvas)
+      end
+      if slide_logo_height.respond_to?(:call)
+        slide_logo_height = slide_logo_height.call(slide, canvas)
+      end
+      loader.resize(slide_logo_width, slide_logo_height)
+
+      case @slide_logo_position
+      when :right
         logo_x = canvas.width - loader.width
-      else
+        logo_y = 0
+      when :left
         logo_x = 0
+        logo_y = 0
+      else
+        if @slide_logo_position.respond_to?(:call)
+          logo_x, logo_y = @slide_logo_position.call(slide, canvas)
+        else
+          logo_x, logo_y = @slide_logo_position
+        end
       end
-      loader.draw(canvas, logo_x, 0)
+      loader.draw(canvas, logo_x, logo_y)
     end
     [x, y, w, h]
   end

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

@@ -29,6 +29,10 @@ match("**", CustomTag) do |tags|
       find_block_element.call(tag).align = "right"
     when "x-large"
       find_markup_target.call(tag).prop_set("size", @x_large_font_size)
+    when "margin-top"
+      find_block_element.call(tag).margin_top += @space
+    when "margin-bottom"
+      find_block_element.call(tag).margin_bottom += @space
     end
   end
 end

data/misc/make-image-sample.rb

@@ -47,6 +47,7 @@ ARGV.each do |rd|
                    "blue-circle", "green-circle",
                    "ruby-gnome2", "lightning-rabbit",
                    "day-white", "night-black", "cozmixng",
+                   "debian", "ranguba",
                   ])
   end
   themes.each do |theme, option|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rabbit
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 +09:00
+date: 2010-12-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,6 +161,14 @@ files:
 - data/rabbit/image/cozmixng-images/cozmixng-images.rb
 - data/rabbit/image/cozmixng-images/powered-by-cozmixng.png
 - data/rabbit/image/cozmixng-images/property.rb
+- data/rabbit/image/debian-images/bottom.png
+- data/rabbit/image/debian-images/debian-images.rb
+- data/rabbit/image/debian-images/debian-logo-pink.png
+- data/rabbit/image/debian-images/debian-logo.png
+- data/rabbit/image/debian-images/debian-whirl.png
+- data/rabbit/image/debian-images/item1.png
+- data/rabbit/image/debian-images/property.rb
+- data/rabbit/image/debian-images/top.png
 - data/rabbit/image/rabbit-images/blue-item.png
 - data/rabbit/image/rabbit-images/close-quote-blue.png
 - data/rabbit/image/rabbit-images/close-quote-brown.png
@@ -200,6 +208,14 @@ files:
 - data/rabbit/image/rabbit-images/usa-taro.png
 - data/rabbit/image/rabbit-images/usagi.png
 - data/rabbit/image/rabbit-images/yukiusa.png
+- data/rabbit/image/ranguba-images/ranguba-bar.png
+- data/rabbit/image/ranguba-images/ranguba-bar.svg
+- data/rabbit/image/ranguba-images/ranguba-images.rb
+- data/rabbit/image/ranguba-images/ranguba-item-mark-mini.png
+- data/rabbit/image/ranguba-images/ranguba-item-mark.png
+- data/rabbit/image/ranguba-images/ranguba-item-mark.svg
+- data/rabbit/image/ranguba-images/ranguba-mark.png
+- data/rabbit/image/ranguba-images/ranguba-mark.svg
 - data/rabbit/image/ruby-images/property.rb
 - data/rabbit/image/ruby-images/ruby-images.rb
 - data/rabbit/image/ruby-images/ruby-pink-circle-icon.png
@@ -363,12 +379,14 @@ files:
 - lib/rabbit/renderer/display/gesture.rb
 - lib/rabbit/renderer/display/gl.rb
 - lib/rabbit/renderer/display/graffiti.rb
+- lib/rabbit/renderer/display/hook-handler.rb
 - lib/rabbit/renderer/display/info.rb
 - lib/rabbit/renderer/display/key-handler.rb
 - lib/rabbit/renderer/display/magnifier.rb
 - lib/rabbit/renderer/display/mask.rb
 - lib/rabbit/renderer/display/menu.rb
 - lib/rabbit/renderer/display/progress.rb
+- lib/rabbit/renderer/display/scroll-handler.rb
 - lib/rabbit/renderer/display/search.rb
 - lib/rabbit/renderer/display/spotlight.rb
 - lib/rabbit/renderer/engine.rb
@@ -458,6 +476,8 @@ files:
 - lib/rabbit/theme/cozmixng/property.rb
 - lib/rabbit/theme/day-white/day-white.rb
 - lib/rabbit/theme/day-white/property.rb
+- lib/rabbit/theme/debian/debian.rb
+- lib/rabbit/theme/debian/property.rb
 - lib/rabbit/theme/default-block-quote/default-block-quote.rb
 - lib/rabbit/theme/default-block-quote/property.rb
 - lib/rabbit/theme/default-description/default-description.rb
@@ -551,6 +571,8 @@ files:
 - lib/rabbit/theme/rabbit-title-logo/rabbit-title-logo.rb
 - lib/rabbit/theme/rabbit/property.rb
 - lib/rabbit/theme/rabbit/rabbit.rb
+- lib/rabbit/theme/ranguba/property.rb
+- lib/rabbit/theme/ranguba/ranguba.rb
 - lib/rabbit/theme/red-frame/property.rb
 - lib/rabbit/theme/red-frame/red-frame.rb
 - lib/rabbit/theme/rotate-zoom-effect/property.rb
@@ -639,6 +661,7 @@ files:
 - sample/gl-sample.rd
 - sample/html_and_wiki.png
 - sample/html_and_wiki.svg
+- sample/info-window.png
 - sample/join_cozmixng.png
 - sample/join_cozmixng.svg
 - sample/kof2005/gesture-flow.svg