rabbit 2.1.6 → 2.1.7

data/lib/rabbit/parser/wiki.rb

@@ -16,6 +16,10 @@ module Rabbit
     class Wiki
       unshift_loader(self)
       class << self
+        def format_name
+          "Wiki"
+        end
+
         def match?(source)
           extension = source.extension
           if extension.nil?

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

@@ -1,15 +1,32 @@
-require 'rabbit/element'
-require 'rabbit/parser/pause-support'
-require 'rabbit/parser/ext/escape'
-require 'rabbit/parser/ext/inline'
-require 'rabbit/parser/ext/image'
-require 'rabbit/parser/ext/enscript'
-require 'rabbit/parser/ext/tex'
-require 'rabbit/parser/ext/aafigure'
-require 'rabbit/parser/ext/blockdiag'
-require 'rabbit/parser/ext/coderay'
-require 'rabbit/parser/ext/emacs'
-require 'rabbit/parser/ext/entity'
+# Copyright (C) 2007-2015  Kouhei Sutou <kou@cozmixng.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+require "rabbit/gettext"
+require "rabbit/element"
+require "rabbit/parser/pause-support"
+require "rabbit/parser/ext/escape"
+require "rabbit/parser/ext/inline"
+require "rabbit/parser/ext/image"
+require "rabbit/parser/ext/enscript"
+require "rabbit/parser/ext/tex"
+require "rabbit/parser/ext/aafigure"
+require "rabbit/parser/ext/blockdiag"
+require "rabbit/parser/ext/coderay"
+require "rabbit/parser/ext/emacs"
+require "rabbit/parser/ext/entity"
 
 module Rabbit
   module Parser
@@ -69,7 +86,7 @@ module Rabbit
               @parent = slide
             else
               @title_slide = false
-              slide = Slide.new(HeadLine.new(title))
+              slide = Element::Slide.new(HeadLine.new(title))
               body = Body.new
               slide << body
               @parent = body
@@ -340,6 +357,8 @@ module Rabbit
 
         def evaluate_inline_plugin(src)
           InlinePlugin.new(self).instance_eval(src, "(inline plugin)")
+        rescue ParseError
+          raise
         rescue
           @canvas.logger.warn($!)
           nil
@@ -347,12 +366,15 @@ module Rabbit
 
         def evaluate_block_plugin(src)
           BlockPlugin.new(self).instance_eval(src, "(block plugin)")
+        rescue ParseError
+          raise
         rescue
           @canvas.logger.warn($!)
           nil
         end
 
         class InlinePlugin
+          include GetText
           include Element
           include Parser::Ext::Inline
           include Parser::Ext::Entity
@@ -361,6 +383,11 @@ module Rabbit
             @private = Private.new(output)
           end
 
+          def image(source, props={})
+            raise ParseError,
+                  _("inline {{image(...)}} isn't supported.")
+          end
+
           def entity(entity, *rest)
             return nil unless TABLE.include?(entity)
 
@@ -434,12 +461,12 @@ module Rabbit
               body = @output.current_body
               if body["background-image"]
                 raise ParseError,
