rabbit 0.6.3 → 0.6.4

data/NEWS.en

@@ -2,7 +2,93 @@
 
 = NEWS.en
 
-$Id: NEWS.en 1331 2009-12-16 13:09:53Z kou $
+$Id: NEWS.en 1358 2010-01-29 14:01:18Z kou $
+
+== Changes 0.6.4 from 0.6.3: 2009-12-16
+
+Rabbit had been included in Debian official packages! [Youhei
+SASAKI]
+
+=== Improvements
+
+  * Added --keep-above option: Rabbit is always shown top of
+    windows.
+  * Added --source-filename option that adds source link to
+    output HTML.
+  * Added a directory in source file into theme load path.
+  * Supported a single theme file in the same directory of
+    source file. [zunda]
+  * Improved PDF file detection.
+
+==== Theme
+
+  * Added:
+    * per-slide-background-image:
+      Uses background image per slide. A background
+      image is specified by slide property:
+
+        = target slide
+
+        ...
+
+        == properties
+
+        : background-image
+           my-picture.png
+        : background-image-ralative-height
+           95
+
+      Supported options are same as image options in slide.
+      Options name should be started with "background-image-".
+
+      e.g.: "background-image-relative-height" for
+      "relative-height" option.
+
+    * per-slide-background-color:
+      Uses background color per slide. A background color is
+      specified by slide property:
+
+        = target slide
+
+        ...
+
+        == properties
+
+        : background-color
+           black
+
+      Color can be specified as color name, "black", or RGB
+      values "#RRGGBBAA".
+
+  * Changed:
+    * default-slide:
+      Supports title foreground color and shadow color
+      change per slide. They are specified by slide
+      property:
+
+        = target slide
+
+        ...
+
+        == properties
+
+        : headline-color
+           red
+        : headline-shadow-color
+           gray
+
+=== Fixes
+
+  * Fixed a bug that empty title with
+    @lightning_talk_as_large_as_possible = true crashes.
+    [kdmsnr]
+  * Added workaround for Ruby 1.8.7 p249.
+
+=== Thanks
+
+  * zunda
+  * kdmsnr
+  * Youhei SASAKI
 
 == Changes 0.6.3 from 0.6.2: 2009-12-16
 

data/NEWS.ja

@@ -2,7 +2,93 @@
 
 = NEWS.ja
 
-$Id: NEWS.ja 1330 2009-12-16 13:07:47Z kou $
+$Id: NEWS.ja 1358 2010-01-29 14:01:18Z kou $
+
+== 0.6.3から0.6.4の変更点: 2010-01-29
+
+Debianオフィシャルパッケージになりました！[佐々木さん]
+
+=== 改良
+
+  * 常にウィンドウを最全面に表示する--keep-aboveオプションの追加。
+  * HTML出力時にソースへのリンクを追加する--source-filename
+    オプションの追加。
+  * ソースと同じディレクトリがテーマの検索パスに含まれるよう
+    になった。
+  * ソースと同じディレクトリにテーマを置けるようになった。
+    [zundaさん]
+  * PDFファイルの検出率向上。
+
+==== テーマ
+
+  * 追加
+    * per-slide-background-image:
+      スライド毎に背景画像を指定できるようになります。画像は
+      スライドプロパティで指定します。
+
+        = 対象となるスライド
+
+        ...
+
+        == プロパティ
+
+        : background-image
+           my-picture.png
+        : background-image-ralative-height
+           95
+
+      スライド内で画像を指定する時と同じオプションを指定でき
+      ます。オプションを指定する場合はプロパティ名を
+      「background-image-」からはじめてください。
+
+      例えば、「relative-height」オプションを指定する場合は
+      「background-image-relative-height」スライドオプション
+      になります。
+
+    * per-slide-background-color:
+      スライド毎に背景色を指定できるようになります。色は
+      スライドプロパティで指定します。
+
+        = 対象となるスライド
+
+        ...
+
+        == プロパティ
+
+        : background-color
+           black
+
+      色はテーマ内での指定方法と同様に「black」など色の名前
+      でも「#RRGGBBAA」というようにRGB値でも指定できます。
+
+  * 変更
+    * default-slide:
+      スライドプロパティでスライド毎にタイトルの前景色と影の
+      色を変更できるようになりました。
+
+        = 対象となるスライド
+
+        ...
+
+        == プロパティ
+
+        : headline-color
+           red
+        : headline-shadow-color
+           gray
+
+=== 修正
+
+  * タイトルがないときに
+    @lightning_talk_as_large_as_possible = trueを指定すると
+    落ちる問題を修正。[kdmsnrさん]
+  * Ruby 1.8.7 p249で動かない問題を修正。
+
+=== 感謝
+
+  * zundaさん
+  * kdmsnrさん
+  * 佐々木さん
 
 == 0.6.2から0.6.3の変更点: 2009-12-16
 

