rabbit 2.1.6 → 2.1.7

data/po/ja/rabbit.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Rabbit 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-03 22:32+0900\n"
+"PO-Revision-Date: 2015-09-05 23:04+0900\n"
 "Last-Translator: Kouhei Sutou <kou@cozmixng.org>\n"
 "Language-Team: Kouhei Sutou <kou@cozmixng.org> and Kobayashi Noritada <nori1@d"
 "olphin.c.u-tokyo.ac.jp>\n"
@@ -331,10 +331,10 @@ msgid "COMMAND"
 msgstr ""
 
 msgid "  new:    create a new slide"
-msgstr ""
+msgstr "  new:    新しいスライドを作成"
 
 msgid "  change: change an existing slide"
-msgstr ""
+msgstr "  change: 既存のスライドを変更"
 
 msgid "Slide information"
 msgstr "スライドの情報"
@@ -707,12 +707,6 @@ msgstr "XML-RPCのホスト名を[HOST]とします．"
 msgid "Specify XML-RPC port as [PORT]."
 msgstr "XML-RPCのポートを[PORT]とします．"
 
-msgid "Server"
-msgstr "サーバ"
-
-msgid "Specify whether to run as server."
-msgstr "サーバとして動作するかどうかを指定します．"
-
 msgid "Public level"
 msgstr "公開レベル"
 
@@ -765,7 +759,7 @@ msgid "Others"
 msgstr "その他"
 
 msgid "Check slide source syntax and exit."
-msgstr ""
+msgstr "スライドのソースの構文をチェックして終了します。"
 
 msgid "Show a native window ID of the Rabbit window if available."
 msgstr "可能ならウィンドウシステムに依存したRabbitのウィンドウのIDを表示します。"
@@ -788,12 +782,6 @@ msgstr "XML-RPC用ポート<%s>は使用中です．"
 msgid "Window ID: %d"
 msgstr "ウィンドウID: %d"
 
-msgid "going to shutdown..."
-msgstr "終了中です．．．"
-
-msgid "DRb.thread done."
-msgstr "DRB.threadは終了しました．"
-
 msgid "Usage: %s [options]"
 msgstr "使用法: %s [オプション]"
 
@@ -824,6 +812,60 @@ msgstr "バージョンを表示します．"
 msgid "Index"
 msgstr "一覧"
 
+msgid "no such file: %s"
+msgstr "そのようなファイルはありません: %s"
+
+msgid "can't handle %s because the following command can't be run successfully: %s"
+msgstr "次のコマンドを正常に実行できなかったので%sを扱うことができません: %s"
+
+msgid "tried gs commands: %s"
+msgstr "実行したgsコマンド名: %s"
+
+msgid "tried dia commands: %s"
+msgstr "実行したdiaコマンド名: %s"
+
+msgid "tried gimp commands: %s"
+msgstr "実行したgimpコマンド名: %s"
+
+msgid "Unknown property: %s"
+msgstr "未知のプロパティ: %s"
+
+msgid "can't allocate color: %s"
+msgstr "色を割り当てることができません: %s"
+
+msgid "not exist: %s"
+msgstr "存在しません: %s"
+
+msgid "not a file: %s"
+msgstr "ファイルではありません: %s"
+
+msgid "can not be read: %s"
+msgstr "読み込むことができません: %s"
+
+msgid "immutable source type: %s"
+msgstr "変更不能なソースタイプです: %s"
+
+msgid "not available interface: %s"
+msgstr "利用可能なインターフェイスではありません: %s"
+
+msgid "can't find HTML template: %s"
+msgstr "HTML のテンプレートが見つかりません: %s"
+
+msgid "can't find theme RD template: %s"
+msgstr "テーマ RD のテンプレートが見つかりません: %s"
+
+msgid "invalid motion: %s"
+msgstr "不正な動きです: %s"
+
+msgid "invalid value of size property \"%{prop_name}\" of image \"%{filename}\": %{value}"
+msgstr "画像\"%{filename}のサイズプロパティ%{prop_name}の値が不正です: %{value}"
+
+msgid "unknown cursor type: %s"
+msgstr "未知のカーソルタイプ: %s"
+
+msgid "print isn't supported"
+msgstr "印刷をサポートしていません"
+
 msgid "Installing gem: %s"
 msgstr "gemをインストール中: %s"
 
@@ -846,7 +888,7 @@ msgid "PDF"
 msgstr "PDF"
 
 msgid "invalid PDF page number: <%s>"
-msgstr ""
+msgstr "不正なPDFのページ番号です: <%s>"
 
 msgid "%s page doesn't exist in PDF"
 msgstr "PDFの中に%sページはありません"
@@ -926,8 +968,11 @@ msgstr "水平線はサポートしていません"
 msgid "unsupported list type: %s"
 msgstr "サポートしていないリストの種類: %s"
 
