rabbit 2.1.6 → 2.1.7

data/lib/rabbit/source-generator/markdown.rb

@@ -34,7 +34,7 @@ module Rabbit
       def definition_list_item(item, description)
         [
           item,
-          "   #{description}",
+          ":   #{description}",
         ].join("\n")
       end
 

data/lib/rabbit/stock.rb

@@ -6,7 +6,7 @@ module Rabbit
   module Stock
     include GetText
 
-    RABBIT = :rabbit_rabbit
+    RABBIT = "rabbit-rabbit"
 
     @@loaded = false
 
@@ -14,14 +14,14 @@ module Rabbit
     def init(canvas)
       return if @@loaded
       @@loaded = true
-      Gtk::Stock.add(RABBIT, N_("Rabbit"))
+      Gtk::Stock.add(RABBIT.to_sym, N_("Rabbit"))
       begin
         image_theme = Theme::Searcher.find_theme("rabbit-images", true)
         file = Theme::Searcher.find_file("lavie-icon.png", [image_theme])
         loader = ImageLoader.new(file)
         loader.resize(32, 32)
         factory = Gtk::IconFactory.new
-        factory.add(RABBIT.to_s, Gtk::IconSet.new(loader.pixbuf))
+        factory.add(RABBIT, Gtk::IconSet.new(loader.pixbuf))
         factory.add_default
       rescue LoadError
         canvas.logger.warn($!)

data/lib/rabbit/task/slide.rb

@@ -235,7 +235,7 @@ module Rabbit
       def rabbit(*arguments)
         unless Rabbit::Command::Rabbit.run(*arguments)
           message = "failed to run Rabbit"
-          message << ": #{arguments.join(', ')}" unless arguments.empty?
+          message << ": #{arguments.join(' ')}" unless arguments.empty?
           raise message
         end
       end

data/lib/rabbit/theme/applier.rb

@@ -597,7 +597,7 @@ module Rabbit
       end
 
       def connect_key(keyval, modifier=nil, flags=nil, &block)
-        modifier ||= Gdk::Window::ModifierType.new
+        modifier ||= Gdk::ModifierType.new
         flags ||= Gtk::AccelFlags::VISIBLE
         canvas.connect_key(keyval, modifier, flags, &block)
       end

data/lib/rabbit/theme/clear-blue/clear-blue.rb

@@ -86,14 +86,6 @@ match(Slide, Body) do |bodies|
   end
 end
 
-match("**", BlockQuote) do |quotes|
-  quotes.each do |quote|
-    first_element = quote.elements.first
-    next unless first_element.is_a?(Paragraph)
-    first_element.indent = first_element.prop_get("size")
-  end
-end
-
 @slide_logo_image ||= "clear-blue-headline-background.png"
 include_theme("slide-logo")
 

data/lib/rabbit/theme/image-slide-number/image-slide-number.rb

@@ -24,14 +24,16 @@ end
 @image_slide_number_margin_right ||= nil
 @image_slide_number_margin_bottom ||= nil
 
-@image_slide_number_draw_parameters ||=
-  {:reflect => {:ratio => 0.5, :alpha => 0.5}}
+@image_slide_number_draw_parameters ||= {
+  :reflect => {:ratio => 0.5, :alpha => 0.5},
+  :draw_scaled_pixbuf => false,
+}
 
 match(Slide) do |slides|
   slides.delete_post_draw_proc_by_name(proc_name)
-  
+
   break if @image_slide_number_uninstall
-  
+
   loader = ImageLoader.new(find_file(@image_slide_number_image))
   unless @image_slide_number_show_text
     start_loader = ImageLoader.new(find_file(@image_slide_number_start_image))
@@ -51,7 +53,7 @@ match(Slide) do |slides|
     "color" => @image_slide_number_text_color,
     "weight" => "heavy",
   }
-  
+
   slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
     if simulation
       image_height =  canvas.height * @image_slide_number_space_ratio

data/lib/rabbit/theme/image-timer/image-timer.rb

@@ -30,7 +30,10 @@ end
 
 @image_timer_auto_updating = false
 
