rabbit 2.1.6 → 2.1.7

data/doc/ja/index.rd

@@ -12,12 +12,12 @@ Rabbitはテキスト形式でプレゼン資料を作成できるので、常
 ンテーションツールです。
 
 また、キーボードによるインターフェイスが充実していることもプ
-ログラマにはうれしい機能です。スライドをKeynoteや他のプレゼン
-テーションツールで作成しているユーザでも、スライド表示だけを
-Rabbitを使うことができます。見栄えの調整などスライド作成は
+ログラマにはうれしい機能です。Keynoteや他のプレゼンテーションツールで
+スライドを作成しているユーザでも、スライド表示にRabbitを使う
+ことができます。具体的には、見栄えの調整などのスライド作成は
 GUIのプレゼンテーションツールで行い、スライド表示・操作のイン
 ターフェイスだけキーボード操作に強いRabbitを使う、というよう
-な使い分けができるということです。
+に使い分けられます。
 
 さらに、Rabbitではスライドの見た目をRubyでカスタマイズできま
 す。プレゼンテーションの時もプログラムできるなんて、Rubyistに

data/doc/ja/news.rd

@@ -4,6 +4,62 @@ title: お知らせ
 apply_data: false
 ---
 {% raw %}
+== 2.1.7: 2015-09-05
+
+Markdownでのノートマークアップ対応リリース。
+
+=== 改良
+
+==== rabbit
+
+  * GDKレンダリングエンジンを削除。（だいぶ前からcairoが必須になってい
+    てGDKレンダリングエンジンがなくても問題なくなっていたため。）
+  * GTK+ 3対応を進めた。（まだ完成していない。） [okkezさんがパッチ提供]
+  * 使われていない(({--server}))オプションを削除。
+  * Wikiマークアップ: 未サポートの書き方のときのエラーメッセージを改善。
+  * Markdownマークアップ: 1つの段落内に複数の画像を指定したときに「未
+    サポートである」とメッセージを出力するようにした。
+    [GitHub#71][Colin Deanさんが報告]
+  * Markdownマークアップ: ノートマークアップ対応。 [yoku0825さんが提案]
+
+    書式は(('{::note}...{:/note}'))です。
+
+    例：
+
+      普通のテキスト{::note}ノート{:/note}普通のテキスト
+
+==== テーマ
+
+  * image-timer: メモリー使用量を削減。
+  * image-slide-number: メモリー使用量を削減。
+  * clear-blue: 引用ブロックでの最初の行のインデントをやめた。
+
+==== ドキュメント
+
+  * READMEをMarkdownでマークアップした。
+    [GitHub#72][Toshi MARUYAMAさんがパッチ提供]
+  * Rabbitの概要の説明を改良。 [GitHub#74][YU-TAYUさんがパッチ提供]
+
+=== 修正
+
+==== rabbit-slide
+
+  * 不正なMarkdownを出力する問題を修正。 [Matafumi Yokoyamaさん]
+
+==== ドキュメント
+
+  * サイドメニューが隠れている問題を修正。
+    [GitHub#75][YU-TAYUさんが報告]
+
+=== 感謝
+
+  * okkezさん
+  * Matafumi Yokoyamaさん
+  * Colin Deanさん
+  * Toshi MARUYAMAさん
+  * YU-TAYUさん
+  * yoku0825さん
+
 == 2.1.6: 2015-02-26
 
 2.1.5のバグフィックスリリース。
@@ -82,14 +138,17 @@ Markdownサポートを改善したリリース。
         ~~~ruby
         # Rubyコード
         ~~~
-    * GitHub Flavor Markdownスタイルの例:
+    * GitHub Flavored Markdownスタイルの例:
         ```ruby
         # Rubyコード
         ```
   * Markdown: シンタックスハイライトの言語指定の属性名として
     (({language}))もサポート。
     * 例:
-          # Rubyコード
+        # タイトル
+
+            def hello
+            end
         {: language="ruby"}
   * Markdown: blockdiagに対応。
     * 例:

data/lib/rabbit/command/rabbit.rb

@@ -48,10 +48,12 @@ module Rabbit
         require "rabbit/canvas"
         GC.enable
 
-        succeeded = __send__("do_#{@options.action}")
-
-        ::Rabbit.cleanup
-
+        application = ::Rabbit.application
+        succeeded = false
+        application.signal_connect("activate") do
+          succeeded = __send__("do_#{@options.action}")
+        end
+        application.run
         succeeded
       end
 
@@ -510,14 +512,6 @@ module Rabbit
             options.xmlrpc_port = port
           end
 
-          parser.category _("Server")
-
-          parser.on("--server",
-                    _("Specify whether to run as server."),
-                    "(#{options.server})") do
-            options.action = :server
-          end
-
           parser.category _("Public level")
 
           levels = Front::PublicLevel.constants.sort_by do |const|
@@ -818,11 +812,8 @@ module Rabbit
       end
 
       def do_save_as_image
-        Renderer::Pixmap.init
-        ::Rabbit.gui_init
-
         source = make_source
-        canvas = make_canvas(Renderer::Pixmap)
+        canvas = make_canvas(Renderer::Pixmap::Cairo)
         setup_size(canvas)
         setup_image_info(canvas)
         setup_print_info(canvas)
@@ -843,7 +834,6 @@ module Rabbit
           display_init_options[:preferred_class_name] = "ClutterEmbed"
         end
         Renderer::Display.init(display_init_options)
-        ::Rabbit.gui_init
 
         source = make_source
         canvas = make_canvas(Renderer::Display)
@@ -871,51 +861,6 @@ module Rabbit
         setup_soap(front) if @options.use_soap
         setup_xmlrpc(front) if @options.use_xmlrpc
 
-        Gtk.main
-
-        true
-      end
-
-      def do_server
-        ::Rabbit.gui_init
-
-        # GLib::Log.cancel_handler
-        # GLib::Log.set_handler(nil, GLib::Log::LEVEL_ERROR)
-
-        source = make_source
-        canvas = make_canvas(Renderer::Pixmap)
-        setup_size(canvas)
-        setup_paper_size(canvas)
-        setup_image_info(canvas)
-        setup_print_info(canvas)
-        setup_3d_info(canvas)
-        apply_theme_if_need(canvas)
-        parse(canvas, source)
-
-        soap_server_thread = nil
-        xmlrpc_server_thread = nil
-
-        front = make_front(canvas)
-        setup_druby(front) if @options.use_druby
-        if @options.use_soap
-          soap_server_thread = setup_soap(front)
-        end
-        if @options.use_xmlrpc
-          xmlrpc_server_thread = setup_xmlrpc(front)
-        end
-
-        soap_server_thread.join if soap_server_thread
-        xmlrpc_server_thread.join if xmlrpc_server_thread
-        if @options.use_druby
-          prev = trap(:INT) do
-            @logger.info(_("going to shutdown..."))
-            DRb.thread.exit
-            @logger.info(_("DRb.thread done."))
-            trap(:INT, prev)
-          end
-          DRb.thread.join
-        end
-
         true
       end
 

data/lib/rabbit/cursor-manager.rb

@@ -1,18 +1,37 @@
-require 'rabbit/gtk'
-
-require 'rabbit/rabbit'
+# Copyright (C) 2006-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.
 
 module Rabbit
   class CursorManager
-    @@blank_cursor = nil
+    @@cursors = nil
+
+    class << self
+      def cursors
+        @@cursors ||= {
+          :blank  => Gdk::Cursor.new(:blank_cursor),
+          :pencil => Gdk::Cursor.new(:pencil),
+          :hand   => Gdk::Cursor.new(:hand1),
+        }
+      end
+    end
 
     attr_accessor :current
     def initialize
       @stocks = {}
       @current = nil
-      @blank_cursor = blank_cursor
-      @pencil_cursor = Gdk::Cursor.new(Gdk::Cursor::PENCIL)
-      @hand_cursor = Gdk::Cursor.new(Gdk::Cursor::HAND1)
     end
 
     def keep(name)
@@ -38,24 +57,12 @@ module Rabbit
       if type.nil?
         nil
       else
-        name = "@#{type}_cursor"
-        unless instance_variable_defined?(name)
+        cursor = self.class.cursors[type]
+        if cursor.nil?
           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)
+        cursor
       end
-      @@blank_cursor
     end
   end
 end

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

@@ -87,7 +87,7 @@ module Rabbit
 
         private
         def make_thumbnail_maker(canvas, width, height)
-          new_canvas = Canvas.new(canvas.logger, Renderer::Pixmap)
+          new_canvas = Canvas.new(canvas.logger, Renderer::Pixmap::Cairo)
           new_canvas.width = width
           new_canvas.height = height
           new_canvas.pango_context = canvas.create_pango_context

data/lib/rabbit/error.rb

@@ -0,0 +1,224 @@
+# Copyright (C) 2004-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.
+
+module Rabbit
+  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"))
+    end
+  end
+end