rabbit 0.9.2 → 0.9.3

data/doc/screenshot.en.rab

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

data/doc/screenshot.ja.rab

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

data/lib/rabbit/action/toggle.rb

@@ -23,20 +23,6 @@ module Rabbit
       config[:label] = N_("Blackout")
     end
 
-    def act_toggle_comment_frame(action, group, canvas)
-      canvas.toggle_comment_frame
-    end
-    def act_toggle_comment_frame_config(config, canvas)
-      config[:label] = N_("Comment frame")
-    end
-
-    def act_toggle_comment_view(action, group, canvas)
-      canvas.toggle_comment_view
-    end
-    def act_toggle_comment_view_config(config, canvas)
-      config[:label] = N_("Comment view")
-    end
-
     def act_toggle_index_mode(action, group, canvas)
       canvas.toggle_index_mode
     end

data/lib/rabbit/canvas.rb

@@ -10,6 +10,7 @@ require "rabbit/theme/manager"
 require "rabbit/front"
 require "rabbit/action"
 require "rabbit/html/generator"
+require "rabbit/twitter"
 
 module Rabbit
   class Canvas
@@ -89,11 +90,6 @@ module Rabbit
     def_delegators(:@renderer, :whiteouting?, :blackouting?)
     def_delegators(:@renderer, :toggle_whiteout, :toggle_blackout)
 
-    def_delegators(:@renderer, :showing_comment_frame?, :showing_comment_view?)
-    def_delegators(:@renderer, :toggle_comment_frame, :toggle_comment_view)
-    def_delegators(:@renderer, :comment_frame_available?)
-    def_delegators(:@renderer, :comment_view_available?)
-
     def_delegators(:@renderer, :adjustment_x, :adjustment_x=)
     def_delegators(:@renderer, :adjustment_y, :adjustment_y=)
     def_delegators(:@renderer, :reset_adjustment)
@@ -123,7 +119,7 @@ module Rabbit
     def_delegators(:@source, :source=, :reset, :base)
 
     attr_reader :logger, :renderer, :last_modified
-    attr_reader :comment_source, :actions
+    attr_reader :comments, :actions
     
     attr_writer :saved_image_base_name
     attr_writer :use_gl
@@ -133,8 +129,9 @@ module Rabbit
     attr_accessor :source_filename
     attr_accessor :migemo_dictionary_search_path, :migemo_dictionary_name
     attr_accessor :font_resolution_ratio
+    attr_accessor :max_n_comments
 
-    def initialize(logger, renderer, comment_source=nil, comment_encoding=nil)
+    def initialize(logger, renderer)
       @logger = logger
       @frame = NullFrame.new
       @theme_name = nil
@@ -153,7 +150,8 @@ module Rabbit
       @limit_time = nil
       @use_gl = false
       @font_resolution_ratio = 1
-      init_comment(comment_source, comment_encoding)
+      @twitter = nil
+      @max_n_comments = 100
       clear
       @renderer = renderer.new(self)
       @actions = Action.action_group(self)
@@ -176,6 +174,7 @@ module Rabbit
     end
 
     def quit
+      clear_twitter
       @quitted = true
       @frame.quit
     end
@@ -564,30 +563,29 @@ module Rabbit
       end
     end
 
+    def on_comment(name, &callback)
+      @on_comment_callbacks << [name, callback]
+    end
+
+    def delete_on_comment_proc_by_name(name)
+      @on_comment_callbacks.reject! do |callback_name, callback|
+        callback_name == name
+      end
+    end
+
     def append_comment(comment)
-      comment = prepare_comment(comment)
-      comment = "\n= #{comment}" if /\A\s*\z/ !~ comment
-      prev_source = @comment_source.read
-      @comment_source.source = "#{prev_source}#{comment}"
-      @renderer.update_comment(@comment_source) do |error|
-        @comment_source.source = prev_source
-        if block_given?
-          yield(error)
-        else
-          logger.warn(error)
+      @comments << comment
+      @comments.shift if @comments.size > @max_n_comments
+      @on_comment_callbacks.each do |name, callback|
+        begin
+          callback.call(comment)
+        rescue
+          logger.error($!)
         end
-        return false
       end
       true
     end
 
-    def comments
-      comments = @comment_source.read.split(/^=\s*(?=[^=]+$)/)[2..-1]
-      comments.collect do |comment|
-        comment.strip
-      end
-    end
-    
     def title_slide
       @slides.find{|x| x.is_a?(Element::TitleSlide)}
     end
@@ -642,6 +640,10 @@ module Rabbit
       INTERNAL_DPI * @font_resolution_ratio
     end
 