-@image_timer_draw_parameters ||= {:reflect => {:ratio => 0.5, :alpha => 0.5}}
+@image_timer_draw_parameters ||= {
+  :reflect => {:ratio => 0.5, :alpha => 0.5},
+  :draw_scaled_pixbuf => false,
+}
 
 match(Slide) do |slides|
   slides.delete_post_draw_proc_by_name(proc_name)

data/lib/rabbit/utils.rb

@@ -1,3 +1,19 @@
+# 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.
+
 require 'tempfile'
 require 'nkf'
 
@@ -184,9 +200,10 @@ module Rabbit
       window = base.window
       screen = window.screen
       num = screen.get_monitor(window)
-      monitor = screen.monitor_geometry(num)
+      monitor = screen.get_monitor_geometry(num)
       window_x, window_y = window.origin
-      window_width, window_height = window.size
+      window_width  = window.width
+      window_height = window.height
       target_width, target_height = target.size_request
 
       args = [window_x, window_y, window_width, window_height]
@@ -381,7 +398,7 @@ module Rabbit
     end
 
     def screen_depth
-      default_screen.root_window.depth
+      default_screen.system_visual.depth
     end
 
     def mm_to_inch(mm)

data/lib/rabbit/version.rb

@@ -15,5 +15,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Rabbit
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

data/lib/rabbit/video-window.rb

@@ -35,15 +35,15 @@ module Rabbit
 
     private
     def init_window
-      @video_window = Gtk::Window.new(Gtk::Window::POPUP)
+      @video_window = Gtk::Window.new(:popup)
       @video_window.modal = true
       @video_window.set_transient_for(window)
 
-      vbox = Gtk::VBox.new
+      vbox = Gtk::Box.new(:vertical)
       vbox.pack_start(@video)
       @video_window.add(vbox)
       @video_window.signal_connect('frame-event') do |widget, event|
-        if event.event_type == Gdk::Event::Type::BUTTON_PRESS
+        if event.event_type == Gdk::EventType::BUTTON_PRESS
           @video.toggle
         end
       end

data/po/en/rabbit.edit.po

@@ -220,7 +220,7 @@ msgstr ""
 msgid "Save as image"
 msgstr ""
 
-#: ../lib/rabbit/action/basic.rb:83 ../lib/rabbit/command/rabbit.rb:306
+#: ../lib/rabbit/action/basic.rb:83 ../lib/rabbit/command/rabbit.rb:308
 msgid "Print"
 msgstr ""
 
@@ -604,417 +604,401 @@ msgstr ""
 msgid "rabbit-theme-benchmark-en.gem"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:135 ../lib/rabbit/theme/blue-bar/property.rb:1 ../lib/rabbit/theme/blue-circle/property.rb:1 ../lib/rabbit/theme/centering-rabbit/property.rb:1 ../lib/rabbit/theme/clear-blue/property.rb:1 ../lib/rabbit/theme/cozmixng/property.rb:1 ../lib/rabbit/theme/dark-gradation/property.rb:1 ../lib/rabbit/theme/day-white/property.rb:1 ../lib/rabbit/theme/debian/property.rb:1 ../lib/rabbit/theme/default/property.rb:1 ../lib/rabbit/theme/enishi-green/property.rb:1 ../lib/rabbit/theme/green-circle/property.rb:1 ../lib/rabbit/theme/image-viewer/property.rb:1 ../lib/rabbit/theme/lightning-clear-blue/property.rb:1 ../lib/rabbit/theme/lightning-monochrome/property.rb:1 ../lib/rabbit/theme/lightning-rabbit/property.rb:1 ../lib/rabbit/theme/lightning-simple/property.rb:1 ../lib/rabbit/theme/lightning-talk/property.rb:1 ../lib/rabbit/theme/nari/property.rb:1 ../lib/rabbit/theme/night-black/property.rb:1 ../lib/rabbit/theme/pdf/property.rb:1 ../lib/rabbit/theme/rabbit/property.rb:1 ../lib/rabbit/theme/ranguba/property.rb:1 ../lib/rabbit/theme/red-frame/property.rb:1 ../lib/rabbit/theme/ruby-gnome2/property.rb:1 ../lib/rabbit/theme/rubykaigi2011/property.rb:1