-                      _("multiple {{image, 'XXX.png', :align => :right}} " + \
+                      _("multiple {{image(..., :align => :right)}} " + \
                         "isn't supported.")
               end
               body["background-image"] = source
               props.each do |name, value|
-                name = name.to_s.gsub(/_/, '-')
+                name = name.to_s.gsub(/_/, "-")
                 value = value.to_s if name == "align"
                 body["background-image-#{name}"] = value
               end

data/lib/rabbit/progress.rb

@@ -4,7 +4,7 @@ module Rabbit
   class Progress
     attr_reader :window, :foreground, :background
     def initialize
-      @window = Gtk::Window.new(Gtk::Window::POPUP)
+      @window = Gtk::Window.new(:popup)
       @window.app_paintable = true
       @bar = Gtk::ProgressBar.new
       @bar.show_text = true

data/lib/rabbit/rabbit.rb

@@ -19,237 +19,20 @@ require "rabbit/config"
 require "rabbit/gettext"
 require "rabbit/version"
 
+require "rabbit/error"
+
+require "rabbit/gtk"
+
 module Rabbit
   TMP_DIR_NAME = ".tmp"
 
+  @@application = nil
   @@gui_init_procs = []
   @@cleanup_procs = []
 
-  module_function
-  def add_gui_init_proc(proc=Proc.new)
-    @@gui_init_procs << proc
-  end
-
-  def gui_init
-    @@gui_init_procs.each do |proc|
-      proc.call
-    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
-
-  class ImageLoadError < Error
-  end
-
-  class ImageFileDoesNotExistError < ImageLoadError
-    attr_reader :filename
-    def initialize(filename)
-      @filename = filename
-      super(_("no such file: %s") % filename)
-    end
-  end
-
-  class ImageLoadWithExternalCommandError < ImageLoadError
-    attr_reader :type, :command
-    def initialize(type, command, additional_info=nil)
-      @type = type
-      @command = command
-      format =
-        _("can't handle %s because the following command " \
-          "can't be run successfully: %s")
-      msg = format % [@type, @command]
-      msg << "\n#{additional_info}" if additional_info
-      super(msg)
-    end
-  end
-
-  class EPSCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, tried_commands)
-      format = _("tried gs commands: %s")
-      additional_info = format % tried_commands.inspect
-      super("EPS", command, additional_info)
-    end
-  end
-
-  class DiaCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, tried_commands)
-      format = _("tried dia commands: %s")
-      additional_info = format % tried_commands.inspect
-      super("Dia", command, additional_info)
-    end
-  end
-
-  class GIMPCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, tried_commands)
-      format = _("tried gimp commands: %s")
-      additional_info = format % tried_commands.inspect
-      super("GIMP", command, additional_info)
-    end
-  end
-
-  class TeXCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, additional_info=nil)
-      super("TeX", command, additional_info)
-    end
-  end
-
-  class AAFigureCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, additional_info=nil)
-      super("aafigure", command, additional_info)
-    end
-  end
-
-  class BlockDiagCanNotHandleError < ImageLoadWithExternalCommandError
-    def initialize(command, additional_info=nil)
-      super("blockdiag", command, additional_info)
-    end
-  end
-
-  class UnknownPropertyError < Error
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("Unknown property: %s") % name)
-    end
-  end
-
-  class CantAllocateColorError < Error
-    attr_reader :color
-    def initialize(color)
-      @color = color
-      super(_("can't allocate color: %s"), color)
-    end
-  end
-
-  class SourceUnreadableError < Error
-  end
-
-  class NotExistError < SourceUnreadableError
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("not exist: %s") % @name)
-    end
-  end
-
-  class NotFileError < SourceUnreadableError
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("not a file: %s") % @name)
-    end
-  end
-
-  class NotReadableError < SourceUnreadableError
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("can not be read: %s") % @name)
-    end
-  end
-
-  class ImmutableSourceTypeError < Error
-    attr_reader :source_type
-    def initialize(source_type)
-      @source_type = source_type
-      super(_("immutable source type: %s") % @source_type)
-    end
-  end
-
-  class ThemeExit < Error
-    def initialize(message=nil)
-      @have_message = !message.nil?
-      super
-    end
-
-    def have_message?
-      @have_message
-    end
-  end
-
-  class NotAvailableInterfaceError < Error
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("not available interface: %s") % @name)
-    end
-  end
-
-  class CantFindHTMLTemplate < Error
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("can't find HTML template: %s") % @name)
-    end
-  end
-
-  class CantFindThemeRDTemplate < Error
-    attr_reader :name
-    def initialize(name)
-      @name = name
-      super(_("can't find theme RD template: %s") % @name)
-    end
-  end
-
-  class InvalidMotionError < Error
-    attr_reader :motion
-    def initialize(motion)
-      @motion = motion
-      super(_("invalid motion: %s") % @motion)
-    end
-  end
-
-  class InvalidImageSizeError < Error
-    attr_reader :filename, :prop_name, :value
-    def initialize(filename, prop_name, value)
-      @filename = filename
-      @prop_name = prop_name
-      @value = value
-      params = {
-        :filename => filename,
-        :prop_name => prop_name,
-        :value => value,
-      }
-      super(_("invalid value of size property \"%{prop_name}\" " \
-              "of image \"%{filename}\": %{value}") % params)
-    end
-  end
-
-  class ParseFinish < Error
-  end
-
-  class ParseError < Error
-  end
-
-  class UnsupportedFormatError < Error
-  end
-
-  class ApplyFinish < Error
-  end
-
-  class UnknownCursorTypeError < Error
-    attr_reader :type
-    def intialize(type)
-      @type = type
-      super(_("unknown cursor type: %s") % @type)
-    end
-  end
-
-  class NoPrintSupportError < Error
-    def initialize
-      super(_("print isn't supported"))
+  class << self
+    def application
+      @@application ||= Gtk::Application.new(nil, :flags_none)
     end
   end
 end

