rabbit 2.1.3 → 2.1.4

data/lib/rabbit/renderer/kernel.rb

@@ -3,14 +3,6 @@ require "rabbit/renderer/color"
 module Rabbit
   module Renderer
     module Kernel
-      def rsvg_available?
-        false
-      end
-
-      def poppler_available?
-        false
-      end
-
       def make_color(color)
         return color if color.is_a?(Color)
         if color.nil?
@@ -65,11 +57,11 @@ module Rabbit
       def draw_circle(filled, x, y, w, h, color=nil, params={})
         draw_arc(filled, x, y, w, h, 0, 360, color, params)
       end
-      
+
       def draw_circle_by_radius(filled, x, y, r, color=nil, params={})
         draw_arc_by_radius(filled, x, y, r, 0, 360, color, params)
       end
-      
+
       def draw_flag(x, y, pole_height, params)
         if params["flag_type"] == "triangle"
           draw_triangle_flag(x, y, pole_height, params)
@@ -77,7 +69,7 @@ module Rabbit
           draw_rectangle_flag(x, y, pole_height, params)
         end
       end
-      
+
       def draw_triangle_flag(x, y, pole_height, params)
         params = setup_flag_params(pole_height, 1.5, params)
 
@@ -184,36 +176,36 @@ module Rabbit
       def draw_cube(filled, x, y, z, size, color=nil)
         not_support_method("draw_cube")
       end
-      
+
       def draw_sphere(filled, x, y, z, radius, slices, stacks, color=nil)
         not_support_method("draw_sphere")
       end
-      
+
       def draw_cone(filled, x, y, z, base, height, slices, stacks, color=nil)
         not_support_method("draw_cone")
       end
-      
+
       def draw_torus(filled, x, y, z, inner_radius, outer_radius,
                      n_sides, rings, color=nil)
         not_support_method("draw_torus")
       end
-      
+
       def draw_tetrahedron(filled, x, y, z, color=nil)
         not_support_method("draw_tetrahedron")
       end
-      
+
       def draw_octahedron(filled, x, y, z, color=nil)
         not_support_method("draw_octahedron")
       end
-      
+
       def draw_dodecahedron(filled, x, y, z, color=nil)
         not_support_method("draw_dodecahedron")
       end
-      
+
       def draw_icosahedron(filled, x, y, z, color=nil)
         not_support_method("draw_icosahedron")
       end
-      
+
       def draw_teapot(filled, x, y, z, scale, color=nil)
         not_support_method("draw_teapot")
       end

data/lib/rabbit/renderer/pixmap/base.rb

@@ -10,11 +10,11 @@ module Rabbit
         include Renderer::Base
 
         @@depth = nil
-        
+
         attr_accessor :width, :height, :pango_context
-        
+
         attr_accessor :filename
-        
+
         def initialize(canvas, width=nil, height=nil)
           super(canvas)
           @width = width

data/lib/rabbit/renderer/print/base.rb

@@ -10,7 +10,7 @@ module Rabbit
 
         attr_writer :filename
         attr_accessor :show_page
-        
+
         def initialize(canvas)
           super
           @filename = nil
@@ -19,11 +19,11 @@ module Rabbit
         def page_width
           @page_width - page_margin_left - page_margin_right
         end
-        
+
         def page_height
           @page_height - page_margin_top - page_margin_bottom
         end
-        
+
         def width
           page_width
         end
@@ -36,12 +36,12 @@ module Rabbit
           super
           init_paper
         end
-        
+
         def paper_height=(value)
           super
           init_paper
         end
-        
+
         def pre_print(slide_size)
           @show_page = true
         end

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

@@ -15,8 +15,6 @@ module Rabbit
     module Print
       class Cairo
         include Engine::Cairo
-        alias_method :cairo_rsvg_available?, :rsvg_available?
-        alias_method :cairo_poppler_available?, :poppler_available?
         include Base
 
         class << self
@@ -28,7 +26,7 @@ module Rabbit
             end
           end
         end
