rabbit 0.9.3 → 1.0.0

data/lib/rabbit/element/image.rb

@@ -24,6 +24,7 @@ module Rabbit
 
       def initialize(filename, prop)
         @filename = filename
+        prop = Utils.stringify_hash_key(prop)
         super(filename, prop)
         normalized_prop = {}
         prop.each do |name, value|

data/lib/rabbit/element/preformatted.rb

@@ -1,10 +1,10 @@
-require 'rabbit/element/text-container-element'
+require 'rabbit/element/text-block-element'
 require 'rabbit/element/block-element'
 
 module Rabbit
   module Element
     class PreformattedBlock
-      include TextContainerElement
+      include TextBlockElement
       include BlockHorizontalCentering
 
       def text
@@ -16,7 +16,12 @@ module Rabbit
       end
 
       def to_html(generator)
-        "<pre>#{super}</pre>"
+        "<pre#{attributes}>#{super}</pre>"
+      end
+
+      private
+      def attributes
+        ""
       end
     end
 

data/lib/rabbit/element/syntax-highlighting.rb

@@ -0,0 +1,15 @@
+require 'rabbit/element/preformatted'
+
+module Rabbit
+  module Element
+    class SyntaxHighlightingBlock < PreformattedBlock
+      private
+      def attributes
+        " class=\"syntax-highlighting\""
+      end
+    end
+
+    class SyntaxHighlightingText < PreformattedText
+    end
+  end
+end

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

@@ -238,15 +238,15 @@ module Rabbit
       end
 
       def draw_layout(canvas, x, y)