data/lib/rabbit/renderer/base.rb

@@ -302,7 +302,7 @@ module Rabbit
       end
 
       def make_canvas_with_off_screen_renderer
-        make_canvas_with_renderer(Pixmap) do |canvas|
+        make_canvas_with_renderer(Pixmap::Cairo) do |canvas|
           canvas.width = @canvas.width
           canvas.height = @canvas.height
           setup_3d(canvas)

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

@@ -35,6 +35,11 @@ module Rabbit
           end
         end
 
+        def size
+          refresh_size
+          @size
+        end
+
         def redraw
           widget.queue_draw
         end
@@ -140,7 +145,8 @@ module Rabbit
         private
         def set_drawable(drawable)
           @drawable = drawable
-          w, h = @drawable.size
+          w = @drawable.width
+          h = @drawable.height
           @default_size_ratio = w.to_f / h.to_f
           @size_ratio = @default_size_ratio
           set_size(w, h)
@@ -162,8 +168,9 @@ module Rabbit
         def refresh_size
           return unless @size_dirty
 
-          w, h = @drawable.size
-          @size = Size.new(w, h, @size.ratio)
+          @size = Size.new(@drawable.width,
+                           @drawable.height,
+                           @size.ratio)
           @size_dirty = false
         end
 

data/lib/rabbit/renderer/display/button-handler.rb

@@ -46,9 +46,9 @@ module Rabbit
         end
 
         BUTTON_PRESS_HANDLER = {
-          Gdk::Event::Type::BUTTON_PRESS => "handle_button_press",
-          Gdk::Event::Type::BUTTON2_PRESS => "handle_button2_press",
-          Gdk::Event::Type::BUTTON3_PRESS => "handle_button3_press",
+          Gdk::EventType::BUTTON_PRESS => "handle_button_press",
+          Gdk::EventType::BUTTON2_PRESS => "handle_button2_press",
+          Gdk::EventType::BUTTON3_PRESS => "handle_button3_press",
         }
 
         def handle_button_release(event, last_button_press_event)

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

@@ -254,11 +254,11 @@ module Rabbit
           set_expose_event
           set_configure_event_after
 
-          event_mask = Gdk::Event::BUTTON_PRESS_MASK
-          event_mask |= Gdk::Event::BUTTON_RELEASE_MASK
-          event_mask |= Gdk::Event::BUTTON1_MOTION_MASK
-          event_mask |= Gdk::Event::BUTTON2_MOTION_MASK
-          event_mask |= Gdk::Event::BUTTON3_MOTION_MASK
+          event_mask = Gdk::EventMask::BUTTON_PRESS_MASK
+          event_mask |= Gdk::EventMask::BUTTON_RELEASE_MASK
+          event_mask |= Gdk::EventMask::BUTTON1_MOTION_MASK
+          event_mask |= Gdk::EventMask::BUTTON2_MOTION_MASK
+          event_mask |= Gdk::EventMask::BUTTON3_MOTION_MASK
           @embed.add_events(event_mask)
           set_key_press_event(@embed)
           set_button_event(@embed)
@@ -494,10 +494,10 @@ module Rabbit
         def grab
           Gtk.grab_add(@embed)
           Gdk.pointer_grab(@embed.window, false,
-                           Gdk::Event::BUTTON_PRESS_MASK |
-                           Gdk::Event::BUTTON_RELEASE_MASK |
-                           Gdk::Event::SCROLL_MASK |
-                           Gdk::Event::POINTER_MOTION_MASK,
+                           Gdk::EventMask::BUTTON_PRESS_MASK |
+                           Gdk::EventMask::BUTTON_RELEASE_MASK |
+                           Gdk::EventMask::SCROLL_MASK |
+                           Gdk::EventMask::POINTER_MOTION_MASK,
                            nil, nil,
                            Gdk::Event::CURRENT_TIME)
         end