+    def twitter
+      @twitter ||= Twitter.new(@logger)
+    end
+
     private
     def _apply_theme(name, id, &block)
       @theme_name = name if name
@@ -692,13 +694,26 @@ module Rabbit
     end
     
     def clear
+      clear_twitter
+      clear_comments
       reset_timer
       stop_auto_redraw_timer
       clear_slides
       clear_index_slides
       modified
     end
-    
+
+    def clear_twitter
+      return if @twitter.nil?
+      @twitter.close
+      @twitter = nil
+    end
+
+    def clear_comments
+      @comments = []
+      @on_comment_callbacks = []
+    end
+
     def clear_slides
       @current_index = 0
       @slides = []
@@ -748,24 +763,5 @@ module Rabbit
       Action.update_status(self)
       @renderer.post_move(old_index, current_index)
     end
-
-    def init_comment(comment_source, comment_encoding)
-      args = [comment_encoding, logger, comment_source]
-      @comment_source = Source::Memory.new(*args)
-      if /^=\s*[^=]+$/ !~ @comment_source.read
-        @comment_source.source = default_comment_source
-      end
-    end
-
-    def default_comment_source
-      source = "= " + _("Comment") + "\n"
-      source << ": theme\n"
-      source << "   comment\n"
-      source
-    end
-
-    def prepare_comment(comment)
-      comment.to_s.gsub(/\r?\n/, '')
-    end
   end
 end

data/lib/rabbit/console.rb

@@ -19,7 +19,7 @@ module Rabbit
     module_function
     def parse!(args, logger=nil)
       bindtextdomain
-      logger ||= Logger::STDERR.new
+      logger ||= guess_default_logger
       options = OpenStruct.new
       options.logger = logger
       options.default_logger = logger
@@ -129,5 +129,13 @@ module Rabbit
     def get_last_name(klass)
       klass.name.split("::").last
     end
+
+    def guess_default_logger
+      if Utils.support_console_output?
+        Logger::STDERR.new
+      else
+        Logger::GUI.new
+      end
+    end
   end
 end

data/lib/rabbit/front.rb

@@ -123,7 +123,7 @@ module Rabbit
     end
 
     def accept_move?
-      not (@public_level & Front::PublicLevel::MOVE).zero?      
+      not (@public_level & Front::PublicLevel::MOVE).zero?
     end
 
     def append_comment(comment)

data/lib/rabbit/keys.rb

@@ -85,10 +85,6 @@ module Rabbit
       Gdk::Keyval::GDK_c,
     ]
 
-    TOGGLE_COMMENT_FRAME_KEYS = [
-      Gdk::Keyval::GDK_m,
-    ]
-
     SEARCH_SLIDE_FORWARD_KEYS = [
       Gdk::Keyval::GDK_slash,
     ]
@@ -114,10 +110,6 @@ module Rabbit
         Gdk::Keyval::GDK_b,
       ]
 
-      TOGGLE_COMMENT_VIEW_KEYS = [
-        Gdk::Keyval::GDK_m,
-      ]
-
       EXPAND_HOLE_KEYS = [
         Gdk::Keyval::GDK_e,
       ]

data/lib/rabbit/logger/gui.rb

@@ -38,14 +38,14 @@ module Rabbit
         log_prog_name(prog_name)
         log_message(message)
         if @start_gui_main_loop_automatically and Gtk.main_level.zero?
-          Thread.new{Gtk.main}
+          Thread.new {Gtk.main}
         end
       end
 
       def log_severity(severity)
         append("[")
-        name = severity_name(severity)
-        append(name, name)
+        name = Severity::MARK_TABLE[severity]
+        append(_(name), name)
         append("]\n")
       end
 
@@ -165,8 +165,6 @@ module Rabbit
                            "left_margin" => 10,
                            "right_margin" => 10)
       end
-      
     end
-    
   end
 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\s/m =~ source.read
+          source.read.start_with?("%PDF-1.")
         end
       end
 

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

@@ -378,7 +378,7 @@ module Rabbit
             super(@private.pack(text, *rest))
           end
 
-          def lang(lang, text)
+          def lang(lang, text, *rest)
             super(lang, @private.pack(text, *rest))
           end
 
@@ -390,6 +390,14 @@ module Rabbit
             WaitTag.new
           end
 
+          def tag(name, text=nil, *rest)
+            if text
+              CustomTag.new(name, @private.pack(text, *rest))
+            else
+              CustomTag.new(name)
+            end
+          end
+
           class Private
             include Element
             def initialize(output)
@@ -482,6 +490,14 @@ module Rabbit
               [Ext::AAFigure.make_image_by_aafigure(*args), props]
             end
           end
+
+          def tag(name, value=nil)
+            if value
+              CustomTag.new(name, @output.text(value))
+            else
+              CustomTag.new(name)
+            end
+          end
         end
       end
     end

