rabbit 2.1.3 → 2.1.4

data/lib/rabbit/canvas.rb

@@ -64,8 +64,8 @@ module Rabbit
     def_delegators(:@renderer, :draw_arc_by_radius, :draw_circle_by_radius)
     def_delegators(:@renderer, :draw_slide, :draw_polygon, :draw_flag)
     def_delegators(:@renderer, :draw_rounded_rectangle)
-    def_delegators(:@renderer, :draw_rsvg_handle, :rsvg_available?)
-    def_delegators(:@renderer, :draw_poppler_page, :poppler_available?)
+    def_delegators(:@renderer, :draw_rsvg_handle)
+    def_delegators(:@renderer, :draw_poppler_page)
 
     def_delegators(:@renderer, :draw_cube, :draw_sphere, :draw_cone)
     def_delegators(:@renderer, :draw_torus, :draw_tetrahedron)
@@ -74,18 +74,18 @@ module Rabbit
 
     def_delegators(:@renderer, :gl_compile, :gl_call_list)
     def_delegators(:@renderer, :new_list_id)
-    
+
     def_delegators(:@renderer, :z_far, :z_view)
-    
+
     def_delegators(:@renderer, :to_attrs, :flag_size)
-    
+
     def_delegators(:@renderer, :create_pango_context, :pango_context=)
 
     def_delegators(:@renderer, :confirm)
 
     def_delegators(:@renderer, :display?, :printable?)
     def_delegators(:@renderer, :x_dpi, :y_dpi)
-    
+
     def_delegators(:@renderer, :whiteouting?, :blackouting?)
     def_delegators(:@renderer, :toggle_whiteout, :toggle_blackout)
 
@@ -119,7 +119,7 @@ module Rabbit
 
     attr_reader :logger, :renderer, :last_modified
     attr_reader :comments, :actions
-    
+
     attr_writer :saved_image_base_name
     attr_writer :use_gl, :allotted_time
 
@@ -177,7 +177,7 @@ module Rabbit
       @quitted = true
       @frame.quit
     end
-    
+
     def front(public_level=nil)
       Front.new(self, public_level)
     end
@@ -186,12 +186,12 @@ module Rabbit
       @frame = frame if frame
       @renderer.attach_to(window, container, &block) if window
     end
-    
+
     def detach
       @frame = NullFrame.new
       @renderer.detach
     end
-    
+
     def title
       ts = title_slide
       if ts
@@ -304,7 +304,7 @@ module Rabbit
     def apply_theme(name=nil, &block)
       _apply_theme(name, Object.new.__id__, &block)
     end
-    
+
     def theme_name
       @theme_name || default_theme || "default"
     end
@@ -377,7 +377,7 @@ module Rabbit
       current_slide.flush
       @renderer.to_pixbuf(current_slide)
     end
-    
+
     def save_as_image
       process do
         generator = HTML::Generator.new(self,
@@ -386,7 +386,7 @@ module Rabbit
                                         @output_html,
                                         @output_index_html,
                                         @rss_base_uri)
-        generator.pdf_filename = filename if /\.pdf/i =~ filename.to_s
+        generator.pdf_filename = filename if /\.pdf\z/i =~ filename.to_s
         generator.source_filename = @source_filename
         generator.save
       end
@@ -397,7 +397,7 @@ module Rabbit
         @renderer.print(&block)
       end
     end
-    
+
     def fullscreened
       @renderer.post_fullscreen
     end
@@ -507,7 +507,7 @@ module Rabbit
     def first_slide?
       current_index.zero?
     end
-    
+
     def last_slide?
       slide_size.zero? or current_index == (slide_size - 1)
     end
@@ -680,11 +680,11 @@ module Rabbit
         Action.update_status(self)
       end
     end
-    
+
     def modified
       @last_modified = Time.now
     end
-    
+
     def clear
       clear_comments
       reset_timer
@@ -703,7 +703,7 @@ module Rabbit
       @current_index = 0
       @slides = []
     end
-    
+
     def clear_index_slides
       activate("ToggleIndexMode") if @index_mode
       @index_current_index = 0
@@ -728,7 +728,7 @@ module Rabbit
       @index_current_index = index_index
       @index_mode = index_mode
     end
-    
+
     def default_theme
       ts = title_slide
       ts and ts.theme

data/lib/rabbit/command/rabbit-slide.rb

@@ -309,6 +309,7 @@ module Rabbit
       def generate_dot_gitignore
         create_file(".gitignore") do |dot_gitignore|
           dot_gitignore.puts(<<-EOD)
