rabbit 3.0.2 → 3.0.4

data/po/ja/rabbit.po

@@ -388,7 +388,7 @@ msgstr "新しいスライドのライセンス"
 msgid "Tags of the new slide"
 msgstr "新しいスライドのタグ"
 
-msgid "Allotted time in presentaion"
+msgid "Allotted time in presentation"
 msgstr "プレゼンの持ち時間"
 
 msgid "Presentation date with the new slide"
@@ -888,6 +888,9 @@ msgstr "未知のカーソルタイプ: %s"
 msgid "print isn't supported"
 msgstr "印刷をサポートしていません"
 
+msgid "unknown Font Awesome name: %s"
+msgstr ""
+
 msgid "Installing gem: %s"
 msgstr "gemをインストール中: %s"
 
@@ -966,9 +969,6 @@ msgstr "実行したaafigureコマンド名: %s"
 msgid "tried blockdiag command: %s"
 msgstr "実行したblockdiagコマンド名: %s"
 
-msgid "emacs: unsupported element name: %s"
-msgstr "emacs: サポートしていない要素名です: %s"
-
 msgid "enscript: unsupported language: %s"
 msgstr "enscript: サポートしていない言語です: %s"
 
@@ -1156,12 +1156,6 @@ msgid ""
 "do not want to make the toolkit work for certain slides."
 msgstr "このツールキットをアンインストールするか否か。このオプションは、特定のスライドでツールキットを動かなくしたいときに便利です。"
 
-msgid "Clutter Comment"
-msgstr "Clutterコメント"
-
-msgid "Show comment as a rolling Clutter actor."
-msgstr "コメントを回転するClutterのアクターとして表示します。"
-
 msgid "Color Circle block quote"
 msgstr "色付きの円: 引用ブロック"
 
@@ -1557,8 +1551,8 @@ msgid "Color of numbers displayed on the start and goal flags."
 msgstr "スタートとゴールの旗に表示される数字の色。"
 
 msgid ""
-"Form of the start and goal flags. Avaiable forms are (({'triangle'})) and (({'"
-"rectangle'}))."
+"Form of the start and goal flags. Available forms are (({'triangle'})) and (({"
+"'rectangle'}))."
 msgstr "スタートとゴールの旗の形。(({'triangle'})) (三角) と (({'rectangle'})) (四角) が指定可能です。"
 
 msgid "File name of an image used as the start flag."
@@ -1675,16 +1669,14 @@ msgstr "便利"
 msgid "Newline in Slides"
 msgstr "スライド内での改行"
 
-msgid ""
-"Convenience '\n"
-"' newline notation."
+#, fuzzy
+msgid "Convenience '\\n' newline notation."
 msgstr ""
 "便利な'\n"
 "'改行記法。"
 
-msgid ""
-"Enable '\n"
-"' notation to insert newline in all slides."
+#, fuzzy
+msgid "Enable '\\n' notation to insert newline in all slides."
 msgstr ""
 "タイトルで改行を挿入する'\n"
 "'記法を有効にする。"
@@ -1692,9 +1684,8 @@ msgstr ""
 msgid "Newline in Title"
 msgstr "タイトル内での改行"
 
-msgid ""
-"Enable '\n"
-"' notation to insert newline in title."
+#, fuzzy
+msgid "Enable '\\n' notation to insert newline in title."
 msgstr ""
 "タイトルで改行を挿入する'\n"
 "'記法を有効にする。"
@@ -2177,6 +2168,3 @@ msgstr "影の色。"
 
 msgid "TitleSlideBackgroundImage"
 msgstr "タイトルスライド背景画像"
-
-msgid "![alt]{image} and other contents in a paragraph isn't supported: [:text, :img]"
-msgstr "ひとつの段落中で「![alt]{image}」と他の内容を一緒に使うことはできません： [:text, :img]"

data/rabbit.gemspec

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2024  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
@@ -66,23 +66,20 @@ can see your slide at https://slide.rabbit-shocker.org/ .
 
   spec.required_ruby_version = ">= 2.4.0"
 