+#: ../lib/rabbit/command/rabbit.rb:137 ../lib/rabbit/theme/blue-bar/property.rb:1 ../lib/rabbit/theme/blue-circle/property.rb:1 ../lib/rabbit/theme/centering-rabbit/property.rb:1 ../lib/rabbit/theme/clear-blue/property.rb:1 ../lib/rabbit/theme/cozmixng/property.rb:1 ../lib/rabbit/theme/dark-gradation/property.rb:1 ../lib/rabbit/theme/day-white/property.rb:1 ../lib/rabbit/theme/debian/property.rb:1 ../lib/rabbit/theme/default/property.rb:1 ../lib/rabbit/theme/enishi-green/property.rb:1 ../lib/rabbit/theme/green-circle/property.rb:1 ../lib/rabbit/theme/image-viewer/property.rb:1 ../lib/rabbit/theme/lightning-clear-blue/property.rb:1 ../lib/rabbit/theme/lightning-monochrome/property.rb:1 ../lib/rabbit/theme/lightning-rabbit/property.rb:1 ../lib/rabbit/theme/lightning-simple/property.rb:1 ../lib/rabbit/theme/lightning-talk/property.rb:1 ../lib/rabbit/theme/nari/property.rb:1 ../lib/rabbit/theme/night-black/property.rb:1 ../lib/rabbit/theme/pdf/property.rb:1 ../lib/rabbit/theme/rabbit/property.rb:1 ../lib/rabbit/theme/ranguba/property.rb:1 ../lib/rabbit/theme/red-frame/property.rb:1 ../lib/rabbit/theme/ruby-gnome2/property.rb:1 ../lib/rabbit/theme/rubykaigi2011/property.rb:1
 msgid "Theme"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:138
+#: ../lib/rabbit/command/rabbit.rb:140
 msgid "Add [PATH] to load path."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:143
+#: ../lib/rabbit/command/rabbit.rb:145
 msgid "Use [THEME] as theme."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:150
+#: ../lib/rabbit/command/rabbit.rb:152
 msgid "Use [THEME] for comment."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:156
+#: ../lib/rabbit/command/rabbit.rb:158
 msgid "Use [TIME] as allotted time."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:162 ../lib/rabbit/html/generator.rb:404
+#: ../lib/rabbit/command/rabbit.rb:164 ../lib/rabbit/html/generator.rb:404
 msgid "Source"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:169
+#: ../lib/rabbit/command/rabbit.rb:171
 msgid ""
 "When select %s\n"
 "specify %s\n"
 "as [SOURCE_INFOS]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:176
+#: ../lib/rabbit/command/rabbit.rb:178
 msgid "Specify source type as [TYPE]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:177 ../lib/rabbit/console.rb:165 ../lib/rabbit/console.rb:182
+#: ../lib/rabbit/command/rabbit.rb:179 ../lib/rabbit/console.rb:165 ../lib/rabbit/console.rb:182
 msgid "Select from [%s]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:178
+#: ../lib/rabbit/command/rabbit.rb:180
 msgid "Note: case insensitive."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:192
+#: ../lib/rabbit/command/rabbit.rb:194
 msgid "Specify source encoding as [ENCODING]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:193 ../lib/rabbit/command/rabbit.rb:199 ../lib/rabbit/command/rabbit.rb:366 ../lib/rabbit/command/rabbit.rb:373 ../lib/rabbit/command/rabbit.rb:380 ../lib/rabbit/command/rabbit.rb:387 ../lib/rabbit/command/rabbit.rb:412 ../lib/rabbit/command/rabbit.rb:419 ../lib/rabbit/command/rabbit.rb:426 ../lib/rabbit/command/rabbit.rb:433 ../lib/rabbit/command/rabbit.rb:554 ../lib/rabbit/console.rb:150
+#: ../lib/rabbit/command/rabbit.rb:195 ../lib/rabbit/command/rabbit.rb:201 ../lib/rabbit/command/rabbit.rb:368 ../lib/rabbit/command/rabbit.rb:375 ../lib/rabbit/command/rabbit.rb:382 ../lib/rabbit/command/rabbit.rb:389 ../lib/rabbit/command/rabbit.rb:414 ../lib/rabbit/command/rabbit.rb:421 ../lib/rabbit/command/rabbit.rb:428 ../lib/rabbit/command/rabbit.rb:435 ../lib/rabbit/command/rabbit.rb:548 ../lib/rabbit/console.rb:150
 msgid "(auto)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:198