-msgid "multiple {{image, 'XXX.png', :align => :right}} isn't supported."
-msgstr "複数の{{image, 'XXX.png', :align => :right}}はサポートしていません。"
+msgid "inline {{image(...)}} isn't supported."
+msgstr "インラインの{{image(...)}}は未サポートです。"
+
+msgid "multiple {{image(..., :align => :right)}} isn't supported."
+msgstr "複数の{{image(..., :align => :right)}}は未対応です。"
 
 msgid "Creating directory: %s"
 msgstr "ディレクトリを作成中: %s"
@@ -935,60 +980,6 @@ msgstr "ディレクトリを作成中: %s"
 msgid "Creating file:      %s"
 msgstr "ファイルを作成中:     %s"
 
-msgid "no such file: %s"
-msgstr "そのようなファイルはありません: %s"
-
-msgid "can't handle %s because the following command can't be run successfully: %s"
-msgstr "次のコマンドを正常に実行できなかったので%sを扱うことができません: %s"
-
-msgid "tried gs commands: %s"
-msgstr "実行したgsコマンド名: %s"
-
-msgid "tried dia commands: %s"
-msgstr "実行したdiaコマンド名: %s"
-
-msgid "tried gimp commands: %s"
-msgstr "実行したgimpコマンド名: %s"
-
-msgid "Unknown property: %s"
-msgstr "未知のプロパティ: %s"
-
-msgid "can't allocate color: %s"
-msgstr "色を割り当てることができません: %s"
-
-msgid "not exist: %s"
-msgstr "存在しません: %s"
-
-msgid "not a file: %s"
-msgstr "ファイルではありません: %s"
-
-msgid "can not be read: %s"
-msgstr "読み込むことができません: %s"
-
-msgid "immutable source type: %s"
-msgstr "変更不能なソースタイプです: %s"
-
-msgid "not available interface: %s"
-msgstr "利用可能なインターフェイスではありません: %s"
-
-msgid "can't find HTML template: %s"
-msgstr "HTML のテンプレートが見つかりません: %s"
-
-msgid "can't find theme RD template: %s"
-msgstr "テーマ RD のテンプレートが見つかりません: %s"
-
-msgid "invalid motion: %s"
-msgstr "不正な動きです: %s"
-
-msgid "invalid value of size property \"%{prop_name}\" of image \"%{filename}\": %{value}"
-msgstr "画像\"%{filename}のサイズプロパティ%{prop_name}の値が不正です: %{value}"
-
-msgid "unknown cursor type: %s"
-msgstr "未知のカーソルタイプ: %s"
-
-msgid "print isn't supported"
-msgstr "印刷をサポートしていません"
-
 msgid "No README found"
 msgstr "READMEがありません"
 

data/rabbit.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
+  spec.add_runtime_dependency("gio2")
   spec.add_runtime_dependency("gtk2")
   spec.add_runtime_dependency("rsvg2")
   spec.add_runtime_dependency("poppler")
@@ -58,6 +59,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("faraday")
   # spec.add_runtime_dependency("gstreamer")
 
+  spec.add_development_dependency("gtk3")
   spec.add_development_dependency("test-unit")
   spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("test-unit-rr")

data/sample/rabbit-en.md

@@ -20,7 +20,7 @@ A presentation tool
 * Env.: PC-UNIX/Win/Mac
 * Format:
   RD/Wiki/Markdown/PDF
-* View: Ruby
+* View: Ruby {::note}(separated with format){:/note}
 
 # Features: Display (1)
 
@@ -161,7 +161,7 @@ Download an image from a URL
 
 # Math. expressions
 
-* TeX format
+* TeX {::note}(like){:/note} format
 * Backends
   * LaTeX
 

data/sample/rabbit.md

@@ -20,7 +20,7 @@ theme
 * 動作: PC-UNIX/Win/Mac
 * 書式:
   Wiki/RD/Markdown/PDF
-* 見た目: Ruby
+* 見た目: Ruby{::note}（ソースと分離）{:/note}
 
 # 機能: 表示（1）
 
@@ -162,7 +162,7 @@ URL先の画像をダウンロード
 
 # 数式
 
-* 書式: TeX
+* 書式: TeX{::note}（っぽい）{:/note}
 * バックエンド
   * LaTeX
 

data/test/image/test-dia.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-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
@@ -17,7 +17,7 @@
 require "rabbit/image/dia"
 
 class TestImageDia < Test::Unit::TestCase
-  include RabbitTestUtils
+  include RabbitTestUtils::Fixture
 
   private
   def fixture_path(base_name)

data/test/image/test-eps.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-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
@@ -17,7 +17,7 @@
 require "rabbit/image/eps"
 
 class TestImageEPS < Test::Unit::TestCase
