rabbit 1.0.2 → 1.0.3

data/Gemfile

@@ -7,7 +7,7 @@ gem 'rsvg2'
 gem 'poppler'
 gem 'hikidoc'
 gem 'nokogiri'
-gem "rack"
+gem "sinatra"
 gem "haml"
 gem "rdtool"
 gem "coderay"

data/bin/rabbit

@@ -578,14 +578,10 @@ end
 def make_source(options, argv, logger)
   if options.source_type == :auto
     if argv.empty?
-      if Rabbit::Utils.support_console_input?
-        options.source_type = Rabbit::Source::ARGF
-      else
-        file_name = choose_source_file_by_dialog(options)
-        exit if file_name.nil?
-        argv = [file_name]
-        options.source_type = Rabbit::Source::File
-      end
+      file_name = choose_source_file_by_dialog(options)
+      exit if file_name.nil?
+      argv = [file_name]
+      options.source_type = Rabbit::Source::File
     elsif argv.size == 1 and /\Ahttps?:\/\// =~ argv[0]
       options.source_type = Rabbit::Source::URI
     else

data/doc/_layouts/en.html

@@ -22,7 +22,7 @@ country: US
   {{ content }}
   <nav id="sidebar">
     <h3>The Latest Release</h3>
-    <p><a href="en/news.html">1.0.2</a> is the latest release. It had been released at 2011-07-15.</p>
+    <p><a href="en/news.html">1.0.3</a> is the latest release. It had been released at 2011-07-17.</p>
     <h3>Links</h3>
     <ul>
       <li><a href="/en/">README</a></li>

data/doc/_layouts/ja.html

@@ -22,7 +22,7 @@ country: JP
   {{ content }}
   <nav id="sidebar">
     <h3>最新リリース</h3>
-    <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.2</a>が最新リリースです。</p>
+    <p>2011-07-17にリリースされた<a href="/ja/news.html">1.0.3</a>が最新リリースです。</p>
     <h3>リンク</h3>
     <ul>
       <li><a href="/ja/">はじめに</a></li>

data/doc/en/index.rd