-        shadow_color = self["shadow-color"]
+        shadow_color = prop_value("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)
+          shadow_x = prop_value("shadow-x") || (line_height * 0.08)
+          shadow_y = prop_value("shadow-y") || (line_height * 0.06)
           canvas.draw_layout(shadow_layout, x + shadow_x, y + shadow_y,
                              shadow_color)
         end

data/lib/rabbit/element/text.rb

@@ -16,18 +16,6 @@ module Rabbit
       include TextBlockElement
     end
 
-    class PreformattedBlock
-      include TextBlockElement
-
-      def to_html(generator)
-        "<pre>#{super}</pre>"
-      end
-    end
-
-    class PreformattedText
-      include TextContainerElement
-    end
-
     class Keyword
       include TextContainerElement
     end

data/lib/rabbit/element/title-slide.rb

@@ -36,9 +36,7 @@ module Rabbit
       end
 
       def allotted_time
-        time = self["allotted-time"]
-        time = parse_time(time) if time
-        time
+        self["allotted-time"]
       end
 
       def to_html(generator)
@@ -55,28 +53,6 @@ module Rabbit
       def normalize_name(name)
         name.gsub(/_/, "-").strip
       end
-
-      def parse_time(str)
-        if /\A\s*\z/m =~ str
-          nil
-        else
-          if /\A\s*(\d*\.?\d*)\s*(h|m|s)?\s*\z/i =~ str
-            time = $1.to_f
-            unit = $2
-            if unit
-              case unit.downcase
-              when "m"
-                time *= 60
-              when "h"
-                time *= 3600
-              end
-            end
-            time.to_i
-          else
-            nil
-          end
-        end
-      end
     end
 
     class Title

data/lib/rabbit/formatter.rb

@@ -99,7 +99,7 @@ EOC
         super(value)
       end
     end
-    
+
     class Foreground
       def normalize_attribute(name, value)
         value = Renderer::Color.parse(value).to_gdk_format
@@ -108,17 +108,16 @@ EOC
     end
 
     module ConvenienceTextFormatter
-
       include Formatter
 
       def text_formatter?
         true
       end
-      
+
       def html_formatter?
         true
       end
-      
+
       def format(text)
         tagged_text(text, name, {})
       end
@@ -132,12 +131,33 @@ EOC
       module_eval(<<-EOC)
         class #{to_class_name(name)}
           include ConvenienceTextFormatter
-          
+
           def name
             #{name.dump}
           end
         end
-EOC
+      EOC
+    end
+
+    module ValueContainerFormatter
+      include Formatter
+
+      attr_reader :value
+      def initialize(value)
+        @value = value
+      end
+    end
+
+    %w(shadow-color shadow-x shadow-y).each do |name|
+      module_eval(<<-EOC)
+        class #{to_class_name(name)}
+          include ValueContainerFormatter
+
+          def name
+            #{name.dump}
+          end
+        end
+      EOC
     end
   end
 end

data/lib/rabbit/front.rb

@@ -87,7 +87,7 @@ module Rabbit
     def slide_title
       @canvas.slide_title
     end
-    
+
     def total_slide_number
       @canvas.slide_size
     end
@@ -127,9 +127,13 @@ module Rabbit
     end
 
     def append_comment(comment)
-      @canvas.append_comment(comment)
+      GLib::Idle.add do
+        @canvas.append_comment(comment)
+        false
+      end
+      true
     end
-    
+
     def comments
       @canvas.comments
     end
@@ -150,7 +154,7 @@ module Rabbit
         end
       end
     end
-    
+
     def update_images_if_need
       mon_synchronize do
         _check_dirty
@@ -185,7 +189,7 @@ module Rabbit
         arg_list = []
         arg_list.concat(Utils.arg_list(@canvas.method(name).arity))
         arg_str = arg_list.join(", ")
-        
+
         if (@public_level & level).zero?
           instance_eval(<<-EOS, __FILE__, __LINE__ + 1)
             def self.#{name}(#{arg_str})
@@ -219,7 +223,7 @@ module Rabbit
         end
       end
     end
-    
+
     def clean
       @off_screen_canvas = nil
       @dirty = false

data/lib/rabbit/html/template.erb

@@ -101,7 +101,7 @@ function handle_key(e)
 <div class="footer">
 <p>
 Generated by
-<a href="http://www.cozmixng.org/~rwiki/?cmd=view;name=Rabbit">Rabbit</a> 
+<a href="http://rabbit-shockers.org/">Rabbit</a> 
 version <%= Rabbit::VERSION %>
 </p>
 </div>

data/lib/rabbit/image.rb

@@ -24,7 +24,7 @@ module Rabbit
         raise ImageFileDoesNotExistError.new(filename)
       end
       super(*args, &block)
-      Utils.stringify_hash_key!(props) if props
+      props = Utils.stringify_hash_key(props) if props
       @loader = Base.find_loader(filename).new(filename, props)
     end
   end

data/lib/rabbit/keys.rb

@@ -5,177 +5,177 @@ module Rabbit
   module Keys
 
     QUIT_KEYS = [
-      Gdk::Keyval::GDK_Escape,
-      Gdk::Keyval::GDK_q,
+      Gdk::Keyval::GDK_KEY_Escape,
+      Gdk::Keyval::GDK_KEY_q,
     ]
 
     MOVE_TO_NEXT_KEYS = [
-      Gdk::Keyval::GDK_n,
-      Gdk::Keyval::GDK_f,
-      Gdk::Keyval::GDK_j,
-      Gdk::Keyval::GDK_l,
-      Gdk::Keyval::GDK_Page_Down,
-      Gdk::Keyval::GDK_Tab,
-      Gdk::Keyval::GDK_Return,
-      Gdk::Keyval::GDK_rightarrow,
-      Gdk::Keyval::GDK_downarrow,
-      Gdk::Keyval::GDK_space,
-      Gdk::Keyval::GDK_plus,
-      Gdk::Keyval::GDK_KP_Add,
-      Gdk::Keyval::GDK_KP_Page_Down,
-      Gdk::Keyval::GDK_KP_Enter,
-      Gdk::Keyval::GDK_KP_Tab,
+      Gdk::Keyval::GDK_KEY_n,
+      Gdk::Keyval::GDK_KEY_f,
+      Gdk::Keyval::GDK_KEY_j,
+      Gdk::Keyval::GDK_KEY_l,
+      Gdk::Keyval::GDK_KEY_Page_Down,
+      Gdk::Keyval::GDK_KEY_Tab,
+      Gdk::Keyval::GDK_KEY_Return,
+      Gdk::Keyval::GDK_KEY_rightarrow,
+      Gdk::Keyval::GDK_KEY_downarrow,
+      Gdk::Keyval::GDK_KEY_space,
+      Gdk::Keyval::GDK_KEY_plus,
+      Gdk::Keyval::GDK_KEY_KP_Add,
+      Gdk::Keyval::GDK_KEY_KP_Page_Down,
+      Gdk::Keyval::GDK_KEY_KP_Enter,
+      Gdk::Keyval::GDK_KEY_KP_Tab,
     ]
 
     MOVE_TO_PREVIOUS_KEYS = [
-      Gdk::Keyval::GDK_p,
-      Gdk::Keyval::GDK_b,
-      Gdk::Keyval::GDK_h,
-      Gdk::Keyval::GDK_k,
-      Gdk::Keyval::GDK_Page_Up,
-      Gdk::Keyval::GDK_leftarrow,
-      Gdk::Keyval::GDK_uparrow,
-      Gdk::Keyval::GDK_BackSpace,
-      Gdk::Keyval::GDK_Delete,
-      Gdk::Keyval::GDK_minus,
-      Gdk::Keyval::GDK_KP_Subtract,
-      Gdk::Keyval::GDK_KP_Page_Up,
-      Gdk::Keyval::GDK_KP_Delete,
+      Gdk::Keyval::GDK_KEY_p,
+      Gdk::Keyval::GDK_KEY_b,
+      Gdk::Keyval::GDK_KEY_h,
+      Gdk::Keyval::GDK_KEY_k,
+      Gdk::Keyval::GDK_KEY_Page_Up,
+      Gdk::Keyval::GDK_KEY_leftarrow,
+      Gdk::Keyval::GDK_KEY_uparrow,
+      Gdk::Keyval::GDK_KEY_BackSpace,
+      Gdk::Keyval::GDK_KEY_Delete,
+      Gdk::Keyval::GDK_KEY_minus,
+      Gdk::Keyval::GDK_KEY_KP_Subtract,
+      Gdk::Keyval::GDK_KEY_KP_Page_Up,
+      Gdk::Keyval::GDK_KEY_KP_Delete,
     ]
 
     MOVE_TO_FIRST_KEYS = [
-      Gdk::Keyval::GDK_a,
-      Gdk::Keyval::GDK_Home,
-      Gdk::Keyval::GDK_KP_Home,
-      Gdk::Keyval::GDK_less,
+      Gdk::Keyval::GDK_KEY_a,
+      Gdk::Keyval::GDK_KEY_Home,
+      Gdk::Keyval::GDK_KEY_KP_Home,
+      Gdk::Keyval::GDK_KEY_less,
     ]
 
     MOVE_TO_LAST_KEYS = [
-      Gdk::Keyval::GDK_e,
-      Gdk::Keyval::GDK_End,
-      Gdk::Keyval::GDK_KP_End,
-      Gdk::Keyval::GDK_greater,
-      Gdk::Keyval::GDK_dollar,
+      Gdk::Keyval::GDK_KEY_e,
+      Gdk::Keyval::GDK_KEY_End,
+      Gdk::Keyval::GDK_KEY_KP_End,
+      Gdk::Keyval::GDK_KEY_greater,
+      Gdk::Keyval::GDK_KEY_dollar,
     ]
 
     TOGGLE_FULLSCREEN_KEYS = [
-      Gdk::Keyval::GDK_F5,
-      Gdk::Keyval::GDK_F10,
-      Gdk::Keyval::GDK_F11,
+      Gdk::Keyval::GDK_KEY_F5,
+      Gdk::Keyval::GDK_KEY_F10,
+      Gdk::Keyval::GDK_KEY_F11,
     ]
 
     RELOAD_THEME_KEYS = [
-      Gdk::Keyval::GDK_t,
-      Gdk::Keyval::GDK_r,
+      Gdk::Keyval::GDK_KEY_t,
+      Gdk::Keyval::GDK_KEY_r,
     ]
 
     SAVE_AS_IMAGE_KEYS = [
-      Gdk::Keyval::GDK_s,
+      Gdk::Keyval::GDK_KEY_s,
     ]
 
     ICONIFY_KEYS = [
-      Gdk::Keyval::GDK_z,
+      Gdk::Keyval::GDK_KEY_z,
     ]
 
     TOGGLE_INDEX_MODE_KEYS = [
-      Gdk::Keyval::GDK_i,
+      Gdk::Keyval::GDK_KEY_i,
     ]
 
     CACHE_ALL_SLIDES_KEYS = [
-      Gdk::Keyval::GDK_c,
+      Gdk::Keyval::GDK_KEY_c,
     ]
 
     SEARCH_SLIDE_FORWARD_KEYS = [
-      Gdk::Keyval::GDK_slash,
+      Gdk::Keyval::GDK_KEY_slash,
     ]
 
     SEARCH_SLIDE_BACKWARD_KEYS = [
-      Gdk::Keyval::GDK_question,
+      Gdk::Keyval::GDK_KEY_question,
     ]
 
     SEARCH_SLIDE_FORWARD_NEXT_KEYS = [
-      Gdk::Keyval::GDK_n,
+      Gdk::Keyval::GDK_KEY_n,
     ]
 
     STOP_SLIDE_SEARCH_KEYS = [
-      Gdk::Keyval::GDK_Escape,
+      Gdk::Keyval::GDK_KEY_Escape,
     ]
 
     module Shift
       WHITE_OUT_KEYS = [
-        Gdk::Keyval::GDK_w,
+        Gdk::Keyval::GDK_KEY_w,
       ]
 
       BLACK_OUT_KEYS = [
-        Gdk::Keyval::GDK_b,
+        Gdk::Keyval::GDK_KEY_b,
       ]
 
       EXPAND_HOLE_KEYS = [
-        Gdk::Keyval::GDK_e,
+        Gdk::Keyval::GDK_KEY_e,
       ]
 
       NARROW_HOLE_KEYS = [
-        Gdk::Keyval::GDK_n,
+        Gdk::Keyval::GDK_KEY_n,
       ]
 
       TOGGLE_GRAFFITI_MODE_KEYS = [
-        Gdk::Keyval::GDK_g,
+        Gdk::Keyval::GDK_KEY_g,
       ]
 
       SEARCH_SLIDE_BACKWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_n,
+        Gdk::Keyval::GDK_KEY_n,
       ]
 
       TOGGLE_INFO_WINDOW_KEYS = [
-        Gdk::Keyval::GDK_i,
+        Gdk::Keyval::GDK_KEY_i,
       ]
     end
 
     module Control
       CLEAR_SLIDE_KEYS = [
-        Gdk::Keyval::GDK_l,
+        Gdk::Keyval::GDK_KEY_l,
       ]
 
       PRINT_KEYS = [
-        Gdk::Keyval::GDK_p,
+        Gdk::Keyval::GDK_KEY_p,
       ]
 
       UNDO_GRAFFITI_KEYS = [
-        Gdk::Keyval::GDK_z,
+        Gdk::Keyval::GDK_KEY_z,
       ]
 
       CLEAR_GRAFFITI_KEYS = [
-        Gdk::Keyval::GDK_l,
+        Gdk::Keyval::GDK_KEY_l,
       ]
 
       SEARCH_SLIDE_FORWARD_KEYS = [
-        Gdk::Keyval::GDK_s,
+        Gdk::Keyval::GDK_KEY_s,
       ]
 
       SEARCH_SLIDE_BACKWARD_KEYS = [
-        Gdk::Keyval::GDK_r,
+        Gdk::Keyval::GDK_KEY_r,
       ]
 
       SEARCH_SLIDE_FORWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_s,
+        Gdk::Keyval::GDK_KEY_s,
       ]
 
       SEARCH_SLIDE_BACKWARD_NEXT_KEYS = [
-        Gdk::Keyval::GDK_r,
+        Gdk::Keyval::GDK_KEY_r,
       ]
 
       STOP_SLIDE_SEARCH_KEYS = [
-        Gdk::Keyval::GDK_g,
+        Gdk::Keyval::GDK_KEY_g,
       ]
     end
 
     module Alt
       RESET_ADJUSTMENT_KEYS = [
-        Gdk::Keyval::GDK_a,
+        Gdk::Keyval::GDK_KEY_a,
       ]
 
       RESET_TIMER_KEYS = [
-        Gdk::Keyval::GDK_t,
+        Gdk::Keyval::GDK_KEY_t,
       ]
     end
   end