data/README.en

@@ -2,7 +2,7 @@
 
 = README.en
 
-$Id: README.en 1309 2009-10-17 09:18:27Z kou $
+$Id: README.en 1357 2010-01-29 13:50:12Z kou $
 
 == Name
 
@@ -642,6 +642,7 @@ sample/theme-bench-en.rab.
 Rabbit searches for themes by using ruby's $LOAD_PATH. If you make
 a theme, place it into
 ((|PATH_OF_INCLUDED_IN_$LOAD_PATH/rabbit/theme/THEME_NAME/THEME_NAME.rb|))
+or ((|DIRECTORY_OF_SOURCE_FILE/THEME_NAME.rb|)).
 
 === How do I write a theme?
 
@@ -836,3 +837,4 @@ page from XXX.rd.
   * Kazuhiro NISHIYAMA: Reported a bug.
   * Masaki Suketa: Reported bugs related Ruby 1.9.
   * kdmsnr: Reported a bug.
+  * Youhei SASAKI: The official Debian package maintainer.

data/README.ja

@@ -2,7 +2,7 @@
 
 = README.ja
 
-$Id: README.ja 1309 2009-10-17 09:18:27Z kou $
+$Id: README.ja 1355 2010-01-29 13:48:57Z kou $
 
 == 名前
 
@@ -661,8 +661,9 @@ inline verbatimとして記述します．詳しくはsample/rabbit.rdを見
 === 置き場所
 
 テーマはrubyの$LOAD_PATHから検索されます．新しくテーマを作成
-した場合は((|$LOAD_PATHに含まれているパス/rabbit/theme/テー
-マ名/テーマ名.rb|))に置いてください．
+した場合は((|$LOAD_PATHに含まれているパス/rabbit/theme/テーマ
+名/テーマ名.rb|))あるいは((|ソースがあるディレクトリ/テーマ
+名.rb|))に置いてください．
 
 === 書き方
 
@@ -871,3 +872,4 @@ XXX.rdから1ページに8枚のスライドが入ったPDF（XXX_multi.pdf）
   * 西山さん: バグレポートしてくれました。
   * 助田さん: Ruby 1.9関連のバグを報告してくれました。
   * kdmsnrさん: バグレポートしてくれました。
+  * 佐々木さん: Debianパッケージのメンテナンスをしてくれます。

data/bin/rabbit

@@ -63,6 +63,8 @@ def parse_args(args=ARGV, logger=nil)
     options.migemo_dictionary_name = "migemo-dict"
     options.use_gl = false
     options.show_native_window_id = false
+    options.keep_above = false
+    options.source_filename = nil
 
 
     opts.banner = "#{opts.banner} [SOURCE_INFOS]"
@@ -209,6 +211,12 @@ def parse_args(args=ARGV, logger=nil)
       options.rss_base_uri = uri
     end
 