-  include RabbitTestUtils
+  include RabbitTestUtils::Fixture
 
   private
   def fixture_path(base_name)

data/test/parser/test-markdown.rb

@@ -22,33 +22,12 @@ require "rabbit/source/memory"
 require "rabbit/parser/markdown"
 
 class RabbitParserMarkdownTest < Test::Unit::TestCase
+  include RabbitTestUtils::Fixture
+  include RabbitTestUtils::Parser
+
   private
   def parse(markdown)
-    canvas = []
-    def canvas.logger
-      Rabbit::Logger.default
-    end
-    source = Rabbit::Source::Memory.new("UTF-8", nil)
-    source.source = markdown
-    parser = Rabbit::Parser::Markdown.new(canvas, source)
-    parser.parse
-    canvas
-  end
-
-  def inspect_canvas(canvas)
-    canvas.collect do |page|
-      inspect_element(page)
-    end
-  end
-
-  def inspect_element(element)
-    name = element.class.name.split(/::/).last
-    if element.respond_to?(:elements)
-      children = element.elements.collect {|child| inspect_element(child)}
-    else
-      children = [element.text]
-    end
-    [name, *children]
+    super(Rabbit::Parser::Markdown, markdown)
   end
 
   class TitlePageTest < self
@@ -266,5 +245,72 @@ class RabbitParserMarkdownTest < Test::Unit::TestCase
                            MARKDOWN
       end
     end
+
+    class ListTest < self
+      class UnorderedListTest < self
+        class NesetedTest < self
+          def test_no_new_line_after_first_line
+            assert_equal([
+                           "Body", [
+                             "ItemList", [
+                               "ItemListItem", [
+                                 "Paragraph", ["Text", "First"],
+                               ], [
+                                 "ItemList", [
+                                   "ItemListItem", [
+                                     "Paragraph", ["Text", "Second"],
+                                   ],
+                                 ],
+                               ],
+                             ],
+                           ],
+                         ],
+                         parse(<<-MARKDOWN))
+* First
+  * Second
+                         MARKDOWN
+          end
+
+          def test_have_new_line_after_first_line
+            assert_equal([
+                           "Body", [
+                             "ItemList", [
+                               "ItemListItem", [
+                                 "Paragraph", ["Text", "First"],
+                               ], [
+                                 "ItemList", [
+                                   "ItemListItem", [
+                                     "Paragraph", ["Text", "Second"],
+                                   ],
+                                 ],
+                               ],
+                             ],
+                           ],
+                         ],
+                         parse(<<-MARKDOWN))
+* First
+
+  * Second
+                         MARKDOWN
+          end
+        end
+      end
+    end
+
+    class ImageTest < self
+      class InlineTest < self
+        include Rabbit::GetText
+
+        def test_unsupported
+          image_path = fixture_path("image/png/lavie.png")
+          message = _("multiple ![alt]{image} in a paragraph isn't supported.")
+          assert_raise(Rabbit::ParseError.new(message)) do
+            parse(<<-MARKDOWN)
+a ![](#{image_path})
+            MARKDOWN
+          end
+        end
+      end
+    end
   end
 end

data/test/parser/test-wiki.rb

@@ -0,0 +1,73 @@
+# Copyright (C) 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-test-utils"
+
+require "rabbit/logger"
+require "rabbit/slide"
+require "rabbit/source/memory"
+require "rabbit/parser/wiki"
+
+class RabbitParserWikiTest < Test::Unit::TestCase
+  include RabbitTestUtils::Fixture
+  include RabbitTestUtils::Parser
+
+  private
+  def parse(wiki_text)
+    super(Rabbit::Parser::Wiki, wiki_text)
+  end
+
+  class ImageTest < self
+    include Rabbit::GetText
+
+    class InlineTest < self
+      test "unsupported" do
+        image_path = fixture_path("image/png/lavie.png")
+        wiki_text = <<-WIKI
+! Title
+
+! Slide
+
+a {{image(#{image_path.dump})}}
+        WIKI
+        message = _("inline {{image(...)}} isn't supported.")
+        assert_raise(Rabbit::ParseError.new(message)) do
+          parse(wiki_text)
+        end
+      end
+    end
+
+    class BlockTest < self
+      test ":align => :right: twice" do
+        image_path = fixture_path("image/png/lavie.png")
+        wiki_text = <<-WIKI
+! Title
+
+! Slide
+
+{{image(#{image_path.dump}, {:align => :right})}}
+
+{{image(#{image_path.dump}, :align => :right)}}
+        WIKI
+
+        message = _("multiple {{image(..., :align => :right)}} isn't supported.")
+        assert_raise(Rabbit::ParseError.new(message)) do
+          parse(wiki_text)
+        end
+      end
+    end
+  end
+end