+#: ../lib/rabbit/command/rabbit.rb:200
 msgid "Specify base URI or path of source as [BASE]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:204
+#: ../lib/rabbit/command/rabbit.rb:206
 msgid "Initial state"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:207
+#: ../lib/rabbit/command/rabbit.rb:209
 msgid "Toggle full screen mode."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:213
+#: ../lib/rabbit/command/rabbit.rb:215
 msgid "Toggle index mode."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:219
+#: ../lib/rabbit/command/rabbit.rb:221
 msgid "Show the Nth slide. (zero-based)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:225
+#: ../lib/rabbit/command/rabbit.rb:227
 msgid "Size"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:228
+#: ../lib/rabbit/command/rabbit.rb:230
 msgid "Set window geometry [GEOMETRY]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:229
+#: ../lib/rabbit/command/rabbit.rb:231
 msgid "Format: WIDTHxHEIGHT+X+Y"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:236
+#: ../lib/rabbit/command/rabbit.rb:238
 msgid "Set window width to [WIDTH]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:243
+#: ../lib/rabbit/command/rabbit.rb:245
 msgid "Set window height to [HEIGHT]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:248
+#: ../lib/rabbit/command/rabbit.rb:250
 msgid ""
 "Set window width and height to\n"
 "[WIDTH] and [HEIGHT]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:261
+#: ../lib/rabbit/command/rabbit.rb:263
 msgid "Save"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:264
+#: ../lib/rabbit/command/rabbit.rb:266
 msgid "Save as image and exit."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:269
+#: ../lib/rabbit/command/rabbit.rb:271
 msgid "Specify saved image type as [TYPE]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:276
+#: ../lib/rabbit/command/rabbit.rb:278
 msgid "Specify saved image base name as [BASE_NAME]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:277 ../lib/rabbit/command/rabbit.rb:315
+#: ../lib/rabbit/command/rabbit.rb:279 ../lib/rabbit/command/rabbit.rb:317
 msgid "Title of slide"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:282
+#: ../lib/rabbit/command/rabbit.rb:284
 msgid "Output HTML for viewing saved images."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:288
+#: ../lib/rabbit/command/rabbit.rb:290
 msgid "Output index HTML for navigating slides."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:294
+#: ../lib/rabbit/command/rabbit.rb:296
 msgid "Specify base URI of RSS as [URI]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:295
+#: ../lib/rabbit/command/rabbit.rb:297
 msgid "RSS is generated only when HTML is output."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:301
+#: ../lib/rabbit/command/rabbit.rb:303
 msgid "Specify source filenam as [FILENAME]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:309
+#: ../lib/rabbit/command/rabbit.rb:311
 msgid "Print and exit."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:314
+#: ../lib/rabbit/command/rabbit.rb:316
 msgid "Specify printed out filename as [FILENAME]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:321
+#: ../lib/rabbit/command/rabbit.rb:323
 msgid "Set slides per page."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:327
+#: ../lib/rabbit/command/rabbit.rb:329
 msgid "Draw scaled image."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:328
+#: ../lib/rabbit/command/rabbit.rb:330
 msgid "Better look for displaying but lesser look for printing."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:333
+#: ../lib/rabbit/command/rabbit.rb:335
 msgid "Paper"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:337
+#: ../lib/rabbit/command/rabbit.rb:339
 msgid "Set paper width to [WIDTH] Pt."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:338
+#: ../lib/rabbit/command/rabbit.rb:340
 msgid "(landscape A4 width)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:344
+#: ../lib/rabbit/command/rabbit.rb:346
 msgid "Set paper height to [HEIGHT] Pt."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:345
+#: ../lib/rabbit/command/rabbit.rb:347
 msgid "(landscape A4 height)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:349
+#: ../lib/rabbit/command/rabbit.rb:351
 msgid ""
 "Set paper width and height to\n"
 "[WIDTH] Pt and [HEIGHT] Pt."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:351