+    opts.on("--source-filename=FILENAME",
+            _("Specify source filenam as [FILENAME]."),
+            "(#{options.source_filename})") do |filename|
+      options.source_filename = filename
+    end
+
     opts.category _("Print")
 
     opts.on("-p", "--print",
@@ -495,6 +503,14 @@ def parse_args(args=ARGV, logger=nil)
       options.use_gl = bool
     end
 
+    opts.category _("Display")
+
+    opts.on("--[no-]keep-above",
+            _("Specify whether to keep above window."),
+            "(#{options.keep_above})") do |bool|
+      options.keep_above = bool
+    end
+
     opts.category _("Others")
 
     opts.on("--[no-]show-native-window-id",
@@ -557,6 +573,7 @@ def setup_image_info(target, options)
   target.output_html = options.output_html
   target.output_index_html = options.output_index_html
   target.rss_base_uri = options.rss_base_uri
+  target.source_filename = options.source_filename
 end
 
 def setup_print_info(target, options)
@@ -684,6 +701,7 @@ def do_display(options, logger)
   canvas = make_canvas(options, logger, Rabbit::Renderer::Display)
   frame = Rabbit::Frame.new(logger, canvas)
   frame.geometry = options.geometry
+  frame.force_keep_above = options.keep_above
   setup_paper_size(canvas, options)
   setup_image_info(canvas, options)
   setup_print_info(canvas, options)

data/lib/rabbit/canvas.rb

@@ -130,6 +130,7 @@ module Rabbit
 
     attr_accessor :saved_image_type, :rss_base_uri
     attr_accessor :output_html, :output_index_html
+    attr_accessor :source_filename
     attr_accessor :migemo_dictionary_search_path, :migemo_dictionary_name
     attr_accessor :font_resolution_ratio
 
@@ -145,7 +146,8 @@ module Rabbit
       @apply_theme_request_queue = []
       @auto_redraw_timer = nil
       @output_html = false
-      @rss_base_uri = true
+      @rss_base_uri = nil
+      @source_filename = nil
       @migemo_dictionary_search_path = []
       @migemo_dictionary_name = nil
       @limit_time = nil
@@ -387,6 +389,7 @@ module Rabbit
                                         @output_index_html,
                                         @rss_base_uri)
         generator.pdf_filename = filename if /\.pdf/i =~ filename.to_s
+        generator.source_filename = @source_filename
         generator.save
       end
     end

data/lib/rabbit/element/base.rb

@@ -459,7 +459,7 @@ module Rabbit
 
       def _draw(canvas, x, y, w, h, simulation)
         around_draw_procs = @around_draw_procs.dup
-        around_draw_procs.concat(slide.waited_draw_procs(self))
+        around_draw_procs.concat(slide.waited_draw_procs(self)) if slide
         _draw_rec(canvas, x, y, w, h, simulation, around_draw_procs)
       end
 

data/lib/rabbit/element/image.rb

@@ -112,6 +112,7 @@ module Rabbit
       private
       def setup_draw_parameters(prop)
         @draw_parameters = {}
+
         @draw_parameters[:reflect] = {} if true_value?(prop["reflect"])
         [:ratio, :alpha].each do |key|
           name = "reflect_#{key}"
@@ -120,6 +121,9 @@ module Rabbit
           @draw_parameters[:reflect] ||= {}
           @draw_parameters[:reflect][key] = Float(value)
         end
+
+        alpha = prop["alpha"]
+        @draw_parameters[:alpha] = Float(alpha) if alpha
       end
 
       def draw_image(canvas, x, y, w, h, simulation)

data/lib/rabbit/element/text-renderer.rb

@@ -180,6 +180,18 @@ module Rabbit
         @original_width, @original_height = layout.pixel_size
         @first_line_width = @original_width / layout.line_count
         @first_line_height = @original_height / layout.line_count
+        setup_layout(layout, w)
+        width, height = layout.pixel_size
+        if layout.width != -1 and
+            (layout.alignment == Pango::Layout::ALIGN_CENTER or
+             layout.alignment == Pango::Layout::ALIGN_RIGHT)
+          width = layout.width / Pango::SCALE
+        end
+        @width, @height = width, height
+        @layout = layout
+      end
+
+      def setup_layout(layout, w)
         if @wrap_mode
           layout.set_width(w * Pango::SCALE)
           layout.set_wrap(@wrap_mode)
@@ -191,16 +203,8 @@ module Rabbit
         layout.set_spacing(@spacing)
         layout.justify = @justify
         layout.context_changed
-        width, height = layout.pixel_size
-        if layout.width != -1 and
-            (layout.alignment == Pango::Layout::ALIGN_CENTER or
-             layout.alignment == Pango::Layout::ALIGN_RIGHT)
-          width = layout.width / Pango::SCALE
-        end
-        @width, @height = width, height
-        @layout = layout
       end
-      
+
       def markup(str)
         t = str
         @prop.each do |name, formatter|
@@ -234,6 +238,19 @@ module Rabbit
       end
 
       def draw_layout(canvas, x, y)
+        shadow_color = self["shadow-color"]
+        if shadow_color
+          shadow_foreground = Format::Foreground.new(shadow_color)
+          shadow_text = markup(shadow_foreground.format(text))
+          shadow_layout = canvas.make_layout(shadow_text)
+          setup_layout(shadow_layout, @layout.width / Pango::SCALE)
+          line_height = shadow_layout.pixel_size[1] / shadow_layout.line_count
+          shadow_x = self["shadow-x"] || (line_height * 0.08)
+          shadow_y = self["shadow-y"] || (line_height * 0.06)
+          canvas.draw_layout(shadow_layout, x + shadow_x, y + shadow_y,
+                             shadow_color)
+        end
+
         color = prop_get("foreground")
         color = color.value if color
         canvas.draw_layout(@layout, x, y, color)
@@ -241,6 +258,7 @@ module Rabbit
 
       def dynamic_font_size_computation(proc_name, compute_max_size,
                                         &make_params)
+        return if text.empty?
         computed = false
         min_width = nil
         add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|

data/lib/rabbit/frame.rb

@@ -27,12 +27,13 @@ module Rabbit
     def_delegators(:@canvas, :rss_base_uri=, :use_gl?, :use_gl=)
 
     attr_reader :window, :logger
-    attr_accessor :geometry
+    attr_accessor :geometry, :force_keep_above
 
     def initialize(logger, canvas)
       @logger = logger
       @canvas = canvas
       @geometry = nil
+      @force_keep_above = nil
     end
 
     def destroyed?
@@ -101,7 +102,11 @@ module Rabbit
       @fullscreen = false
       @iconify = false
       @main_window = main_window
-      @window.keep_above = true unless @main_window
+      if @main_window
+        @window.keep_above = @force_keep_above unless @force_keep_above.nil?
+      else
+        @window.keep_above = true
+      end
       @window.show
       @canvas.post_init_gui
     end
@@ -131,6 +136,15 @@ module Rabbit
       set_window_signal_destroy
     end
 
+    def update_keep_above(keep_above=nil)
+      if @main_window
+        keep_above = @force_keep_above unless @force_keep_above.nil?
+        @window.keep_above = keep_above unless keep_above.nil?
+      else
+        @window.keep_above = true
+      end
+    end
+
     def set_window_signal_window_state_event
       @window.signal_connect("window_state_event") do |widget, event|
         if event.changed_mask.fullscreen?
@@ -139,7 +153,7 @@ module Rabbit
             @window.keep_above = true
             @canvas.fullscreened
           else
-            @window.keep_above = !@main_window
+            update_keep_above(false)
             @canvas.unfullscreened
           end
           @window.present
@@ -235,6 +249,7 @@ module Rabbit
     def_null_methods(:icon, :icon=, :set_icon)
     def_null_methods(:icon_list, :icon_list=, :set_icon_list)
     def_null_methods(:update_title, :geometry, :geometry=)
+    def_null_methods(:force_keep_above, :force_keep_above=)
 
     def_null_methods(:fullscreen?, :quit)
 

data/lib/rabbit/html/generator.rb

@@ -23,7 +23,7 @@ module Rabbit
       erb = File.open(template_path) {|f| ERB.new(f.read, nil, "-")}
       erb.def_method(self, "to_html", template_path)
 
-      attr_accessor :pdf_filename
+      attr_accessor :pdf_filename, :source_filename
       def initialize(canvas, base_name, image_type,
                      output_html, output_index_html, rss_base_uri)
         @canvas = canvas
@@ -38,6 +38,7 @@ module Rabbit
         @output_html = output_html
         @output_index_html = output_index_html
         @pdf_filename = nil
+        @source_filename = nil
         FileUtils.mkdir_p(to_filename_encoding(@base_dir))
       end
 
@@ -292,7 +293,7 @@ module Rabbit
           img
         else
           href = next_href(slide_number)
-          "<a href=\"#{href}\">\n#{img}\n</a>"
+          "<a href=\"#{href}\">#{img}</a>"
         end
       end
 
@@ -397,6 +398,10 @@ module Rabbit
           result << HTML.a_link("<a href=\"#{h(@pdf_filename)}\">",
                                 h(_("PDF")), false)
         end
+        if @source_filename
+          result << HTML.a_link("<a href=\"#{h(@source_filename)}\">",
+                                h(_("Source")), false)
+        end
         unless result.empty?
           result = "<div class=\"navi\">\n#{result}\n</div>"
         end

data/lib/rabbit/parser/pdf.rb

@@ -11,7 +11,7 @@ module Rabbit
       unshift_loader(self)
       class << self
         def match?(source)
-          /\A%PDF-1\.\d\z/ =~ source.read.split(/\r?\n/, 2)[0]
+          /\A%PDF-1\.\d\s/m =~ source.read
         end
       end
 

data/lib/rabbit/rabbit.rb

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

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

@@ -300,8 +300,12 @@ module Rabbit
 
         def draw_slide(slide, simulation, &block)
           super do |*args|
-            block.call(*args)
-            magnify {block.call(*args)} unless simulation
+            # block.call(*args)
+            # magnify {block.call(*args)} unless simulation
+            ## the below codes are workaround for
+            ## http://redmine.ruby-lang.org/issues/show/2600
+            yield(*args)
+            magnify {yield(*args)} unless simulation
           end
         end
 

data/lib/rabbit/theme/applier.rb

@@ -608,6 +608,18 @@ module Rabbit
       def entity(key)
         Parser::Ext::Entity::TABLE[key]
       end
+
+      def base_directory
+        canvas.full_path(".")
+      end
+
+      def theme_load_path
+        super + [base_directory].compact
+      end
+
+      def image_load_path
+        super + [base_directory].compact
+      end
     end
   end
 end

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

@@ -3,11 +3,10 @@
 match(Slide) do |slides|
   slides.each do |slide|
     slide.margin_set(@margin_top, @margin_right, @margin_bottom, @margin_left)
-    slide.headline.hide if slide.hide_title?
   end
 end
 
-match(Slide, HeadLine) do
+match(Slide, HeadLine) do |headlines|
   name = "head-line"
   
   delete_post_draw_proc_by_name(name)
@@ -21,6 +20,15 @@ match(Slide, HeadLine) do
     end
     [x, y, w, h]
   end
+
+  headlines.each do |headline|
+    slide = headline.slide
+    headline.hide if slide.hide_title?
+    color = slide["headline-color"]
+    headline.prop_set("foreground", color) if color
+    shadow_color = slide["headline-shadow-color"]
+    headline["shadow-color"] = shadow_color if shadow_color
+  end
 end
 
 match(Slide, Body) do |bodies|

data/lib/rabbit/theme/entry.rb

@@ -47,11 +47,10 @@ module Rabbit
       attr_reader :dependencies, :parameters
       attr_accessor :logger
 
-      def initialize(theme_dir, type)
+      def initialize(theme_dir, name)
         @logger = nil
         @theme_dir = theme_dir
-        @type = type
-        @name = File.basename(@theme_dir)
+        @name = name
         @title = @name
         @category = nil
         @abstract = nil
@@ -68,7 +67,7 @@ module Rabbit
       def property_editable?
         File.writable?(property_file)
       end
-      
+
       def theme_file
         File.join(@theme_dir, "#{@name}.rb")
       end
@@ -80,7 +79,7 @@ module Rabbit
       def have_file?(target)
         File.exist?(full_path(target))
       end
-      
+
       def full_path(target)
         File.join(@theme_dir, target)
       end
@@ -90,7 +89,7 @@ module Rabbit
       end
 
       def image_theme?
-        @type == :image
+        false
       end
 
       def files
@@ -104,7 +103,7 @@ module Rabbit
       def property_file
          File.join(@theme_dir, "#{PROPERTY_BASE_NAME}.rb")
       end
-      
+
       def parse_property
         file = property_file
         if File.exist?(file)
@@ -117,5 +116,39 @@ module Rabbit
         end
       end
     end
+
+    class DirectoryEntry < Entry
+      def initialize(theme_dir)
+        super(theme_dir, File.basename(theme_dir))
+      end
+    end
+
+    class ImageDirectoryEntry < DirectoryEntry
+      def image_theme?
+        true
+      end
+    end
+
+    class SingleFileEntry < Entry
+      def initialize(theme_dir, name)
+        super(theme_dir, name)
+      end
+
+      def property_editable?
+        false
+      end
+
+      def files
+        []
+      end
+
+      def have_file?(target)
+        name == target
+      end
+
+      private
+      def parse_property
+      end
+    end
   end
 end