+  spec.add_runtime_dependency("coderay", ">= 1.0.0")
+  spec.add_runtime_dependency("csv")
+  spec.add_runtime_dependency("drb")
   spec.add_runtime_dependency("gdk_pixbuf2", ">= 3.0.9")
+  spec.add_runtime_dependency("gettext", ">= 3.0.1")
+  # spec.add_runtime_dependency("gstreamer")
   spec.add_runtime_dependency("gtk3")
-  spec.add_runtime_dependency("rsvg2", ">= 3.1.4")
-  spec.add_runtime_dependency("poppler", ">= 3.2.5")
   spec.add_runtime_dependency("hikidoc")
+  spec.add_runtime_dependency("kramdown-parser-gfm")
   spec.add_runtime_dependency("nokogiri")
+  spec.add_runtime_dependency("ostruct")
+  spec.add_runtime_dependency("poppler", ">= 3.2.5")
   spec.add_runtime_dependency("rdtool")
-  spec.add_runtime_dependency("rttool")
-  spec.add_runtime_dependency("coderay", ">= 1.0.0")
-  spec.add_runtime_dependency("kramdown-parser-gfm")
-  spec.add_runtime_dependency("gettext", ">= 3.0.1")
-  # spec.add_runtime_dependency("gstreamer")
   spec.add_runtime_dependency("rouge")
-
-  spec.add_development_dependency("test-unit")
-  spec.add_development_dependency("test-unit-rr")
-  spec.add_development_dependency("rake")
-  spec.add_development_dependency("bundler")
-  spec.add_development_dependency("jekyll")
+  spec.add_runtime_dependency("rsvg2", ">= 3.1.4")
+  spec.add_runtime_dependency("rttool")
 end

data/sample/gl-sample.rd

@@ -1,9 +1,7 @@
-= GLサンプル
+= GL sample
 
-: subtitle
-   GLのテスト
 : author
-   須藤功平
+   Sutou Kouhei
 : theme
    gl-sample
 

data/sample/rabbit/theme/gl-sample/gl-sample.rb

@@ -5,7 +5,7 @@ proc_name = "gl-sample"
 match(Slide) do |slides|
 
   slides.delete_post_draw_proc_by_name(proc_name)
-  
+
   list_id = nil
 
   slides.each do |slide|

data/sample/rabbit-en.hiki

@@ -158,7 +158,7 @@ A presentation tool
           :relative_margin_right => -5,
         })}}
 
-* Right justified backgorund image
+* Right justified background image
 * Specify in slide
 ** :align => "right"
 

data/sample/rabbit-en.md

@@ -143,7 +143,7 @@ background-image-relative-margin-right
 
 ![](lavie.png){:relative_width="30" align="right" relative_margin_right="-5"}
 
-* Right justified backgorund image
+* Right justified background image
 * Specify in slide
   * \{:align="right"\}
 

data/sample/rabbit-en.rd

@@ -170,7 +170,7 @@ A presentation tool
 #    # vertical-align = top
     # relative-margin-right = -5
 
-  * Right justified backgorund image
+  * Right justified background image
   * Specify in slide
     * align = right
 
@@ -328,18 +328,6 @@ The following is source code:
 
 End of source code.
 
-= Source: Emacs
-
-The following is source code:
-
-  # emacs # -*- ruby -*-
-  # comment
-  def method_name
-    body
-  end
-
-End of source code.
-
 = Source: Rouge
 
 The following is source code:

data/sample/rabbit.rd

@@ -180,7 +180,7 @@
   # src = lavie.png
   # relative_height = 80
   # draw0 = [rectangle, false, 0.05, 0.1, 0.1, 0.2, {color: red, line_width: 3}]