data/lib/rabbit/rabbit.rb

@@ -8,11 +8,12 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 
   TMP_DIR_NAME = ".tmp"
 
   @@gui_init_procs = []
+  @@cleanup_procs = []
 
   module_function
   def add_gui_init_proc(proc=Proc.new)
@@ -25,6 +26,16 @@ module Rabbit
     end
   end
 
+  def add_cleanup_proc(proc=Proc.new)
+    @@cleanup_procs << proc
+  end
+
+  def cleanup
+    @@cleanup_procs.each do |proc|
+      proc.call
+    end
+  end
+
   class Error < StandardError
     include GetText
   end

data/lib/rabbit/renderer/base.rb

@@ -219,35 +219,10 @@ module Rabbit
       def toggle_spotlight
       end
 
-      def toggle_comment_frame
-      end
-
-      def toggle_comment_view
-      end
-
-      def showing_comment_frame?
-        false
-      end
-
-      def showing_comment_view?
-        false
-      end
-
-      def comment_frame_available?
-        false
-      end
-
-      def comment_view_available?
-        false
-      end
-
       def gl_available?
         @canvas.use_gl? and gl_supported?
       end
 
-      def update_comment(source)
-      end
-      
       def post_init_gui
       end
 

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

@@ -226,75 +226,6 @@ module Rabbit
         def cache_all_slides
         end
 
-        def update_comment(source, &block)
-          comment = @canvas.comments.last
-
-          color = Clutter::Color.new(rand(256), rand(256), rand(256),
-                                     128 + rand(128))
-          size = 36 + rand(72)
-          actor = Clutter::Label.new("Sans #{size}", comment, color)
-          actor.x = @canvas.width
-          actor.y = (@canvas.height / 2.0) * rand
-          actor.show
-          @stage.add(actor)
-
-          n = 150 + rand(150)
-          delta = (@canvas.width + actor.width) / n.to_f
-
-          do_rotate_x = rand(5).zero?
-          do_rotate_y = rand(5).zero?
-          do_rotate_z = rand(5).zero?
-          do_scale = rand(5).zero?
-
-          x_axis = actor.x
-          y_axis = actor.y - (actor.height * 0.5)
-          if do_rotate_x
-            actor.set_rotation(Clutter::X_AXIS, rand(360), 0, y_axis, 0)
-          end
-          if do_rotate_y
-            actor.set_rotation(Clutter::Y_AXIS, rand(360), x_axis, 0, 0)
-          end
-          if do_rotate_z
-            actor.set_rotation(Clutter::Z_AXIS, rand(360), x_axis, y_axis, 0)
-          end
-          if do_scale
-            x_sign = 1
-            y_sign = 1
-            actor.set_scale(-2 + rand(5), -2 + rand(5))
-          end
-          GLib::Timeout.add(1000 / 50) do
-            actor.raise_top
-            actor.x -= delta
-
-            x_angle, x_x, x_y, x_z = actor.get_rotation(Clutter::X_AXIS)
-            y_angle, y_x, y_y, y_z = actor.get_rotation(Clutter::Y_AXIS)
-            z_angle, z_x, z_y, z_z = actor.get_rotation(Clutter::Z_AXIS)
-            x_angle = (x_angle + rand(5)) % 360
-            y_angle = (y_angle + rand(5)) % 360
-            z_angle = (z_angle + rand(5)) % 360
-            x_axis = actor.x
-            if do_rotate_x
-              actor.set_rotation(Clutter::X_AXIS, x_angle, 0, y_axis, 0)
-            end
-            if do_rotate_y
-              actor.set_rotation(Clutter::Y_AXIS, y_angle, x_axis, 0, 0)
-            end
-            if do_rotate_z
-              actor.set_rotation(Clutter::Z_AXIS, z_angle, x_axis, y_axis, 0)
-            end
-            if do_scale
-              x_scale, y_scale = actor.scale
-              x_sign *= -1 if x_scale.abs > 2
-              y_sign *= -1 if y_scale.abs > 2
-              actor.set_scale(x_scale + (0.1 * x_sign),
-                              y_scale + (0.1 * y_sign))
-            end
-            n -= 1
-            @stage.remove(actor) if n.zero?
-            not n.zero?
-          end
-        end
-
         private
         def add_widgets_to_container(container)
           container.add(@embed)
@@ -304,6 +235,11 @@ module Rabbit
           container.remove(@embed)
         end
 
+        def init_color
+          super
+          init_engine_color
+        end
+
         def init_dpi
           @x_dpi = ScreenInfo.screen_x_resolution
           @y_dpi = ScreenInfo.screen_y_resolution