+.DS_Store
 /.tmp/
 /pkg/
 /pdf/
@@ -383,9 +384,9 @@ require "rabbit/task/slide"
 spec = nil
 Rabbit::Task::Slide.new do |task|
   spec = task.spec
-  # task.spec.files += Dir.glob("doc/**/*.*")
-  # task.spec.files -= Dir.glob("private/**/*.*")
-  # task.spec.add_runtime_dependency("YOUR THEME")
+  # spec.files += Dir.glob("doc/**/*.*")
+  # spec.files -= Dir.glob("private/**/*.*")
+  # spec.add_runtime_dependency("YOUR THEME")
 end
 
 desc "Tag #{spec.version}"
@@ -460,7 +461,7 @@ end
           ["author",         @author_conf.name,  _("AUTHOR")],
           ["institution",    nil,                _("INSTITUTION")],
           ["content-source", nil,                _("EVENT NAME")],
-          ["date",           presentation_date,  Time.now.strftime("%Y/%m/%d")],
+          ["date",           presentation_date,  Time.now.strftime("%Y-%m-%d")],
           ["allotted-time",  @allotted_time,     "5m"],
           ["theme",          nil,                "default"],
         ]

data/lib/rabbit/command/rabbit.rb

@@ -667,7 +667,8 @@ module Rabbit
             exit if file_name.nil?
             rest_arguments = [file_name]
             @options.source_type = Source::File
-          elsif rest_arguments.size == 1 and /\Ahttps?:\/\// =~ rest_arguments[0]
+          elsif rest_arguments.size == 1 and
+               /\A(?:https?|file):\/\//i =~ rest_arguments[0]
             @options.source_type = Source::URI
           else
             @options.source_type = Source::File

data/lib/rabbit/cursor-manager.rb

@@ -22,9 +22,9 @@ module Rabbit
 
     def restore(drawable, name)
       if name.nil?
-	type = @current
+        type = @current
       else
-	type = @stocks[name].pop
+        type = @stocks[name].pop
       end
       drawable.cursor = type_to_cursor(type)
     end
@@ -36,24 +36,24 @@ module Rabbit
     private
     def type_to_cursor(type)
       if type.nil?
-	nil
+        nil
       else
-	name = "@#{type}_cursor"
-	unless instance_variable_defined?(name)
-	  raise UnknownCursorTypeError.new(type)
-	end
-	instance_variable_get(name)
+        name = "@#{type}_cursor"
+        unless instance_variable_defined?(name)
+          raise UnknownCursorTypeError.new(type)
+        end
+        instance_variable_get(name)
       end
     end
 
     def blank_cursor
       if @@blank_cursor.nil?
-	source = Gdk::Pixmap.new(nil, 1, 1, 1)
-	mask = Gdk::Pixmap.new(nil, 1, 1, 1)
-	gc = Gdk::GC.new(source)
-	fg = gc.foreground
-	bg = gc.background
-	@@blank_cursor = Gdk::Cursor.new(source, mask, fg, bg, 1, 1)
+        source = Gdk::Pixmap.new(nil, 1, 1, 1)
+        mask = Gdk::Pixmap.new(nil, 1, 1, 1)
+        gc = Gdk::GC.new(source)
+        fg = gc.foreground
+        bg = gc.background
+        @@blank_cursor = Gdk::Cursor.new(source, mask, fg, bg, 1, 1)
       end
       @@blank_cursor
     end

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

@@ -5,6 +5,7 @@ module Rabbit
   module Element
     class PopplerSlide < Slide
       def initialize(page)
+        @raw_page = page
         @page = PopplerPage.new(page)
         super(@page)
       end
@@ -20,6 +21,11 @@ module Rabbit
       def title
         (@page.text.split(/\r?\n/, 2)[0] || super).chomp
       end
+
+      def size_ratio
+        w, h = @raw_page.size
+        w.to_f / h.to_f
+      end
     end
   end
 end

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

@@ -7,6 +7,7 @@ module Rabbit
 
       def initialize(page, document)
         @document = document
+        @raw_page = page
         @page = PopplerPage.new(page)
         super(@page)
       end
@@ -18,6 +19,11 @@ module Rabbit
       def theme
         super || "pdf"
       end
+
+      def size_ratio
+        w, h = @raw_page.size
+        w.to_f / h.to_f
+      end
     end
   end
 end

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

@@ -21,6 +21,10 @@ module Rabbit
         @elements.first.text
       end
 