-  # draw1 = [line, 0.2, 0.1, 0.3, 0.2, {color: blue, line_width: 5}]
+  # draw1 = [line, 0.2, 0.1, 0.3, 0.2, {color: blue, line_width: 5, dash: [[1, 6], 0]}]
   # draw2 = [text, Cute!, 0.05, 0.4, {color: Green, size: 25}]
   # draw10 = [line, 0.0, 0.0, 0.5, 0.5, 0.25, 0.5, {line_width: 10, line_cap: butt, line_join: miter}]
 
@@ -337,18 +337,6 @@ URL先の画像をダウンロード
 
 以上がソース
 
-= ソース: Emacs
-
-以下がソース
-
-  # emacs # -*- ruby -*-
-  # comment
-  def method_name
-    body
-  end
-
-以上がソース
-
 = ソース: Rouge
 
 以下がソース

data/test/helper.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2024  Sutou Kouhei <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
@@ -19,7 +19,6 @@ require "rbconfig"
 require "tmpdir"
 
 require "test-unit"
-require "test/unit/rr"
 
 require "helper/fixture"
 require "helper/parser"

data/test/parser/test-markdown.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2014-2024  Sutou Kouhei <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
@@ -44,7 +44,7 @@ class RabbitParserMarkdownTest < Test::Unit::TestCase
                        ],
                      ],
                    ],
-                   parse("# Title"))
+                   parse(+"# Title"))
     end
   end
 
@@ -287,7 +287,8 @@ class RabbitParserMarkdownTest < Test::Unit::TestCase
 
         def test_unsupported
           image_path = fixture_path("image/png/lavie.png")
-          message = _("![alt]{image} and other contents in a paragraph isn't supported: [:text, :img]")
+          format = _("![alt]{image} and other contents in a paragraph isn't supported: %{types}")
+          message = format % {types: [:text, :img]}
           assert_raise(Rabbit::ParseError.new(message)) do
             parse(<<-MARKDOWN)
 a ![](#{image_path})

data/test/parser/test-rd.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2024  Sutou Kouhei <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
@@ -32,11 +32,11 @@ class RabbitParserRDTest < Test::Unit::TestCase
       end
 
       def test_with_space
-        assert_true(match?("= Hello"))
+        assert_true(match?(+"= Hello"))
       end
 
       def test_no_space
-        assert_true(match?("=Hello"))
+        assert_true(match?(+"=Hello"))
       end
     end
   end

data/test/parser/test-wiki.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2015-2024  Sutou Kouhei <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
@@ -34,7 +34,7 @@ class RabbitParserWikiTest < Test::Unit::TestCase
     class InlineTest < self
       test "unsupported" do
         image_path = fixture_path("image/png/lavie.png")
-        wiki_text = <<-WIKI
+        wiki_text = +<<-WIKI
 ! Title
 
 ! Slide

data/test/test-readme-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2024  Sutou Kouhei <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
@@ -30,17 +30,20 @@ Please try to create your original theme!
 
   private
   def assert_parse(content, extension=nil)
-    readme_path = "README#{extension}"
-    stub(File).read(readme_path) {content}
-    @parser.parse(readme_path)
-    assert_equal({
-                   :title       => @title,
-                   :description => @description,
-                 },
-                 {
-                   :title       => @parser.title,
-                   :description => @parser.description,
-                 })
+    Tempfile.create(["README", extension]) do |readme_file|
+      readme_file.print(content)
+      readme_file.close
+
+      @parser.parse(readme_file.path)
+      assert_equal({
+                     :title       => @title,
+                     :description => @description,
+                   },
+                   {
+                     :title       => @parser.title,
+                     :description => @parser.description,
+                   })
+    end
   end
 
   class TestRD < self

data/test/test-source.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2024  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
@@ -35,7 +35,7 @@ class RabbitSourceTest < Test::Unit::TestCase
 
     class ReadTest < self
       def test_binary
-        pdf_header = "%PDF-1.5\n%\xb5\xed\xae\xfb\n"
+        pdf_header = +"%PDF-1.5\n%\xb5\xed\xae\xfb\n"
         pdf_header.force_encoding("ASCII-8BIT")
         assert_equal(pdf_header, read(pdf_header))
       end