-        
+
         def initialize(canvas)
           super
           init_paper
@@ -44,19 +42,19 @@ module Rabbit
           return if canceled
           @context.target.finish
         end
-        
+
         def pre_parse
         end
-        
+
         def post_parse
         end
-        
+
         def post_apply_theme
         end
-        
+
         def post_move(old_index, index)
         end
-        
+
         def post_move_in_slide(old_index, index)
         end
 
@@ -75,14 +73,6 @@ module Rabbit
           draw_rectangle(true, x, y, w, h, @background)
         end
 
-        def rsvg_available?
-          cairo_rsvg_available?
-        end
-
-        def poppler_available?
-          cairo_poppler_available?
-        end
-
         private
         def init_paper
           default_width_mm = 360
@@ -90,7 +80,7 @@ module Rabbit
           @page_width = @paper_width || default_width_mm
           @page_height = @paper_height || default_height_mm
         end
-        
+
         def init_color
           super
           @foreground = make_color("black")
@@ -126,6 +116,9 @@ module Rabbit
             surface = ::Cairo::SVGSurface.new(*args)
             surface.restrict_to_version(::Cairo::SVG_VERSION_1_2)
             surface
+          when /\.cs/i
+            args[0] = ::Cairo::ScriptDevice.new(args[0])
+            ::Cairo::ScriptSurface.new(*args)
           else
             @canvas.logger.warn(_("can't find printer for %s") % filename)
             args[0] = "default.ps"

data/lib/rabbit/renderer/print/layout.rb

@@ -33,7 +33,7 @@ module Rabbit
           @margin_bottom = renderer.margin_bottom
         end
       end
-      
+
       class Layout2 < LayoutBase
 
         def initialize(renderer)
@@ -43,7 +43,7 @@ module Rabbit
           @margin_top ||= 30
           @margin_bottom ||= 30
         end
-        
+
         def slide_width
           page_width - @margin_left - @margin_right
         end
@@ -51,7 +51,7 @@ module Rabbit
         def slide_height
           (page_height / 2) - @margin_top - @margin_bottom
         end
-        
+
         def normalize_x(x)
           x + @margin_left
         end
@@ -69,7 +69,7 @@ module Rabbit
           (current_index % 2) == 1
         end
       end
-      
+
       class LayoutMore < LayoutBase
         def initialize(renderer)
           super
@@ -78,7 +78,7 @@ module Rabbit
           @margin_top ||= 10
           @margin_bottom ||= 10
         end
-        
+
         def slide_width
           (page_width / 2) - @margin_left - @margin_right
         end
@@ -87,7 +87,7 @@ module Rabbit
           base = page_height / (slides_per_page / 2.0).ceil
           base - @margin_top - @margin_bottom
         end
-        
+
         def normalize_x(x)
           base = @margin_left
           unless left?

data/lib/rabbit/renderer/print/multiple.rb

@@ -11,17 +11,17 @@ module Rabbit
         include Base
         include Kernel
         extend Forwardable
-      
+
         def_delegators(:@canvas, :current_index)
-        
+
         def_delegators(:@print, :filename, :filename=)
         def_delegators(:@print, :foreground=, :background=)
         def_delegators(:@print, :background_image=)
-        
+
         def_delegators(:@print, :page_width, :page_width=)
         def_delegators(:@print, :page_height, :page_height=)
         def_delegators(:@print, :width, :height)
-        
+
         def_delegators(:@print, :pre_print, :post_print, :post_apply_theme)
         def_delegators(:@print, :post_move, :post_move_in_slide, :post_iconify)
         def_delegators(:@print, :post_fullscreen, :post_unfullscreen)
@@ -31,17 +31,14 @@ module Rabbit
 
         def_delegators(:@print, :make_color, :make_layout)
         def_delegators(:@print, :create_pango_context)
-        
-        def_delegators(:@print, :clear_theme)
 