@@ -178,6 +178,12 @@ lib/rabbit/div/prototype.js released under an MIT-style
 licence. For more information see ((<Prototype JavaScript
 Framework|URL:http://prototype.conio.net/>)).
 
+The author of
+data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-white.jpg
+and
+data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-black.jpg
+is norio. And it's licensed by CC-by-3.0.
+
 If you want to get a copy of the mascot character PSD files
 ask the program author. He'll forward the request to the
 author of the image.

data/doc/en/news.rd

@@ -3,6 +3,37 @@ layout: en
 title: News
 apply_data: false
 ---
+== 1.0.3: 2011-07-17
+
+A bug fix release of 1.0.2.
+
+=== Improvements
+
+==== Core
+
+  * Supported RubyGems 1.8.5.
+    [Reported by okkez]
+  * rabbit command doesn't use standard input as the default
+    source type.
+
+=== Fixes
+
+==== Core
+
+  * Fixed a problem that Wiki notation support doesn't show error.
+    [Reported by kimura wataru]
+  * Added missing Sinatra dependency.
+
+==== Theme
+
+  * footer-comment: Fixed a problem that a comment is hidden
+    shortly.
+
+=== Thanks
+
+  * okkez
+  * kimura wataru
+
 == 1.0.2: 2011-07-15
 
 RubyKaigi2011 release.

data/doc/index.html.en

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p><a href="/en/news.html">1.0.2</a> is the latest release. It had been released at 2011-07-15.</p>
+  <p><a href="/en/news.html">1.0.3</a> is the latest release. It had been released at 2011-07-17.</p>
 </div>
 
 <section class="screenshots">

data/doc/index.html.ja

@@ -5,7 +5,7 @@ lang_suffix: true
 no_sidebar: true
 ---
 <div class="latest-release">
-  <p>2011-07-15にリリースされた<a href="/ja/news.html">1.0.2</a>が最新リリースです。</p>
+  <p>2011-07-17にリリースされた<a href="/ja/news.html">1.0.3</a>が最新リリースです。</p>
 </div>
 
 <section class="screenshots">

data/doc/ja/index.rd

@@ -178,6 +178,11 @@ lib/rabbit/div/prototype.jsはMITスタイルのライセンスになりま
 詳しくは((<Prototype JavaScript
 Framework|URL:http://prototype.conio.net/>))を見てください。
 
+data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-white.jpg
+と
+data/rabbit/image/rubykaigi2011-images/rubykaigi2011-background-black.jpg
+の作者はnorioさんでラインセンスはCC-by-3.0です。
+
 == メーリングリスト
 
 ((<users.html/ユーザー>))ページにメーリングリストへの参

data/doc/ja/news.rd

@@ -3,6 +3,37 @@ layout: ja
 title: お知らせ
 apply_data: false
 ---
+== 1.0.3: 2011-07-17
+
+1.0.2のバグフィックスバージョン。
+
+=== 改良
+
+==== 本体
+
+  * RubyGems 1.8.5対応。
+    [okkezさんが報告]
+  * rabbitコマンドにファイル名を指定しなかった場合は標準入力
+    を使うのではなく、常にファイル選択ダイアログを開くように
+    した。
+
+=== 修正
+
+==== 本体
+
+  * Wiki記法を使えないのに使えるようにみえてしまう問題を修正。
+    [木村さんが報告]
+  * Sinatraへの依存関係が抜けていた問題を修正。
+
+==== テーマ
+
+  * footer-comment: コメントがすぐに消えてしまう問題を修正。
+
+=== 感謝
+
+  * okkezさん
+  * 木村さん
+
 == 1.0.2: 2011-07-15
 
 日本Ruby会議2011リリース。

data/lib/rabbit/default-config.rb

@@ -3,14 +3,22 @@ require 'rbconfig'
 module Rabbit
   module Config
     IMAGE_PATH = [
-      ::Config::CONFIG["datadir"],
+      RbConfig::CONFIG["datadir"],
       File.join(".", "data"),
     ]
-    if Object.const_defined?(:Gem)
+    append_path_from_gem = lambda do
+      return unless Object.const_defined?(:Gem)
       rabbit_gem_spec = Gem.loaded_specs["rabbit"]
-      if rabbit_gem_spec and rabbit_gem_spec.loaded?
+      return if rabbit_gem_spec.nil?
+      unless rabbit_gem_spec.respond_to?(:activated?)
+        def rabbit_gem_spec.activated?
+          loaded?
+        end
+      end
+      if rabbit_gem_spec.activated?
         IMAGE_PATH.unshift(File.join(rabbit_gem_spec.full_gem_path, "data"))
       end
     end
+    append_path_from_gem.call
   end
 end

data/lib/rabbit/middleware/controller.rb

@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require "sinatra/base"
+require "haml"
 
 module Rabbit
   module Middleware

data/lib/rabbit/parser/wiki.rb

@@ -1,15 +1,19 @@
-begin
-  require "hikidoc"
-rescue LoadError
-  require "rubygems"
-  require "hikidoc"
-end
+require "hikidoc"
 
 require "rabbit/parser/base"
 
 module Rabbit
   module Parser
     class Wiki < Base
+    end
+  end
+end
+
+require "rabbit/parser/wiki/output"
+
+module Rabbit
+  module Parser
+    class Wiki
       unshift_loader(self)
       class << self
         def match?(source)
@@ -28,5 +32,3 @@ module Rabbit
     end
   end
 end
-
-require "rabbit/parser/wiki/output"

data/lib/rabbit/rabbit.rb

@@ -8,7 +8,7 @@ require "rabbit/gettext"
 
 module Rabbit
 
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   TMP_DIR_NAME = ".tmp"
 

data/lib/rabbit/theme/footer-comment/footer-comment.rb

@@ -35,14 +35,15 @@ match(SlideElement) do |slides|
     comments << comment
   end
 
-  redraw_time = Time.now
+  redraw_time = nil
   slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
     unless simulation
       unless comments.empty?
+        redraw_time ||= Time.now
         content = comments.first
         text = Text.new(ERB::Util.h(content.strip.gsub("\n", " ")))
         if Time.now - redraw_time > @footer_comment_min_display_time
-          redraw_time = Time.now
+          redraw_time = nil
           if @footer_comment_keep_last_comment
             comments.shift if comments.size > 1
           else

data/po/rabbit.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-15 16:08+0900\n"
+"POT-Creation-Date: 2011-07-13 20:40+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: ../../lib/rabbit/html/generator.rb:403 ../../bin/rabbit:99
+#: ../../lib/rabbit/html/generator.rb:403 ../../bin/rabbit:85
 msgid "Source"
 msgstr ""
 
@@ -123,7 +123,7 @@ msgstr ""
 msgid "Save as image"
 msgstr ""
 
-#: ../../lib/rabbit/action/basic.rb:83 ../../bin/rabbit:236
+#: ../../lib/rabbit/action/basic.rb:83 ../../bin/rabbit:222
 msgid "Print"
 msgstr ""
 
@@ -316,6 +316,7 @@ msgstr ""
 #: ../../lib/rabbit/theme/default/property.rb:1
 #: ../../lib/rabbit/theme/rabbit/property.rb:1
 #: ../../lib/rabbit/theme/blue-circle/property.rb:1
+#: ../../lib/rabbit/theme/pdf-tortoise-and-hare/property.rb:1
 #: ../../lib/rabbit/theme/lightning-rabbit/property.rb:1
 #: ../../lib/rabbit/theme/lightning-talk/property.rb:1
 #: ../../lib/rabbit/theme/debian/property.rb:1
@@ -326,7 +327,7 @@ msgstr ""
 #: ../../lib/rabbit/theme/green-circle/property.rb:1
 #: ../../lib/rabbit/theme/ruby-gnome2/property.rb:1
 #: ../../lib/rabbit/theme/lightning-monochrome/property.rb:1
-#: ../../lib/rabbit/theme/pdf/property.rb:1 ../../bin/rabbit:72
+#: ../../lib/rabbit/theme/pdf/property.rb:1 ../../bin/rabbit:70
 msgid "Theme"
 msgstr ""
 
@@ -360,10 +361,10 @@ msgstr ""
 msgid "Specify locale dir as [DIR]."
 msgstr ""
 
-#: ../../lib/rabbit/console.rb:69 ../../bin/rabbit:130 ../../bin/rabbit:136
-#: ../../bin/rabbit:296 ../../bin/rabbit:303 ../../bin/rabbit:310
-#: ../../bin/rabbit:317 ../../bin/rabbit:342 ../../bin/rabbit:349
-#: ../../bin/rabbit:356 ../../bin/rabbit:363 ../../bin/rabbit:494
+#: ../../lib/rabbit/console.rb:69 ../../bin/rabbit:116 ../../bin/rabbit:122
+#: ../../bin/rabbit:282 ../../bin/rabbit:289 ../../bin/rabbit:296
+#: ../../bin/rabbit:303 ../../bin/rabbit:328 ../../bin/rabbit:335
+#: ../../bin/rabbit:342 ../../bin/rabbit:349 ../../bin/rabbit:480
 msgid "(auto)"
 msgstr ""
 
@@ -372,7 +373,7 @@ msgid "Specify logger type as [TYPE]."
 msgstr ""
 
 #: ../../lib/rabbit/console.rb:84 ../../lib/rabbit/console.rb:101
-#: ../../bin/rabbit:114
+#: ../../bin/rabbit:100
 msgid "Select from [%s]."
 msgstr ""
 
@@ -478,7 +479,6 @@ msgstr ""
 #: ../../lib/rabbit/theme/color-circle-method-list/property.rb:1
 #: ../../lib/rabbit/theme/ruby-gnome2-slide/property.rb:1
 #: ../../lib/rabbit/theme/slide-background-image/property.rb:1
-#: ../../lib/rabbit/theme/default-comment/property.rb:1
 #: ../../lib/rabbit/theme/slide-number/property.rb:1
 #: ../../lib/rabbit/theme/icon/property.rb:1
 #: ../../lib/rabbit/theme/color-circle-block-quote/property.rb:1
@@ -778,7 +778,7 @@ msgstr ""
 #: ../../lib/rabbit/theme/stream-comment/property.rb:1
 #: ../../lib/rabbit/theme/twitter-comment/property.rb:1
 #: ../../lib/rabbit/theme/clutter-comment/property.rb:1
-#: ../../lib/rabbit/theme/footer-comment/property.rb:1 ../../bin/rabbit:483
+#: ../../lib/rabbit/theme/footer-comment/property.rb:1 ../../bin/rabbit:469
 msgid "Comment"
 msgstr ""
 
@@ -984,6 +984,14 @@ msgid ""
 "Project; i.e. displays their text colored blue."
 msgstr ""
 
+#: ../../lib/rabbit/theme/pdf-tortoise-and-hare/property.rb:2
+msgid "PDF with The Tortoise and The Hare"
+msgstr ""
+
+#: ../../lib/rabbit/theme/pdf-tortoise-and-hare/property.rb:3
+msgid "Theme for PDF with The Tortoise and The Hare"
+msgstr ""
+
 #: ../../lib/rabbit/theme/cozmixng-powered-by/property.rb:2
 msgid "COZMIXNGPoweredBy"
 msgstr ""
@@ -1282,18 +1290,6 @@ msgstr ""
 msgid "Etc"
 msgstr ""
 
-#: ../../lib/rabbit/theme/default-comment/property.rb:2
-msgid "DefaultComment"
-msgstr ""
-
-#: ../../lib/rabbit/theme/default-comment/property.rb:3
-msgid "Toolkit to set up default comment theme."
-msgstr ""
-
-#: ../../lib/rabbit/theme/default-comment/property.rb:4
-msgid "Sets up default comment theme."
-msgstr ""
-
 #: ../../lib/rabbit/theme/debian/property.rb:2
 msgid "Debian Theme"
 msgstr ""
@@ -1904,6 +1900,10 @@ msgstr ""
 msgid "[FILENAME]"
 msgstr ""
 
+#: ../../lib/rabbit/source/rwiki.rb:12
+msgid "[RWIKI_SOAP_IF_URI] and [PAGE_NAME]"
+msgstr ""
+
 #: ../../lib/rabbit/source/uri.rb:25
 msgid "URI"
 msgstr ""
@@ -1916,11 +1916,11 @@ msgstr ""
 msgid "[USER] and [TITLE]"
 msgstr ""
 
-#: ../../lib/rabbit/canvas.rb:610
+#: ../../lib/rabbit/canvas.rb:608
 msgid "Unknown action: %s"
 msgstr ""
 
-#: ../../lib/rabbit/canvas.rb:682
+#: ../../lib/rabbit/canvas.rb:679
 msgid "Processing..."
 msgstr ""
 
@@ -1976,382 +1976,374 @@ msgstr ""
 msgid "Line width:"
 msgstr ""
 
-#: ../../bin/rabbit:75 ../../bin/rabbit-theme-manager:27
+#: ../../bin/rabbit:73 ../../bin/rabbit-theme-manager:27
 msgid "Add [PATH] to load path."
 msgstr ""
 
-#: ../../bin/rabbit:80
+#: ../../bin/rabbit:78
 msgid "Use [THEME] as theme."
 msgstr ""
 
-#: ../../bin/rabbit:87
-msgid "Use [THEME] for comment."
-msgstr ""
-
-#: ../../bin/rabbit:93
-msgid "Use [TIME] as allotted time."
-msgstr ""
-
-#: ../../bin/rabbit:106
+#: ../../bin/rabbit:92
 msgid ""
 "When select %s\n"
 "specify %s\n"
 "as [SOURCE_INFOS]."
 msgstr ""
 
-#: ../../bin/rabbit:113
+#: ../../bin/rabbit:99
 msgid "Specify source type as [TYPE]."
 msgstr ""
 
-#: ../../bin/rabbit:115
+#: ../../bin/rabbit:101
 msgid "Note: case insensitive."
 msgstr ""
 
-#: ../../bin/rabbit:129
+#: ../../bin/rabbit:115
 msgid "Specify source encoding as [ENCODING]."
 msgstr ""
 
-#: ../../bin/rabbit:135
+#: ../../bin/rabbit:121
 msgid "Specify base URI or path of source as [BASE]."
 msgstr ""
 
-#: ../../bin/rabbit:141
+#: ../../bin/rabbit:127
 msgid "Initial state"
 msgstr ""
 
-#: ../../bin/rabbit:144
+#: ../../bin/rabbit:130
 msgid "Toggle full screen mode."
 msgstr ""
 
-#: ../../bin/rabbit:150
+#: ../../bin/rabbit:136
 msgid "Toggle index mode."
 msgstr ""
 
-#: ../../bin/rabbit:156
+#: ../../bin/rabbit:142
 msgid "Size"
 msgstr ""
 
-#: ../../bin/rabbit:159
+#: ../../bin/rabbit:145
 msgid "Set window geometry [GEOMETRY]."
 msgstr ""
 
-#: ../../bin/rabbit:160
+#: ../../bin/rabbit:146
 msgid "Format: WIDTHxHEIGHT+X+Y"
 msgstr ""
 
-#: ../../bin/rabbit:167 ../../bin/rabbit-theme-manager:43
+#: ../../bin/rabbit:153 ../../bin/rabbit-theme-manager:43
 msgid "Set window width to [WIDTH]."
 msgstr ""
 
-#: ../../bin/rabbit:174 ../../bin/rabbit-theme-manager:50
+#: ../../bin/rabbit:160 ../../bin/rabbit-theme-manager:50
 msgid "Set window height to [HEIGHT]."
 msgstr ""
 
-#: ../../bin/rabbit:179 ../../bin/rabbit-theme-manager:55
+#: ../../bin/rabbit:165 ../../bin/rabbit-theme-manager:55
 msgid ""
 "Set window width and height to\n"
 "[WIDTH] and [HEIGHT]."
 msgstr ""
 
-#: ../../bin/rabbit:191
+#: ../../bin/rabbit:177
 msgid "Save"
 msgstr ""
 
-#: ../../bin/rabbit:194
+#: ../../bin/rabbit:180
 msgid "Save as image and exit."
 msgstr ""
 
-#: ../../bin/rabbit:199
+#: ../../bin/rabbit:185
 msgid "Specify saved image type as [TYPE]."
 msgstr ""
 
-#: ../../bin/rabbit:206
+#: ../../bin/rabbit:192
 msgid "Specify saved image base name as [BASE_NAME]."
 msgstr ""
 
-#: ../../bin/rabbit:207 ../../bin/rabbit:245
+#: ../../bin/rabbit:193 ../../bin/rabbit:231
 msgid "Title of slide"
 msgstr ""
 
-#: ../../bin/rabbit:212
+#: ../../bin/rabbit:198
 msgid "Output HTML for viewing saved images."
 msgstr ""
 
-#: ../../bin/rabbit:218
+#: ../../bin/rabbit:204
 msgid "Output index HTML for navigating slides."
 msgstr ""
 
-#: ../../bin/rabbit:224
+#: ../../bin/rabbit:210
 msgid "Specify base URI of RSS as [URI]."
 msgstr ""
 
-#: ../../bin/rabbit:225
+#: ../../bin/rabbit:211
 msgid "RSS is generated only when HTML is output."
 msgstr ""
 
-#: ../../bin/rabbit:231
+#: ../../bin/rabbit:217
 msgid "Specify source filenam as [FILENAME]."
 msgstr ""
 
-#: ../../bin/rabbit:239
+#: ../../bin/rabbit:225
 msgid "Print and exit."
 msgstr ""
 
-#: ../../bin/rabbit:244
+#: ../../bin/rabbit:230
 msgid "Specify printed out filename as [FILENAME]."
 msgstr ""
 
-#: ../../bin/rabbit:251
+#: ../../bin/rabbit:237
 msgid "Set slides per page."
 msgstr ""
 
-#: ../../bin/rabbit:257
+#: ../../bin/rabbit:243
 msgid "Draw scaled image."
 msgstr ""
 
-#: ../../bin/rabbit:258
+#: ../../bin/rabbit:244
 msgid "Better look for displaying but lesser look for printing."
 msgstr ""
 
-#: ../../bin/rabbit:263
+#: ../../bin/rabbit:249
 msgid "Paper"
 msgstr ""
 
-#: ../../bin/rabbit:267
+#: ../../bin/rabbit:253
 msgid "Set paper width to [WIDTH] Pt."
 msgstr ""
 
-#: ../../bin/rabbit:268
+#: ../../bin/rabbit:254
 msgid "(landscape A4 width)"
 msgstr ""
 
-#: ../../bin/rabbit:274
+#: ../../bin/rabbit:260
 msgid "Set paper height to [HEIGHT] Pt."
 msgstr ""
 
-#: ../../bin/rabbit:275
+#: ../../bin/rabbit:261
 msgid "(landscape A4 height)"
 msgstr ""
 
-#: ../../bin/rabbit:279
+#: ../../bin/rabbit:265
 msgid ""
 "Set paper width and height to\n"
 "[WIDTH] Pt and [HEIGHT] Pt."
 msgstr ""
 
-#: ../../bin/rabbit:281
+#: ../../bin/rabbit:267
 msgid "(landscape A4 size)"
 msgstr ""
 
-#: ../../bin/rabbit:291
+#: ../../bin/rabbit:277
 msgid "Margin"
 msgstr ""
 
-#: ../../bin/rabbit:295
+#: ../../bin/rabbit:281
 msgid "Set left margin for slides per page mode print."
 msgstr ""
 
-#: ../../bin/rabbit:302
+#: ../../bin/rabbit:288
 msgid "Set right margin for slides per page mode print."
 msgstr ""
 
-#: ../../bin/rabbit:309
+#: ../../bin/rabbit:295
 msgid "Set top margin for slides per page mode print."
 msgstr ""
 
-#: ../../bin/rabbit:316
+#: ../../bin/rabbit:302
 msgid "Set bottom margin for slides per page mode print."
 msgstr ""
 
-#: ../../bin/rabbit:321
+#: ../../bin/rabbit:307
 msgid "[ALL]"
 msgstr ""
 
-#: ../../bin/rabbit:322
+#: ../../bin/rabbit:308
 msgid "[TOP_BOTTOM],[LEFT_RIGHT]"
 msgstr ""
 
-#: ../../bin/rabbit:323
+#: ../../bin/rabbit:309
 msgid "[TOP],[LEFT_RIGHT],[BOTTOM]"
 msgstr ""
 
-#: ../../bin/rabbit:324
+#: ../../bin/rabbit:310
 msgid "[TOP],[RIGHT],[BOTTOM],[LEFT]"
 msgstr ""
 
-#: ../../bin/rabbit:327
+#: ../../bin/rabbit:313
 msgid "Set margin for slides per page mode print."
 msgstr ""
 
-#: ../../bin/rabbit:341
+#: ../../bin/rabbit:327
 msgid "Set left page margin."
 msgstr ""
 
-#: ../../bin/rabbit:348
+#: ../../bin/rabbit:334
 msgid "Set right page margin."
 msgstr ""
 
-#: ../../bin/rabbit:355
+#: ../../bin/rabbit:341
 msgid "Set top page margin."
 msgstr ""
 
-#: ../../bin/rabbit:362
+#: ../../bin/rabbit:348
 msgid "Set bottom page margin."
 msgstr ""
 
-#: ../../bin/rabbit:369
+#: ../../bin/rabbit:355
 msgid "Set page margin."
 msgstr ""
 
-#: ../../bin/rabbit:381
+#: ../../bin/rabbit:367
 msgid "dRuby"
 msgstr ""
 
-#: ../../bin/rabbit:384
+#: ../../bin/rabbit:370
 msgid "Specify whether to use dRuby."
 msgstr ""
 
-#: ../../bin/rabbit:390
+#: ../../bin/rabbit:376
 msgid "Specify dRuby URI."
 msgstr ""
 
-#: ../../bin/rabbit:396
+#: ../../bin/rabbit:382
 msgid "Specify whether to output dRuby URI."
 msgstr ""
 
-#: ../../bin/rabbit:401
+#: ../../bin/rabbit:387
 msgid "SOAP"
 msgstr ""
 
-#: ../../bin/rabbit:404
+#: ../../bin/rabbit:390
 msgid "Specify whether to use SOAP."
 msgstr ""
 
-#: ../../bin/rabbit:410
+#: ../../bin/rabbit:396
 msgid "Specify SOAP host as [HOST]."
 msgstr ""
 
-#: ../../bin/rabbit:418
+#: ../../bin/rabbit:404
 msgid "Specify SOAP port as [PORT]."
 msgstr ""
 
-#: ../../bin/rabbit:427
+#: ../../bin/rabbit:413
 msgid "XML-RPC"
 msgstr ""
 
-#: ../../bin/rabbit:430
+#: ../../bin/rabbit:416
 msgid "Specify whether to use XML-RPC."
 msgstr ""
 
-#: ../../bin/rabbit:436
+#: ../../bin/rabbit:422
 msgid "Specify XML-RPC host as [HOST]."
 msgstr ""
 
-#: ../../bin/rabbit:444
+#: ../../bin/rabbit:430
 msgid "Specify XML-RPC port as [PORT]."
 msgstr ""
 
-#: ../../bin/rabbit:453
+#: ../../bin/rabbit:439
 msgid "Server"
 msgstr ""
 
-#: ../../bin/rabbit:456
+#: ../../bin/rabbit:442
 msgid "Specify whether to run as server."
 msgstr ""
 
-#: ../../bin/rabbit:461
+#: ../../bin/rabbit:447
 msgid "Public level"
 msgstr ""
 
-#: ../../bin/rabbit:468
+#: ../../bin/rabbit:454
 msgid "Specify public level."
 msgstr ""
 
-#: ../../bin/rabbit:469
+#: ../../bin/rabbit:455
 msgid "Select from the following:"
 msgstr ""
 
-#: ../../bin/rabbit:486 ../../bin/rabbit:492
+#: ../../bin/rabbit:472 ../../bin/rabbit:478
 msgid "Deprecated. Just ignored."
 msgstr ""
 
-#: ../../bin/rabbit:487
+#: ../../bin/rabbit:473
 msgid "Specify initial comment source."
 msgstr ""
 
-#: ../../bin/rabbit:488
+#: ../../bin/rabbit:474
 msgid "(default source)"
 msgstr ""
 
-#: ../../bin/rabbit:493
+#: ../../bin/rabbit:479
 msgid "Specify comment source encoding."
 msgstr ""
 
-#: ../../bin/rabbit:497
+#: ../../bin/rabbit:483
 msgid "Migemo"
 msgstr ""
 
-#: ../../bin/rabbit:502
+#: ../../bin/rabbit:488
 msgid "Specify search paths for Migemo static dictionary."
 msgstr ""
 
-#: ../../bin/rabbit:509
+#: ../../bin/rabbit:495
 msgid "Specify static dictionary name for Migemo."
 msgstr ""
 
-#: ../../bin/rabbit:514
+#: ../../bin/rabbit:500
 msgid "3D"
 msgstr ""
 
-#: ../../bin/rabbit:517
+#: ../../bin/rabbit:503
 msgid "Specify whether to use OpenGL if available."
 msgstr ""
 
-#: ../../bin/rabbit:522
+#: ../../bin/rabbit:508
 msgid "Display"
 msgstr ""
 
-#: ../../bin/rabbit:525
+#: ../../bin/rabbit:511
 msgid "Specify whether to keep above window."
 msgstr ""
 
-#: ../../bin/rabbit:530
+#: ../../bin/rabbit:516
 msgid "Others"
 msgstr ""
 
-#: ../../bin/rabbit:533
+#: ../../bin/rabbit:519
 msgid "Show a native window ID of the Rabbit window if available."
 msgstr ""
 
-#: ../../bin/rabbit:534
+#: ../../bin/rabbit:520
 msgid "e.g. The ID is the ID of X resource on X window system."
 msgstr ""
 
-#: ../../bin/rabbit:556
+#: ../../bin/rabbit:539
 msgid "Choose a Rabbit source file"
 msgstr ""
 
-#: ../../bin/rabbit:675
+#: ../../bin/rabbit:658
 msgid "dRuby URI <%s> is in use."
 msgstr ""
 
-#: ../../bin/rabbit:694
+#: ../../bin/rabbit:677
 msgid "port <%s> for SOAP is in use."
 msgstr ""
 
-#: ../../bin/rabbit:715
+#: ../../bin/rabbit:698
 msgid "port <%s> for XML-RPC is in use."
 msgstr ""
 
-#: ../../bin/rabbit:776
+#: ../../bin/rabbit:759
 msgid "Window ID: %d"
 msgstr ""
 
-#: ../../bin/rabbit:822
+#: ../../bin/rabbit:805
 msgid "going to shutdown..."
 msgstr ""
 
-#: ../../bin/rabbit:824
+#: ../../bin/rabbit:807
 msgid "DRb.thread done."
 msgstr ""
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rabbit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -97,7 +97,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rack
+  name: sinatra
   prerelease: false
   type: :runtime
   requirement: *id006
@@ -380,54 +380,6 @@ files:
 - doc/images/jp.png
 - doc/images/lavie-icon.png
 - doc/images/lavie.png
-- doc/images/screenshots/en/blue-circle-raw.png
-- doc/images/screenshots/en/blue-circle.png
-- doc/images/screenshots/en/clear-blue-raw.png
-- doc/images/screenshots/en/clear-blue.png
-- doc/images/screenshots/en/cozmixng-raw.png
-- doc/images/screenshots/en/cozmixng.png
-- doc/images/screenshots/en/dark-gradation-raw.png
-- doc/images/screenshots/en/dark-gradation.png
-- doc/images/screenshots/en/day-white-raw.png
-- doc/images/screenshots/en/day-white.png
-- doc/images/screenshots/en/debian-raw.png
-- doc/images/screenshots/en/debian.png
-- doc/images/screenshots/en/green-circle-raw.png
-- doc/images/screenshots/en/green-circle.png
-- doc/images/screenshots/en/night-black-raw.png
-- doc/images/screenshots/en/night-black.png
-- doc/images/screenshots/en/rabbit-raw.png
-- doc/images/screenshots/en/rabbit.png
-- doc/images/screenshots/en/ranguba-raw.png
-- doc/images/screenshots/en/ranguba.png
-- doc/images/screenshots/en/red-frame-raw.png
-- doc/images/screenshots/en/red-frame.png
-- doc/images/screenshots/en/ruby-gnome2-raw.png
-- doc/images/screenshots/en/ruby-gnome2.png
-- doc/images/screenshots/ja/blue-circle-raw.png
-- doc/images/screenshots/ja/blue-circle.png
-- doc/images/screenshots/ja/clear-blue-raw.png
-- doc/images/screenshots/ja/clear-blue.png
-- doc/images/screenshots/ja/cozmixng-raw.png
-- doc/images/screenshots/ja/cozmixng.png
-- doc/images/screenshots/ja/dark-gradation-raw.png
-- doc/images/screenshots/ja/dark-gradation.png
-- doc/images/screenshots/ja/day-white-raw.png
-- doc/images/screenshots/ja/day-white.png
-- doc/images/screenshots/ja/debian-raw.png
-- doc/images/screenshots/ja/debian.png
-- doc/images/screenshots/ja/green-circle-raw.png
-- doc/images/screenshots/ja/green-circle.png
-- doc/images/screenshots/ja/night-black-raw.png
-- doc/images/screenshots/ja/night-black.png
-- doc/images/screenshots/ja/rabbit-raw.png
-- doc/images/screenshots/ja/rabbit.png
-- doc/images/screenshots/ja/ranguba-raw.png
-- doc/images/screenshots/ja/ranguba.png
-- doc/images/screenshots/ja/red-frame-raw.png
-- doc/images/screenshots/ja/red-frame.png
-- doc/images/screenshots/ja/ruby-gnome2-raw.png
-- doc/images/screenshots/ja/ruby-gnome2.png
 - doc/images/us.png
 - doc/index.html.en
 - doc/index.html.ja
@@ -975,8 +927,6 @@ files:
 - sample/table-en.rd
 - sample/table.hiki
 - sample/table.rd
-- sample/test.hiki
-- sample/test.rab
 - sample/theme-bench-en.hiki
 - sample/theme-bench-en.rab
 - sample/theme-bench.hiki

data/sample/test.hiki

@@ -1,31 +0,0 @@
-! テスト
-
-:theme:default
-
-! blockdiag
-
-{{emacs(<<-EOS, "# -*- ruby -*-")
-# comment
-def method_name(a, b=nil, *rest)
-  @var = $hoge
-  1
-  if "sss" then
-    body
-  end
-end
-EOS
-}}
-
-! blockdiag
-
-{{coderay("ruby", <<-EOS)
-# comment
-def method_name(a, b=nil, *rest)
-  @var = $hoge
-  1
-  if "sss" then
-    body
-  end
-end
-EOS
-}}

data/sample/test.rab

@@ -1,30 +0,0 @@
-= テスト
-
-: theme
-   default
-
-= blockdiag
-
-#  # enscript ruby
-  # emacs # -*- ruby -*-
-  # comment
-  def method_name(a, b=nil, *rest)
-    @var = $hoge
-    1
-    if "sss" then
-      body
-    end
-  end
-
-= blockdiag
-
-#  # enscript ruby
-  # coderay ruby
-  # comment
-  def method_name(a, b=nil, *rest)
-    @var = $hoge
-    1
-    if "sss" then
-      body
-    end
-  end