+#: ../lib/rabbit/command/rabbit.rb:353
 msgid "(landscape A4 size)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:361
+#: ../lib/rabbit/command/rabbit.rb:363
 msgid "Margin"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:365
+#: ../lib/rabbit/command/rabbit.rb:367
 msgid "Set left margin for slides per page mode print."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:372
+#: ../lib/rabbit/command/rabbit.rb:374
 msgid "Set right margin for slides per page mode print."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:379
+#: ../lib/rabbit/command/rabbit.rb:381
 msgid "Set top margin for slides per page mode print."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:386
+#: ../lib/rabbit/command/rabbit.rb:388
 msgid "Set bottom margin for slides per page mode print."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:391
+#: ../lib/rabbit/command/rabbit.rb:393
 msgid "[ALL]"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:392
+#: ../lib/rabbit/command/rabbit.rb:394
 msgid "[TOP_BOTTOM],[LEFT_RIGHT]"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:393
+#: ../lib/rabbit/command/rabbit.rb:395
 msgid "[TOP],[LEFT_RIGHT],[BOTTOM]"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:394
+#: ../lib/rabbit/command/rabbit.rb:396
 msgid "[TOP],[RIGHT],[BOTTOM],[LEFT]"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:397
+#: ../lib/rabbit/command/rabbit.rb:399
 msgid "Set margin for slides per page mode print."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:411
+#: ../lib/rabbit/command/rabbit.rb:413
 msgid "Set left page margin."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:418
+#: ../lib/rabbit/command/rabbit.rb:420
 msgid "Set right page margin."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:425
+#: ../lib/rabbit/command/rabbit.rb:427
 msgid "Set top page margin."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:432
+#: ../lib/rabbit/command/rabbit.rb:434
 msgid "Set bottom page margin."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:439
+#: ../lib/rabbit/command/rabbit.rb:441
 msgid "Set page margin."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:451
+#: ../lib/rabbit/command/rabbit.rb:453
 msgid "dRuby"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:454
+#: ../lib/rabbit/command/rabbit.rb:456
 msgid "Specify whether to use dRuby."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:460
+#: ../lib/rabbit/command/rabbit.rb:462
 msgid "Specify dRuby URI."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:466
+#: ../lib/rabbit/command/rabbit.rb:468
 msgid "Specify whether to output dRuby URI."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:471
+#: ../lib/rabbit/command/rabbit.rb:473
 msgid "SOAP"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:474
+#: ../lib/rabbit/command/rabbit.rb:476
 msgid "Specify whether to use SOAP."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:480
+#: ../lib/rabbit/command/rabbit.rb:482
 msgid "Specify SOAP host as [HOST]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:487
+#: ../lib/rabbit/command/rabbit.rb:489
 msgid "Specify SOAP port as [PORT]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:492
+#: ../lib/rabbit/command/rabbit.rb:494
 msgid "XML-RPC"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:495
+#: ../lib/rabbit/command/rabbit.rb:497
 msgid "Specify whether to use XML-RPC."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:501
+#: ../lib/rabbit/command/rabbit.rb:503
 msgid "Specify XML-RPC host as [HOST]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:508
+#: ../lib/rabbit/command/rabbit.rb:510
 msgid "Specify XML-RPC port as [PORT]."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:513
-msgid "Server"
-msgstr ""
-
-#: ../lib/rabbit/command/rabbit.rb:516
-msgid "Specify whether to run as server."
-msgstr ""
-
-#: ../lib/rabbit/command/rabbit.rb:521
+#: ../lib/rabbit/command/rabbit.rb:515
 msgid "Public level"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:528
+#: ../lib/rabbit/command/rabbit.rb:522
 msgid "Specify public level."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:529
+#: ../lib/rabbit/command/rabbit.rb:523
 msgid "Select from the following:"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:538 ../lib/rabbit/command/rabbit.rb:563 ../lib/rabbit/command/rabbit.rb:570
+#: ../lib/rabbit/command/rabbit.rb:532 ../lib/rabbit/command/rabbit.rb:557 ../lib/rabbit/command/rabbit.rb:564
 msgid "(%s)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:543 ../lib/rabbit/theme/clutter-comment/property.rb:1 ../lib/rabbit/theme/footer-comment/property.rb:1 ../lib/rabbit/theme/stream-comment/property.rb:1