-        def_delegators(:@print, :rsvg_available?, :poppler_available?)
-        def_delegators(:@print, :rsvg_available?, :poppler_available?)
+        def_delegators(:@print, :clear_theme)
 
         def initialize(canvas)
           @print = Print.new(canvas)
           super
         end
-        
+
         def width
           @slide_width ||= @layout.slide_width
         end
@@ -59,12 +56,12 @@ module Rabbit
           super
           @print.page_margin_right = margin
         end
-        
+
         def page_margin_top=(margin)
           super
           @print.page_margin_top = margin
         end
-        
+
         def page_margin_bottom=(margin)
           super
           @print.page_margin_bottom = margin
@@ -79,18 +76,18 @@ module Rabbit
           super
           @print.margin_right = margin
         end
-        
+
         def margin_top=(margin)
           super
           @print.margin_top = margin
         end
-        
+
         def margin_bottom=(margin)
           super
           @print.margin_bottom = margin
         end
 
-        
+
         def draw_slide(slide, simulation)
           @print.show_page = need_show_page?
           @print.internal_draw_slide(slide, simulation) do

data/lib/rabbit/size.rb

@@ -0,0 +1,65 @@
+module Rabbit
+  class Size
+    attr_reader :real_width
+    attr_reader :real_height
+    attr_reader :logical_width
+    attr_reader :logical_height
+    attr_reader :logical_margin_left
+    attr_reader :logical_margin_right
+    attr_reader :logical_margin_top
+    attr_reader :logical_margin_bottom
+    attr_reader :ratio
+    def initialize(width, height, ratio)
+      @real_width = width
+      @real_height = height
+      @ratio = ratio
+      compute_logical_size
+    end
+
+    def have_logical_margin_x?
+      @logical_margin_left > 0 or
+        @logical_margin_right > 0
+    end
+
+    def have_logical_margin_y?
+      @logical_margin_top > 0 or
+        @logical_margin_bottom > 0
+    end
+
+    def have_logical_margin?
+      have_logical_margin_x? or have_logical_margin_y?
+    end
+
+    private
+    def compute_logical_size
+      real_ratio = @real_width.to_f / @real_height.to_f
+      if real_ratio == @ratio
+        @logical_width = @real_width
+        @logical_height = @real_height
+        @logical_margin_left = 0
+        @logical_margin_right = 0
+        @logical_margin_top = 0
+        @logical_margin_bottom = 0
+        return
+      end
+
+      if real_ratio > @ratio
+        @logical_width = @real_width * (@ratio / real_ratio)
+        @logical_height = @real_height
+        width_margin = @real_width - @logical_width
+        @logical_margin_left = width_margin / 2
+        @logical_margin_right = width_margin / 2
+        @logical_margin_top = 0
+        @logical_margin_bottom = 0
+      else
+        @logical_width = @real_width
+        @logical_height = @real_height * (real_ratio / @ratio)
+        height_margin = @real_height - @logical_height
+        @logical_margin_left = 0
+        @logical_margin_right = 0
+        @logical_margin_top = height_margin / 2
+        @logical_margin_bottom = height_margin / 2
+      end
+    end
+  end
+end

data/lib/rabbit/soap/driver.rb

@@ -15,7 +15,7 @@ module Rabbit
         info.concat(Utils.arg_list(Front.instance_method(name).arity))
         @@method_infos << info
       end
-      
+
       def initialize(end_point, soap_action=nil)
         super(end_point, Rabbit::SOAP::NS, soap_action)
 

data/lib/rabbit/soap/server.rb

@@ -28,6 +28,6 @@ EOS
         add_rpc_servant(front)
       end
     end
-    
+
   end
 end

data/lib/rabbit/source/argf.rb

@@ -3,18 +3,18 @@ require "rabbit/source/base"
 module Rabbit
   module Source
     class ARGF
-      
+
       include Base
-      
+
       def self.initial_args_description
         N_("none (get from STDIN) or [FILE_NAMES]")
       end
-      
+
       def initialize(encoding, logger, argf)
         super(encoding, logger)
         @argf = argf
       end
-      
+
       private
       def _read
         begin