rabbit 0.6.2 → 0.6.3

data/NEWS.en

@@ -2,7 +2,89 @@
 
 = NEWS.en
 
-$Id: NEWS.en 1297 2009-10-03 13:37:27Z kou $
+$Id: NEWS.en 1331 2009-12-16 13:09:53Z kou $
+
+== Changes 0.6.3 from 0.6.2: 2009-12-16
+
+=== Improvements
+
+  * [#180] Supported inline markup in DL with Wiki format.
+    [kdmsnr]
+  * Added butler rabbit to the standard theme.
+  * Changed to use scaled images by default even when
+    printing mode.
+  * Supported pixbuf rendering with alpha channel.
+    (when cairo is used as rendering engine)
+
+==== Theme
+
+  * Added:
+    * lightning-monochrome:
+      Takahashi method slide + monochrome normal slide
+  * Changed:
+    * default-block-quote: Added
+      @block_quote_image_background_alpha parameter that
+      specifies alpha channel of background images.
+    * default-preformatted: Made auto text size adjustment
+      optional. It is customized by
+      @preformatted_keep_in_size parameter.
+    * clear-blue: Displayed title in the left bottom by
+      default. It can be disabled by the following theme:
+        include_theme("clear-blue")
+        @slide_footer_info_left_text = ""
+  * Supported nest of "itemize > enum" and
+    "itemize > itemize > enum".
+
+==== Experimental
+
+((*This maybe changed in the feature.*))
+
+  * Supported tag:
+
+    syntax:
+      (('tag:name:content'))
+    or
+      (('tag:name'))content
+
+    e.g.:
+      slide.rab:
+        (('tag:center'))Hi, look it!
+
+      theme.rb:
+        match("**", CustomTag) do |tags|
+          tags.each do |tag|
+            case tag.name
+            when "center"
+              tag.parent.horizontal_centering = true
+            end
+          end
+        end
+
+      output(before):
+        +-------------------+
+        | Hi, look it!      |
+        +-------------------+
+
+      output(after):
+        +-------------------+
+        |    Hi, look it!   |
+        +-------------------+
+
+=== Fixes
+
+  * Fixed a problem that fullscreen doesn't work on Ruby 1.9
+    [Masaki Suketa]
+  * [#179] Fixed a problem that Rabbit sometimes crashes
+    with mouse clicks. [kdmsnr]
+  * newline-in-slides theme: Disabled newline substitution in
+    preformatted text.
+  * Fixed a problem that cursor isn't displayed after
+    unfullscreen.
+
+=== Thanks
+
+  * Masaki Suketa
+  * kdmsnr
 
 == Changes 0.6.2 from 0.6.1: 2009-10-03
 

data/NEWS.ja

@@ -2,7 +2,86 @@
 
 = NEWS.ja
 
-$Id: NEWS.ja 1297 2009-10-03 13:37:27Z kou $
+$Id: NEWS.ja 1330 2009-12-16 13:07:47Z kou $
+
+== 0.6.2から0.6.3の変更点: 2009-12-16
+
+=== 改良
+
+  * [#180] Wikiフォーマットの定義リスト内でインラインマーク
+    アップが効かない問題を修正。
+    [kdmsnrさん]
+  * 執事うさぎを標準テーマに追加。
+  * 印刷時でもデフォルトでは拡大・縮小後の画像を使用。
+  * アルファチャンネル付きのpixbufレンダリング対応。
+    （cairoレンダリングエンジン使用時）
+
+==== テーマ
+
+  * 追加
+    * lightning-monochrome:
+      高橋メソッドスライド + モノクロな通常スライド
+  * 変更
+    * default-block-quote: 背景画像の透明度を指定する
+      @block_quote_image_background_alphaパラメーターを追加。
+    * default-preformatted: テキストの自動サイズ調整をカスタ
+      マイズできるようにした。@preformatted_keep_in_sizeパラ
+      メータで変更可能。
+    * clear-blue: デフォルトで左下にタイトルを表示するように
+      変更。無効にする場合は以下を追加するとよい。
+        include_theme("clear-blue")
+        @slide_footer_info_left_text = ""
+  * 箇条書きと列挙のネスト"itemize > enum"と
+    "itemize > itemize > enum"に対応
+
+==== 実験的
+
+((*変更される可能性があります。*))
+
+  * タグのサポート
+
+    構文:
+      (('tag:name:内容'))
+    または
+      (('tag:name'))内容
+
+    例:
+      slide.rab:
+        (('tag:center'))どうもどうも
+
+      theme.rb:
+        match("**", CustomTag) do |tags|
+          tags.each do |tag|
+            case tag.name
+            when "center"
+              tag.parent.horizontal_centering = true
+            end
+          end
+        end
+
+    出力（テーマ適用前）:
+      +-------------------+
+      | どうもどうも      |
+      +-------------------+
+
+    出力（テーマ適用後）:
+      +-------------------+
+      |   どうもどうも    |
+      +-------------------+
+
+=== 修正
+
+  * Ruby 1.9でフルスクリーンが動かない問題を修正 [助田さん]
+  * [#179] マウス使用時にクラッシュすることがある問題を修正
+    [kdmsnrさん]
+  * newline-in-slidesテーマ: 整形済みテキストでは改行を置換
+    しないようにした。
+  * フルスクリーン解除時にカーソルが表示されない問題を修正
+
+=== 感謝
+
+  * 助田さん
+  * kdmsnrさん
 
 == 0.6.1から0.6.2の変更点: 2009-10-03
 

data/README.en

@@ -2,7 +2,7 @@
 
 = README.en
 
-$Id: README.en 1291 2009-10-03 11:43:07Z kou $
+$Id: README.en 1309 2009-10-17 09:18:27Z kou $
 
 == Name
 
@@ -834,3 +834,5 @@ page from XXX.rd.
   * JunichiNakai: Reports bugs.
   * Eduardo Gonzalez: Improves documents in English.
   * Kazuhiro NISHIYAMA: Reported a bug.
+  * Masaki Suketa: Reported bugs related Ruby 1.9.
+  * kdmsnr: Reported a bug.

data/README.ja

@@ -2,7 +2,7 @@
 
 = README.ja
 
-$Id: README.ja 1262 2009-07-16 08:20:24Z kou $
+$Id: README.ja 1309 2009-10-17 09:18:27Z kou $
 
 == 名前
 
@@ -869,3 +869,5 @@ XXX.rdから1ページに8枚のスライドが入ったPDF（XXX_multi.pdf）
   * Eduardo Gonzalezさん: 英語のドキュメントをよくしてくれま
     した。
   * 西山さん: バグレポートしてくれました。
+  * 助田さん: Ruby 1.9関連のバグを報告してくれました。
+  * kdmsnrさん: バグレポートしてくれました。

data/Rakefile

@@ -61,10 +61,12 @@ project = Hoe.spec('rabbit') do
   self.test_globs = ['test/test_*.rb']
   self.changes = File.read('NEWS.en').split(/^== /)[1].gsub(/^==/, '').strip
   self.extra_deps = [
+                     ['cairo'],
                      ['hikidoc'],
                      # ['gettext'],
                     ]
   self.description = self.summary # FIXME
+  self.need_tar = false
 end
 
 rule '.png' => ['.svg'] do |t|

data/TODO

@@ -5,3 +5,4 @@
 * support SilverCity or CodeRay.
 * [nori] write manpage (converted from something like RD or DocBook XML).
 * support GooCanvas.
+* support Nokogiri as alternative of HTree.

data/bin/rabbit

@@ -32,6 +32,7 @@ def parse_args(args=ARGV, logger=nil)
     options.print = false
     options.print_out_filename = nil
     options.slides_per_page = 1
+    options.draw_scaled_image = true
     options.margin_left = nil
     options.margin_right = nil
     options.margin_top = nil
@@ -228,6 +229,12 @@ def parse_args(args=ARGV, logger=nil)
       options.slides_per_page = slides
     end
 
+    opts.on("--[no-]draw-scaled-image",
+            _("Draw scaled image."),
+            _("Better look for displaying but lesser look for printing."),
+            "(#{options.draw_scaled_image})") do |boolean|
+      options.draw_scaled_image = boolean
+    end
 
     opts.category _("Paper")
 
@@ -555,6 +562,7 @@ end
 def setup_print_info(target, options)
   target.filename = options.print_out_filename
   target.slides_per_page = options.slides_per_page
+  target.draw_scaled_image = options.draw_scaled_image
 end
 
 def setup_size(target, options)

data/lib/rabbit/canvas.rb

@@ -1,6 +1,5 @@
 require "forwardable"
 require "gtk2"
-require "rd/rdfmt"
 
 require "rabbit/rabbit"
 require 'rabbit/frame'
@@ -119,6 +118,8 @@ module Rabbit
 
     def_delegators(:@renderer, :search_slide, :stop_slide_search, :searching?)
 
+    def_delegators(:@renderer, :draw_scaled_image, :draw_scaled_image=)
+
     def_delegators(:@source, :source=, :reset, :base)
 
     attr_reader :logger, :renderer, :last_modified
@@ -211,6 +212,13 @@ module Rabbit
       end
     end
 
+    def slide_text(index=current_index)
+      return "" if slides.empty?
+      slide = slides[index]
+      return "" if slide.nil?
+      slide.text.strip
+    end
+
     def slides
       if @index_mode
         @index_slides

data/lib/rabbit/cursor-manager.rb

@@ -39,7 +39,7 @@ module Rabbit
 	nil
       else
 	name = "@#{type}_cursor"
-	unless instance_variables.include?(name)
+	unless instance_variable_defined?(name)
 	  raise UnknownCursorTypeError.new(type)
 	end
 	instance_variable_get(name)

data/lib/rabbit/element/tag.rb

@@ -25,5 +25,15 @@ module Rabbit
         [x, y, w, h]
       end
     end
+
+    class CustomTag
+      include TextContainerElement
+
+      attr_reader :name
+      def initialize(name, elements=[])
+        super(elements)
+        @name = name
+      end
+    end
   end
 end

data/lib/rabbit/html/generator.rb

@@ -165,7 +165,7 @@ module Rabbit
             output_html(filename) if output_html?
             if rss_available?
               @rss_info << [filename, slide_title(slide_number),
-                            @slide.to_rd, @slide.to_html(self)]
+                            @slide.text, @slide.to_html(self)]
             end
           end
         end
@@ -179,7 +179,7 @@ module Rabbit
             output_html(filename) if output_index_html?
             if rss_available?
               @rss_info << [filename, slide_title(slide_number),
-                            @slide.to_rd, @slide_index_html]
+                            @slide.text, @slide_index_html]
             end
             @slide_index_html = nil
           end
@@ -286,7 +286,8 @@ module Rabbit
 
       def slide_image(slide_number=@slide_number)
         src = image_src(slide_number)
-        img = "<img title=\"#{image_title(slide_number)}\" src=\"#{src}\" />"
+        img = "<img title=\"#{image_title(slide_number)}\" " +
+          "src=\"#{src}\" alt=\"#{h(slide_text(slide_number))}\" />"
         if last_slide?(slide_number)
           img
         else
@@ -295,6 +296,10 @@ module Rabbit
         end
       end
 
+      def slide_text(slide_number=@slide_number)
+        @canvas.slide_text(slide_number)
+      end
+
       def first_slide?(slide_number=@slide_number)
         slide_number.zero?
       end

data/lib/rabbit/parser/rd.rb

@@ -1,3 +1,5 @@
+require "rd/rdfmt"
+
 require "rabbit/parser/base"
 
 module Rabbit

data/lib/rabbit/parser/rd/ext/inline-verbatim.rb

@@ -82,6 +82,18 @@ module Rabbit
             return nil unless /^wait$/ =~ label
             WaitTag.new
           end
+
+          def ext_inline_verb_tag(label, source, content, visitor)
+            label = label.to_s
+            return nil unless /^tag:(.+?)(?::(.+))?$/ =~ label
+            name = $1
+            content = $2
+            if content
+              CustomTag.new(name, Text.new(visitor.apply_to_String(content)))
+            else
+              CustomTag.new(name)
+            end
+          end
         end
       end
     end

data/lib/rabbit/parser/wiki/output.rb

@@ -176,8 +176,8 @@ module Rabbit
           else
             return unless @parent
 
-            desc_term = DescriptionTerm.new(Paragraph.new(dt))
-            desc_content = DescriptionContent.new(Paragraph.new(dd))
+            desc_term = DescriptionTerm.new(Paragraph.new(dt.flatten))
+            desc_content = DescriptionContent.new(Paragraph.new(dd.flatten))
             @parent << DescriptionListItem.new(desc_term, desc_content)
           end
         end

data/lib/rabbit/rabbit.rb

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

data/lib/rabbit/renderer/base.rb

@@ -35,6 +35,7 @@ module Rabbit
       attr_accessor :adjustment_x, :adjustment_y
       attr_accessor :graffiti_color, :graffiti_line_width
       attr_accessor :gl_scale, :gl_quaternion
+      attr_accessor :draw_scaled_image
       attr_writer :page_margin_left, :page_margin_right
       attr_writer :page_margin_top, :page_margin_bottom
 
@@ -62,6 +63,7 @@ module Rabbit
         @progress_background = nil
         @graffiti_color = nil
         @graffiti_line_width = nil
+        @draw_scaled_image = true
         clean
         init_hook_procs
         init_dpi

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

@@ -29,14 +29,19 @@ module Rabbit
           end
 
           widget.signal_connect("button_release_event") do |_widget, event|
-            handled = call_hook_procs(@button_release_hook_procs,
-                                      event, last_button_press_event)
-            if handled
-              clear_button_handler
+            if last_button_press_event
+              handled = call_hook_procs(@button_release_hook_procs,
+                                        event, last_button_press_event)
+              if handled
+                clear_button_handler
+              else
+                handled = handle_button_release(event, last_button_press_event)
+              end
+              handled
             else
-              handled = handle_button_release(event, last_button_press_event)
+              clear_button_handler
+              false
             end
-            handled
           end
         end
 

data/lib/rabbit/renderer/display/clutter-embed.rb

@@ -71,6 +71,7 @@ module Rabbit
         end
 
         def post_unfullscreen
+          update_cursor(nil, true)
           update_menu
         end
 

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

@@ -49,6 +49,7 @@ module Rabbit
         end
 
         def post_unfullscreen
+          update_cursor(nil, true)
           update_menu
         end
 

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

@@ -18,10 +18,6 @@ module Rabbit
           super
         end
 
-        def draw_pixbuf(pixbuf, x, y, params={})
-          super(pixbuf, x, y, {:draw_scaled_pixbuf => true}.merge(params))
-        end
-
         private
         def init_color
           super

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

@@ -16,10 +16,6 @@ module Rabbit
           end
         end
 
-        def draw_pixbuf(pixbuf, x, y, params={})
-          super(pixbuf, x, y, {:draw_scaled_pixbuf => true}.merge(params))
-        end
-
         private
         def init_color
           super

data/lib/rabbit/renderer/engine/cairo.rb

@@ -253,6 +253,7 @@ module Rabbit
           x, y = from_screen(x, y)
 
           draw_scaled_pixbuf = params[:draw_scaled_pixbuf]
+          draw_scaled_pixbuf = @draw_scaled_image if draw_scaled_pixbuf.nil?
           width = (params[:width] || pixbuf.width).to_f
           height = (params[:height] || pixbuf.height).to_f
           if draw_scaled_pixbuf and
@@ -265,7 +266,7 @@ module Rabbit
               @context.scale(width / pixbuf.width, height / pixbuf.height)
             end
             @context.set_source_pixbuf(pixbuf, 0, 0)
-            @context.paint
+            @context.paint(params[:alpha])
           end
 
           _draw_reflected_pixbuf(pixbuf, x, y, params[:reflect])
@@ -328,6 +329,10 @@ module Rabbit
           context
         end
 
+        def set_font_resolution(context)
+          context.resolution = @canvas.font_resolution
+        end
+
         private
         def init_engine_color
           @foreground = make_color("black")

data/lib/rabbit/renderer/engine/gdk.rb

@@ -156,6 +156,7 @@ module Rabbit
           return if gc.nil?
 
           draw_scaled_pixbuf = params[:draw_scaled_pixbuf]
+          draw_scaled_pixbuf = @draw_scaled_image if draw_scaled_pixbuf.nil?
           width = params[:width] || pixbuf.width
           height = params[:height] || pixbuf.height
           if draw_scaled_pixbuf and

data/lib/rabbit/renderer/kernel.rb

@@ -249,7 +249,6 @@ module Rabbit
       end
 
       def set_font_resolution(context)
-        context.resolution = @canvas.font_resolution
       end
     end
   end

data/lib/rabbit/source/base.rb

@@ -39,8 +39,10 @@ module Rabbit
           else
             enc = @encoding
           end
- 
-          unless /\Autf-?8\z/i =~ enc
+
+          if /\Autf-?8\z/i =~ enc
+            @source.force_encoding(enc) if @source.respond_to?(:force_encoding)
+          else
             require "iconv"
             @source = Iconv.conv("UTF-8", enc, @source)
           end

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

@@ -1,5 +1,3 @@
-include_theme("newline-in-slides")
-
 @lightning_talk_proc_name = "lightning-blue-bar"
 @lightning_talk_as_large_as_possible = true
 include_theme("lightning-talk-toolkit")

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

@@ -63,8 +63,6 @@ end
 match(TitleSlide, "*") do |elements|
   elements.horizontal_centering = false
   elements.align = :right
-
-  elements.substitute_newline
 end
 
 match(TitleSlide, Title) do |titles|
@@ -96,5 +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_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
 include_theme("slide-footer-info")

data/lib/rabbit/theme/default-block-quote/default-block-quote.rb

@@ -16,6 +16,7 @@
 @block_quote_open_quote_image ||= nil
 @block_quote_close_quote_image ||= nil
 @block_quote_image_max_width ||= canvas.width * 0.1
+@block_quote_image_background_alpha ||= nil
 
 match("**", BlockQuote) do
   name = "block-quote"
@@ -44,14 +45,18 @@ match("**", BlockQuote) do
       if open_quote.width > @block_quote_image_max_width
         open_quote.resize(@block_quote_image_max_width, nil)
       end
-      padding_left += open_quote.width
+      unless @block_quote_image_background_alpha
+        padding_left += open_quote.width
+      end
     end
     if @block_quote_close_quote_image
       close_quote = ImageLoader.new(find_file(@block_quote_close_quote_image))
       if close_quote.width > @block_quote_image_max_width
         close_quote.resize(@block_quote_image_max_width, nil)
       end
-      padding_right += close_quote.width
+      unless @block_quote_image_background_alpha
+        padding_right += close_quote.width
+      end
     end
 
     block.padding_with(:left => padding_left,
@@ -63,22 +68,34 @@ match("**", BlockQuote) do
                       :bottom => @space)
 
     block.delete_pre_draw_proc_by_name(name)
-    block.delete_post_draw_proc_by_name(name)
-    if open_quote
-      adjust_open_quote_x = (@block_quote_padding_left / 2) + open_quote.width
+    if open_quote or close_quote
       block.add_pre_draw_proc(name) do |canvas, x, y, w, h, simulation|
         unless simulation
-          open_quote.draw(canvas, x - adjust_open_quote_x, y)
-        end
-        [x, y, w, h]
-      end
-    end
-    if close_quote
-      adjust_close_quote_x = (@block_quote_padding_bottom / 2)
-      adjust_close_quote_x += close_quote.height
-      block.add_post_draw_proc(name) do |canvas, x, y, w, h, simulation|
-        unless simulation
-          close_quote.draw(canvas, x + w, y - adjust_close_quote_x)
+          if open_quote
+            adjust_open_quote_x = @block_quote_padding_left / 2
+            adjust_open_quote_y = @block_quote_padding_top / 2
+            unless @block_quote_image_background_alpha
+              adjust_open_quote_x += open_quote.width
+            end
+            open_quote.draw(canvas,
+                            x - adjust_open_quote_x,
+                            y - adjust_open_quote_y,
+                            :alpha => @block_quote_image_background_alpha)
+          end
+          if close_quote
+            adjust_close_quote_x = -@block_quote_padding_right / 2
+            if @block_quote_image_background_alpha
+              adjust_close_quote_x += close_quote.width
+            end
+            adjust_close_quote_y = block.height
+            adjust_close_quote_y -= close_quote.height
+            adjust_close_quote_y -= @block_quote_padding_bottom / 2
+            adjust_close_quote_y -= block.padding_bottom
+            close_quote.draw(canvas,
+                             x + w - adjust_close_quote_x,
+                             y + adjust_close_quote_y,
+                             :alpha => @block_quote_image_background_alpha)
+          end
         end
         [x, y, w, h]
       end

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

@@ -54,12 +54,24 @@ match(*(slide_body + (enum_list_item * 2))) do |items|
 end
 
 match(*(slide_body + (enum_list_item * 3))) do |items|
-  setup_default_enum_item_mark(items, 3, 1, (1 / 4.0),
+  setup_default_enum_item_mark(items, "enum3", 1, (1 / 4.0),
                                {"size" => @x_small_font_size},
                                {"type" => "upper-case"})
 end
 
 
+match(*(slide_body + item_list_item + enum_list_item)) do |items|
+  setup_default_enum_item_mark(items, "item1-enum", 1.5, (2 / 4.0),
+                               {"size" => @small_font_size},
+                               {"type" => "lower-case"})
+end
+
+match(*(slide_body + (item_list_item * 2) + enum_list_item)) do |items|
+  setup_default_enum_item_mark(items, "item2-enum", 1, (1 / 4.0),
+                               {"size" => @x_small_font_size},
+                               {"type" => "upper-case"})
+end
+
 match(*(slide_body + enum_list_item + item_list_item)) do |items|
   setup_default_item_mark(items, "enum-item1", 1.5, 1.5, (2 / 4.0),
                           @default_enum_item1_mark_color,

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

@@ -8,6 +8,10 @@
 @preformatted_padding_top ||= screen_y(2)
 @preformatted_padding_bottom ||= screen_y(2)
 
+if @preformatted_keep_in_size.nil?
+  @preformatted_keep_in_size = true
+end
+
 match("**", PreformattedBlock) do |blocks|
   name = "preformatted-block"
   
@@ -31,7 +35,7 @@ match("**", PreformattedBlock) do |blocks|
   blocks.margin_top = @space
   blocks.margin_bottom = @space
 
-  blocks.keep_in_size
+  blocks.keep_in_size if @preformatted_keep_in_size
 
   draw_frame(blocks, params)
 end

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

@@ -140,6 +140,14 @@ match(*(slide_body + (enum_list_item * 3))) do
 end
 
 
+match(*(slide_body + item_list_item + enum_list_item)) do
+  prop_set("size", @small_font_size)
+end
+
+match(*(slide_body + (item_list_item * 2) + enum_list_item)) do
+  prop_set("size", @x_small_font_size)
+end
+
 match(*(slide_body + enum_list_item + item_list_item)) do
   prop_set("size", @small_font_size)
 end

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

@@ -37,10 +37,10 @@ match(SlideElement) do |slides|
             "color" => text_color,
           }
           left_layout = right_layout = nil
-          if left_text
+          if left_text and !left_text.empty?
             left_layout = make_formatted_layout.call(props, left_text)
           end
-          if right_text
+          if right_text and !right_text.empty?
             right_layout = make_formatted_layout.call(props, right_text)
           end
 

data/lib/rabbit/theme/lightning-monochrome/lightning-monochrome.rb

@@ -0,0 +1,16 @@
+@slide_number_uninstall = true
+@default_headline_line_color = "black"
+@default_item1_mark_type = "check"
+@default_item2_mark_type = "circle"
+include_theme("default")
+
+@lightning_talk_proc_name = "lightning-default"
+include_theme("lightning-talk-toolkit")
+
+match(Slide) do |slides|
+  slides.each do |slide|
+    if slide.lightning_talk?
+      slide.lightning_talk
+    end
+  end
+end

data/lib/rabbit/theme/lightning-monochrome/property.rb

@@ -0,0 +1,3 @@
+@category = N_("Theme")
+@title = N_("LightningTalk-Monochrome")
+@description = N_("Lightning Talk theme monochrome version")

data/lib/rabbit/theme/lightning-talk/lightning-talk.rb

@@ -1,3 +1,4 @@
+include_theme("newline-in-slides")
 include_theme("default-slide")
 include_theme("default-title-text")
 include_theme("default-text")

data/lib/rabbit/theme/newline-in-slides/newline-in-slides.rb

@@ -1,3 +1,29 @@
 match("**") do |elements|
-  elements.substitute_newline
+  have_preformatted_in_parent = Proc.new do |element|
+    if element.nil?
+      false
+    elsif element.is_a?(PreformattedBlock)
+      true
+    else
+      have_preformatted_in_parent.call(element.parent)
+    end
+  end
+
+  have_preformatted_in_children = Proc.new do |element|
+    if element.nil?
+      false
+    elsif element.is_a?(PreformattedBlock)
+      true
+    elsif element.respond_to?(:elements)
+      element.elements.any? {|child| have_preformatted_in_children.call(child)}
+    else
+      false
+    end
+  end
+
+  elements.each do |element|
+    next if have_preformatted_in_parent.call(element)
+    next if have_preformatted_in_children.call(element)
+    element.substitute_newline
+  end
 end

data/lib/rabbit/theme/slide-footer-info/slide-footer-info.rb

@@ -20,6 +20,9 @@ name = "slide-footer-info"
 @slide_footer_info_text_over_line ||= false
 @slide_footer_info_base_y ||= canvas.height - @margin_bottom
 
+@slide_footer_info_left_text ||= nil
+@slide_footer_info_right_text ||= nil
+
 include_theme("edge-info-toolkit")
 
 match(SlideElement) do

data/lib/rabbit/utils.rb

@@ -387,12 +387,18 @@ module Rabbit
 
   module Converter
     module_function
-    def keep_kcode(new_kcode)
-      kcode = $KCODE
-      $KCODE = new_kcode
-      yield
-    ensure
-      $KCODE = kcode
+    if "".respond_to?(:encoding)
+      def keep_kcode(new_kcode)
+        yield
+      end
+    else
+      def keep_kcode(new_kcode)
+        kcode = $KCODE
+        $KCODE = new_kcode
+        yield
+      ensure
+        $KCODE = kcode
+      end
     end
 
     def to_utf8(str)

data/misc/update-rd.rb

@@ -65,6 +65,8 @@ update_rd(*args) do |src, page_name, prefix|
 end
 
 [
+ ["NEWS.ja"],
+ ["NEWS.en"],
  ["INSTALL.macosx-macports.ja"],
  ["INSTALL.macosx-macports.en"],
  ["sample/rabbit.rd", "sample.ja"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rabbit
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 +09:00
+date: 2009-12-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cairo
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hikidoc
   type: :runtime
@@ -30,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: Rabbit is an RD-document-based presentation application.
 email: 
@@ -88,6 +98,7 @@ files:
 - data/rabbit/image/rabbit-images/lavie-with-logo.png
 - data/rabbit/image/rabbit-images/lavie.png
 - data/rabbit/image/rabbit-images/mini-alice.png
+- data/rabbit/image/rabbit-images/mini-butler-rabbit.png
 - data/rabbit/image/rabbit-images/mini-horizontal-bar.png
 - data/rabbit/image/rabbit-images/mini-kame-taro.png
 - data/rabbit/image/rabbit-images/mini-tanu-kitaro.png
@@ -418,6 +429,8 @@ files:
 - lib/rabbit/theme/image/property.rb
 - lib/rabbit/theme/lightning-clear-blue/lightning-clear-blue.rb
 - lib/rabbit/theme/lightning-clear-blue/property.rb
+- lib/rabbit/theme/lightning-monochrome/lightning-monochrome.rb
+- lib/rabbit/theme/lightning-monochrome/property.rb
 - lib/rabbit/theme/lightning-rabbit/lightning-rabbit.rb
 - lib/rabbit/theme/lightning-rabbit/property.rb
 - lib/rabbit/theme/lightning-simple/lightning-simple.rb