+#: ../lib/rabbit/command/rabbit.rb:537 ../lib/rabbit/theme/clutter-comment/property.rb:1 ../lib/rabbit/theme/footer-comment/property.rb:1 ../lib/rabbit/theme/stream-comment/property.rb:1
 msgid "Comment"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:546 ../lib/rabbit/command/rabbit.rb:552
+#: ../lib/rabbit/command/rabbit.rb:540 ../lib/rabbit/command/rabbit.rb:546
 msgid "Deprecated. Just ignored."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:547
+#: ../lib/rabbit/command/rabbit.rb:541
 msgid "Specify initial comment source."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:548
+#: ../lib/rabbit/command/rabbit.rb:542
 msgid "(default source)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:553
+#: ../lib/rabbit/command/rabbit.rb:547
 msgid "Specify comment source encoding."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:557
+#: ../lib/rabbit/command/rabbit.rb:551
 msgid "Migemo"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:562
+#: ../lib/rabbit/command/rabbit.rb:556
 msgid "Specify search paths for Migemo static dictionary."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:569
+#: ../lib/rabbit/command/rabbit.rb:563
 msgid "Specify static dictionary name for Migemo."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:574
+#: ../lib/rabbit/command/rabbit.rb:568
 msgid "3D"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:577
+#: ../lib/rabbit/command/rabbit.rb:571
 msgid "Specify whether to use OpenGL if available."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:582
+#: ../lib/rabbit/command/rabbit.rb:576
 msgid "Display"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:585
+#: ../lib/rabbit/command/rabbit.rb:579
 msgid "Specify whether to keep above window."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:590
+#: ../lib/rabbit/command/rabbit.rb:584
 msgid "Others"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:593
+#: ../lib/rabbit/command/rabbit.rb:587
 msgid "Check slide source syntax and exit."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:598
+#: ../lib/rabbit/command/rabbit.rb:592
 msgid "Show a native window ID of the Rabbit window if available."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:599
+#: ../lib/rabbit/command/rabbit.rb:593
 msgid "e.g. The ID is the ID of X resource on X window system."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:640
+#: ../lib/rabbit/command/rabbit.rb:634
 msgid "Choose a Rabbit source file"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:757
+#: ../lib/rabbit/command/rabbit.rb:751
 msgid "dRuby URI <%s> is in use."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:776
+#: ../lib/rabbit/command/rabbit.rb:770
 msgid "port <%s> for SOAP is in use."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:797
+#: ../lib/rabbit/command/rabbit.rb:791
 msgid "port <%s> for XML-RPC is in use."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:862
+#: ../lib/rabbit/command/rabbit.rb:852
 msgid "Window ID: %d"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:911
-msgid "going to shutdown..."
-msgstr ""
-
-#: ../lib/rabbit/command/rabbit.rb:913
-msgid "DRb.thread done."
-msgstr ""
-
 #: ../lib/rabbit/console.rb:114
 msgid "Usage: %s [options]"
 msgstr ""
@@ -1055,6 +1039,78 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
+#: ../lib/rabbit/error.rb:29
+msgid "no such file: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:39
+msgid "can't handle %s because the following command can't be run successfully: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:49
+msgid "tried gs commands: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:57
+msgid "tried dia commands: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:65
+msgid "tried gimp commands: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:93
+msgid "Unknown property: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:101
+msgid "can't allocate color: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:112
+msgid "not exist: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:120
+msgid "not a file: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:128
+msgid "can not be read: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:136
+msgid "immutable source type: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:155
+msgid "not available interface: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:163
+msgid "can't find HTML template: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:171
+msgid "can't find theme RD template: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:179
+msgid "invalid motion: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:194
+msgid "invalid value of size property \"%{prop_name}\" of image \"%{filename}\": %{value}"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:215
+msgid "unknown cursor type: %s"
+msgstr ""
+
+#: ../lib/rabbit/error.rb:221
+msgid "print isn't supported"
+msgstr ""
+
 #: ../lib/rabbit/gem-finder.rb:46
 msgid "Installing gem: %s"
 msgstr ""