+      def size_ratio
+        self["size-ratio"]
+      end
+
       def draw(canvas, simulation=nil)
         if simulation.nil?
           begin

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

@@ -107,7 +107,7 @@ module Rabbit
         super
         @layout = nil
       end
-      
+
       def dirty?
         super or text_dirty?
       end

data/lib/rabbit/formatter.rb

@@ -5,18 +5,18 @@ module Rabbit
   module Format
 
     extend Utils
-    
+
     module Formatter
       include ERB::Util
 
       def text_formatter?
         false
       end
-      
+
       def html_formatter?
         false
       end
-      
+
       def tagged_text(text, name, attrs)
         attrs = attrs.collect do |key, value|
           %Q[ #{h(key)}="#{h(value)}"]
@@ -45,15 +45,15 @@ module Rabbit
       def initialize(value)
         @value = value
       end
-      
+
       def text_formatter?
         true
       end
-      
+
       def html_formatter?
         true
       end
-      
+
       def format(text)
         tagged_text(text, "span", normalize_attribute(name, @value))
       end
@@ -67,7 +67,7 @@ module Rabbit
       def normalize_attribute(name, value)
         {name => value}
       end
-      
+
       def pango2css(name, value)
         css_name = PANGO2CSS[name]
         if css_name.respond_to?(:call)
@@ -77,7 +77,7 @@ module Rabbit
         end
       end
     end
-    
+
     %w(font_desc font_family face size style weight variant
         stretch foreground background underline
         underline_color rise strikethrough
@@ -85,7 +85,7 @@ module Rabbit
       module_eval(<<-EOC)
         class #{to_class_name(name)}
           include SpanTextFormatter
-          
+
           def name
             #{name.dump}
           end

data/lib/rabbit/frame.rb

@@ -37,7 +37,7 @@ module Rabbit
     def destroyed?
       @window.nil? or @window.destroyed?
     end
-    
+
     def quit
       @window.destroy unless destroyed?
       @window = nil
@@ -67,7 +67,7 @@ module Rabbit
       @fullscreen = false
       @window.unfullscreen
     end
-    
+
     def toggle_fullscreen
       if fullscreen?
         unfullscreen
@@ -87,7 +87,7 @@ module Rabbit
     def main_window?
       @main_window
     end
-    
+
     def update_title(new_title)
       @window.title = Utils.unescape_title(new_title)
     end
@@ -219,7 +219,7 @@ module Rabbit
       false
     end
   end
-  
+
   class EmbedFrame < Frame
 
     def update_title(new_title)
@@ -232,7 +232,7 @@ module Rabbit
     def iconify_available?
       false
     end
-    
+
     def init_gui(width, height, main_window, window_type=nil)
       @window = Gtk::EventBox.new
       @window.set_size_request(width, height)

data/lib/rabbit/front.rb

@@ -51,9 +51,9 @@ module Rabbit
     end
 
     include MonitorMixin
-    
+
     attr_reader :image_type, :public_level, :last_modified
-    
+
     def initialize(canvas, public_level=nil)
       super()
       @canvas = canvas

data/lib/rabbit/graffiti/processor.rb

@@ -20,28 +20,28 @@ module Rabbit
       def have_graffiti?
         not @segments.empty?
       end
-      
+
       def can_undo?
         not @undo_stack.empty?
       end
-      
+
       def button_press(x, y, width, height)
         @pressed = true
         @undo_index = nil
         @segments << [[x.to_f / width, y.to_f / height]]
       end
-      
+
       def button_release(x, y, width, height)
         @pressed = false
         @undo_stack << [:push]
       end
-      
+
       def button_motion(x, y, width, height)
         if @pressed
           @segments.last << [x.to_f / width, y.to_f / height]
         end
       end
-      
+
       def draw_last_segment(renderer)
         points = @segments.last
         if points.size >= 2
@@ -55,7 +55,7 @@ module Rabbit
                              @color, {:line_width => @line_width})
         end
       end
-      
+
       def draw_all_segment(renderer)
         return if @segments.empty?
         args = [@color, {:line_width => @line_width, :opened => true}]
@@ -68,11 +68,11 @@ module Rabbit
           renderer.draw_lines(converted_points, *args)
         end
       end
-      
+
       def dragging?
         @pressed
       end
-      
+
       def clear
         @pressed = false
         @segments = []
@@ -104,7 +104,7 @@ module Rabbit
           @segments << segment
           @undo_stack << [:push]
         end
-        
+
         if @undo_index > 0
           @undo_index -= 1
         else