@@ -1083,11 +1139,11 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: ../lib/rabbit/image/pdf.rb:54
+#: ../lib/rabbit/image/pdf.rb:52
 msgid "invalid PDF page number: <%s>"
 msgstr ""
 
-#: ../lib/rabbit/image/pdf.rb:59
+#: ../lib/rabbit/image/pdf.rb:57
 msgid "%s page doesn't exist in PDF"
 msgstr ""
 
@@ -1095,7 +1151,7 @@ msgstr ""
 msgid "%s: Information window"
 msgstr ""
 
-#: ../lib/rabbit/info-window.rb:275
+#: ../lib/rabbit/info-window.rb:282
 msgid "unlimited"
 msgstr ""
 
@@ -1131,7 +1187,7 @@ msgstr ""
 msgid "can't convert to current locale from UTF-8: %s"
 msgstr ""
 
-#: ../lib/rabbit/menu.rb:61
+#: ../lib/rabbit/menu.rb:77
 msgid "Jump to the %dth slide"
 msgstr ""
 
@@ -1163,19 +1219,19 @@ msgstr ""
 msgid "tried mimeTeX commands: %s"
 msgstr ""
 
-#: ../lib/rabbit/parser/markdown/converter.rb:150
+#: ../lib/rabbit/parser/markdown/converter.rb:154 ../test/parser/test-markdown.rb:306
 msgid "multiple ![alt]{image} in a paragraph isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/markdown/converter.rb:317
+#: ../lib/rabbit/parser/markdown/converter.rb:323
 msgid "multiple ![]('XXX.png'){:align='right'} isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:48
+#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:61
 msgid "multiple 'align = right' isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:141
+#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:154
 msgid "RTtool isn't available"
 msgstr ""
 
@@ -1183,16 +1239,20 @@ msgstr ""
 msgid "[BUG] [%s] %s extension isn't available."
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:88
+#: ../lib/rabbit/parser/wiki/output.rb:105
 msgid "horizontal rule is unsupported"
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:338
+#: ../lib/rabbit/parser/wiki/output.rb:355
 msgid "unsupported list type: %s"
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:437
-msgid "multiple {{image, 'XXX.png', :align => :right}} isn't supported."
+#: ../lib/rabbit/parser/wiki/output.rb:388 ../test/parser/test-wiki.rb:46
+msgid "inline {{image(...)}} isn't supported."
+msgstr ""
+
+#: ../lib/rabbit/parser/wiki/output.rb:464 ../test/parser/test-wiki.rb:66
+msgid "multiple {{image(..., :align => :right)}} isn't supported."
 msgstr ""
 
 #: ../lib/rabbit/path-manipulatable.rb:28
@@ -1203,78 +1263,6 @@ msgstr ""
 msgid "Creating file:      %s"
 msgstr ""
 
-#: ../lib/rabbit/rabbit.rb:60
-msgid "no such file: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:70
-msgid "can't handle %s because the following command can't be run successfully: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:80
-msgid "tried gs commands: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:88
-msgid "tried dia commands: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:96
-msgid "tried gimp commands: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:124
-msgid "Unknown property: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:132
-msgid "can't allocate color: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:143
-msgid "not exist: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:151
-msgid "not a file: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:159
-msgid "can not be read: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:167
-msgid "immutable source type: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:186
-msgid "not available interface: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:194
-msgid "can't find HTML template: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:202
-msgid "can't find theme RD template: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:210
-msgid "invalid motion: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:225
-msgid "invalid value of size property \"%{prop_name}\" of image \"%{filename}\": %{value}"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:246
-msgid "unknown cursor type: %s"
-msgstr ""
-
-#: ../lib/rabbit/rabbit.rb:252
-msgid "print isn't supported"
-msgstr ""
-
 #: ../lib/rabbit/readme-parser.rb:35
 msgid "No README found"
 msgstr ""
@@ -1283,7 +1271,7 @@ msgstr ""
 msgid "%s does not support: %s"
 msgstr ""
 
-#: ../lib/rabbit/renderer/print/cairo.rb:123
+#: ../lib/rabbit/renderer/print/cairo.rb:114
 msgid "can't find printer for %s"
 msgstr ""