rabbit 3.0.0 → 3.0.2

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: 2019-09-06 06:24+0900\n"
+"PO-Revision-Date: 2023-06-25 15:49+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"
@@ -289,6 +289,9 @@ msgstr "スポットライト"
 msgid "Magnifier"
 msgstr "虫眼鏡"
 
+msgid "Terminal"
+msgstr "端末"
+
 msgid "Failed to read author configuration: %s: %s"
 msgstr "作者設定の読み込みに失敗しました: %s: %s"
 
@@ -310,6 +313,8 @@ msgid ""
 "          --id rubykaigi2012 \\\n"
 "          --base-name rabbit-introduction \\\n"
 "          --markup-language rd \\\n"
+"          --width 800 \\\n"
+"          --height 450 \\\n"
 "          --name \"Kouhei Sutou\" \\\n"
 "          --email kou@cozmixng.org \\\n"
 "          --rubygems-user kou \\\n"
@@ -321,6 +326,8 @@ msgstr ""
 "          --id rubykaigi2012 \\\n"
 "          --base-name rabbit-introduction \\\n"
 "          --markup-language rd \\\n"
+"          --width 800 \\\n"
+"          --height 450 \\\n"
 "          --name \"Kouhei Sutou\" \\\n"
 "          --email kou@cozmixng.org \\\n"
 "          --rubygems-user kou \\\n"
@@ -388,10 +395,16 @@ msgid "Presentation date with the new slide"
 msgstr "新しいスライドでプレゼンする日"
 
 msgid "Presentation start time"
-msgstr ""
+msgstr "プレゼン開始時間"
 
 msgid "Presentation end time"
-msgstr ""
+msgstr "プレゼン終了時間"
+
+msgid "The default slide width"
+msgstr "デフォルトのスライドの幅"
+
+msgid "The default slide height"
+msgstr "デフォルトのスライドの高さ"
 
 msgid "Your information"
 msgstr "あなたの情報"
@@ -866,8 +879,8 @@ 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 "invalid value of size property \"%{prop_name}\" of \"%{filename}\": %{value}"
+msgstr "「%{filename}」のサイズプロパティ「%{prop_name}」の値が不正です: %{value}"
 
 msgid "unknown cursor type: %s"
 msgstr "未知のカーソルタイプ: %s"
@@ -884,6 +897,9 @@ msgstr "gemをユーザーインストールモードでインストール中: %
 msgid "Enter password on RubyGems.org [%{user}]: "
 msgstr "RubyGems.orgのパスワードを入力してください [%{user}]: "
 
+msgid "Enter OTP on RubyGems.org [%{user}]: "
+msgstr "RubyGems.orgのワンタイムパスワードを入力してください [%{user}]: "
+
 msgid "Line width:"
 msgstr "線の太さ"
 
@@ -899,6 +915,9 @@ msgstr "スライド"
 msgid "PDF"
 msgstr "PDF"
 
+msgid "tried mermaid command: %s"
+msgstr "実行したmermaidコマンド名: %s"
+
 msgid "invalid PDF page number: <%s>"
 msgstr "不正なPDFのページ番号です: <%s>"
 
@@ -956,27 +975,27 @@ msgstr "enscript: サポートしていない言語です: %s"
 msgid "enscript: unsupported element name: %s"
 msgstr "enscript: サポートしていない要素名です: %s"
 
+msgid "multiple right aligns aren't supported."
+msgstr "複数のright整列はサポートしていません。"
+
 msgid "tried mimeTeX commands: %s"
 msgstr "実行したmimeTeXコマンド名: %s"
 
-msgid "multiple ![alt]{image} in a paragraph isn't supported."
+msgid "multiple ![alt]{image}s in a paragraph isn't supported."
 msgstr "ひとつの段落中で複数の「![alt]{image}」を使うことはできません。"
 
+msgid "![alt]{image} and other contents in a paragraph isn't supported: %{types}"
+msgstr "ひとつの段落中で「![alt]{image}」と他の内容を一緒に使うことはできません：%{types}"
+
 msgid "horizontal rule isn't supported."
 msgstr "水平線はサポートしていません"
 
-msgid "multiple ![]('XXX.png'){:align='right'} isn't supported."
-msgstr "複数の「![]('XXX.png'){:align='right'}」はサポートしていません。"
-
 msgid "tag name is missing."
 msgstr "タグ名がありません。"
 
 msgid "HTML isn't supported."
 msgstr "HTMLはサポートしていません"
 
-msgid "multiple 'align = right' isn't supported."
-msgstr "複数の'align = right'はサポートしていません。"
-
 msgid "RTtool isn't available"
 msgstr "RTtoolが利用できません"
 
@@ -1016,18 +1035,6 @@ msgstr "スライド設定の読み込みに失敗しました: %s: %s"
 msgid "Failed to write slide configuration: %s: %s"
 msgstr "スライド設定の書き込みに失敗しました: %s: %s"
 
-msgid "Feailed to upload: %s"
-msgstr "アップロードに失敗しました: %s"
-
-msgid "Feailed to edit title: %s"
-msgstr "タイトルの編集に失敗しました: %s"
-
-msgid "Feailed to get slide URL: %s"
-msgstr "スライドURLの取得に失敗しました: %s"
-
-msgid "Enter password on SlideShare [%{user}]: "
-msgstr "SlideShareのパスワードを入力してください [%{user}]: "
-
 msgid "none (get from STDIN) or [FILE_NAMES]"
 msgstr ""
 "[何も指定しない(標準入力から読込)]か\n"
@@ -1066,12 +1073,6 @@ msgstr "すべての公開可能な公開場所にこのスライドを公開"
 msgid "Publish the slide to %s"
 msgstr "このスライドを%sに公開"
 
-msgid "Uploaded successfully!"
-msgstr "無事にアップロードできました！"
-
-msgid "See %s"
-msgstr "%sを見てください"
-
 msgid "Show theme benchmark slide with this theme"
 msgstr "このテーマでテーマベンチマーク用のスライドを表示"
 
@@ -2176,3 +2177,6 @@ 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

@@ -77,7 +77,6 @@ can see your slide at https://slide.rabbit-shocker.org/ .
   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("faraday")
   # spec.add_runtime_dependency("gstreamer")
   spec.add_runtime_dependency("rouge")
 

data/sample/can_rabbit.rd

@@ -353,14 +353,6 @@ EPS形式以外は，ファイルの内容から画像形式を自動認識す
 : height
    画像の高さを指定する．単位はピクセル．
    
-: normalized_width
-   画像の幅を指定する．単位はテーマ内での単位（スライドの大
-   きさに比例する）．
-   
-: normalized_height
-   画像の高さを指定する．単位はテーマ内での単位（スライドの
-   大きさに比例する）．
-   
 : relative_width
    画像の幅をその時点で利用可能な幅に対する割合で指定する．
    例えば，箇条書きの中に画像を配置している場合は，箇条書き
@@ -377,22 +369,6 @@ EPS形式以外は，ファイルの内容から画像形式を自動認識す
 
    単位は%．
 
-: dither_mode
-   ディザのモードを指定する．指定できる値は(({none}))，
-   (({max}))，(({normal}))．
-   
-   デフォルトは(({normal}))．
-
-: x_dither
-   ディザで使用するx軸方向のドット数を指定する((-嘘かも-))．
-   
-   デフォルトは(({0}))．
-
-: y_dither
-   ディザで使用するy軸方向のドット数を指定する((-嘘かも-))．
-   
-   デフォルトは(({0}))．
-
 = 発表時の注意
 
   * キャッシュを利用する

data/sample/rabbit-en.hiki

@@ -124,8 +124,6 @@ A presentation tool
          :keep_ratio => true,
          :width => 100,
          :height => 100,
-#        :normalized_width => 50,
-#        :normalized_height => 50,
 #        :relative_width => 100,
 #        :relative_height => 50,
         })}}
@@ -172,8 +170,6 @@ Relative image sizes
         {
           :caption => "USAGI",
           :keep_ratio => true,
-#         :normalized_width => 50,
-#         :normalized_height => 50,
 #         :relative_width => 100,
           :relative_height => 80,
         })}}

data/sample/rabbit-en.md

@@ -209,6 +209,19 @@ Create EPS ahead of time
   fonts="/usr/share/fonts/opentype/ipafont/ipag.ttf, /usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf"
 }
 
+# Mermaid
+
+```mermaid
+graph TD;
+  A-->B;
+  A-->C;
+  B-->D;
+  C-->D;
+```
+{:
+  relative_height="90"
+}
+
 # Word Wrapping
 
 looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong

data/sample/rabbit-en.rd

@@ -132,8 +132,6 @@ A presentation tool
   # keep_ratio = true
   # width = 100
   # height = 100
-#  # normalized_width = 50
-#  # normalized_height = 50
 #  # relative_width = 100
 #  # relative_height = 50
 
@@ -184,8 +182,6 @@ Relative image sizes
   # src = usagi.png
   # caption = USAGI
   # keep_ratio = true
-#  # normalized_width = 50
-#  # normalized_height = 50
 #  # relative_width = 100
   # relative_height = 80
 
@@ -283,6 +279,16 @@ Create EPS ahead of time((-needs gs-))
     }
   }
 
+= Mermaid
+
+  # mermaid
+  # relative_height = 90
+  graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;
+
 = Word Wrapping
 
 looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong

data/sample/rabbit.hiki

@@ -124,8 +124,6 @@
          :caption => "Lavie",
          :width => 100,
          :height => 100,
-#         :normalized_width => 50,
-#         :normalized_height => 50,
 #         :relative_width => 100,
 #         :relative_height => 50,
         })}}
@@ -171,8 +169,6 @@
 {{image("usagi.png",
         {
           :caption => "兎",
-#          :normalized_width => 50,
-#          :normalized_height => 50,
 #          :relative_width => 100,
           :relative_height => 50,
          })}}

data/sample/rabbit.md

@@ -158,6 +158,14 @@ background-image-relative-margin-right
 * スライド内で指定
   * \{:align="right"\}
 
+# 画像: 落書き
+
+![](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\}]"
+                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\}]"}
+
 # 画像サイズ
 
 スライドサイズに応じて変更可能
@@ -220,6 +228,19 @@ $$
   fonts="/usr/share/fonts/opentype/ipafont/ipag.ttf, /usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf"
 }
 
+# Mermaid
+
+```mermaid
+graph TD;
+  A-->B;
+  A-->C;
+  B-->D;
+  C-->D;
+```
+{:
+  relative_height="90"
+}
+
 # 折り返し
 
 なーーーーーーーーーーーーーーーーーーーーーーーーーーーーーがーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーい行は？

data/sample/rabbit.rd

@@ -132,8 +132,6 @@
   # caption = Lavie
   # width = 100
   # height = 100
-#  # normalized_width = 50
-#  # normalized_height = 50
 #  # relative_width = 100
 #  # relative_height = 50
 
@@ -176,6 +174,16 @@
   * スライド内で指定
     * align = right
 
+= 画像: 落書き
+
+  # image
+  # 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}]
+  # 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}]
+
 = 画像サイズ
 
 スライドサイズに応じて変更可能
@@ -183,8 +191,6 @@
   # image
   # src = usagi.png
   # caption = 兎
-#  # normalized_width = 50
-#  # normalized_height = 50
 #  # relative_width = 100
   # relative_height = 80
 
@@ -282,6 +288,16 @@ URL先の画像をダウンロード
     }
   }
 
+= Mermaid
+
+  # mermaid
+  # relative_height = 90
+  graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;
+
 = 折り返し
 
 なーーーーーーーーーーーーーーーーーーーーーーーーーーーーーがーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーーい行

data/test/command/test-rabbit.rb

@@ -43,6 +43,7 @@ class RabbitCommandRabbitTest < Test::Unit::TestCase
   end
 
   test("--save-as-image") do
+    omit("log isn't outputted on GitHub Actions...") if ENV["CI"]
     File.open(File.join(@dir, "slide.rab"), "w") do |slide|
       slide.puts(<<-'SLIDE')
 = ス\nラ/イ\ド:タイトル

data/test/parser/test-markdown.rb

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

data/test/test-slide-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2022  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
@@ -40,11 +40,13 @@ class TestSlideConfiguration < Test::Unit::TestCase
       "version"           => "2012.09.16.0",
       "licenses"          => ["GPLv3+", "GFDL", "CC BY-SA 3.0"],
       "slideshare_id"     => "rabbit-14073776",
+      "source_code_uri"   => "https://example.com/source",
       "speaker_deck_id"   => "rabbit-debian",
-      "ustream_id"        => "25451894",
       "vimeo_id"          => "00000000",
       "youtube_id"        => "XXXXX-xxxxx",
       "author"            => author_conf,
+      "width"             => 800,
+      "height"            => 600,
     }
     @slide.id = "RubyKaigi2012"
     @slide.merge!(conf)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2023-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -275,11 +261,11 @@ description: |-
 email:
 - kou@cozmixng.org
 executables:
+- rabbirc
 - rabbit
 - rabbit-command
-- rabbit-theme
 - rabbit-slide
-- rabbirc
+- rabbit-theme
 extensions: []
 extra_rdoc_files: []
 files:
@@ -392,7 +378,6 @@ files:
 - doc/_plugins/converters/markdown.rb
 - doc/_plugins/converters/rd.rb
 - doc/_plugins/support_symlink.rb
-- doc/css/jquery-ui/themes/ui-lightness.css
 - doc/css/rabbit.css
 - doc/css/syntax.scss
 - doc/en/development.rd
@@ -514,8 +499,6 @@ files:
 - doc/ja/usage/rabbit-theme.rd
 - doc/ja/usage/rabbit.rd
 - doc/ja/users.rd
-- doc/javascripts/jquery-ui.js
-- doc/javascripts/jquery.js
 - doc/screenshot.en.rab
 - doc/screenshot.ja.rab
 - entities/README
@@ -609,6 +592,7 @@ files:
 - lib/rabbit/image/dia.rb
 - lib/rabbit/image/eps.rb
 - lib/rabbit/image/gimp.rb
+- lib/rabbit/image/mermaid.rb
 - lib/rabbit/image/pdf.rb
 - lib/rabbit/image/svg.rb
 - lib/rabbit/info-window.rb
@@ -623,6 +607,7 @@ files:
 - lib/rabbit/parser/base.rb
 - lib/rabbit/parser/ext/aafigure.rb
 - lib/rabbit/parser/ext/blockdiag.rb
+- lib/rabbit/parser/ext/charty.rb
 - lib/rabbit/parser/ext/coderay.rb
 - lib/rabbit/parser/ext/emacs.rb
 - lib/rabbit/parser/ext/enscript.rb
@@ -654,8 +639,10 @@ files:
 - lib/rabbit/password-reader.rb
 - lib/rabbit/path-manipulatable.rb
 - lib/rabbit/progress.rb
+- lib/rabbit/properties.rb
 - lib/rabbit/rabbit.rb
 - lib/rabbit/readme-parser.rb
+- lib/rabbit/relative-size.rb
 - lib/rabbit/renderer.rb
 - lib/rabbit/renderer/base.rb
 - lib/rabbit/renderer/color.rb
@@ -695,7 +682,6 @@ files:
 - lib/rabbit/size.rb
 - lib/rabbit/slide-configuration.rb
 - lib/rabbit/slide.rb
-- lib/rabbit/slideshare.rb
 - lib/rabbit/soap/base.rb
 - lib/rabbit/soap/driver.rb
 - lib/rabbit/soap/server.rb
@@ -940,6 +926,7 @@ files:
 - lib/rabbit/xmlrpc/base.rb
 - lib/rabbit/xmlrpc/client.rb
 - lib/rabbit/xmlrpc/server.rb
+- lib/rabbit/yaml-loader.rb
 - misc/emacs/README.ja
 - misc/emacs/rabbit-mode.el
 - misc/github-post-receiver/config.ru
@@ -1064,7 +1051,6 @@ files:
 - test/test-readme-parser.rb
 - test/test-size.rb
 - test/test-slide-configuration.rb
-- test/test-slideshare.rb
 - test/test-source.rb
 - test/test-theme-configuration.rb
 - test/test-utils.rb
@@ -1072,7 +1058,7 @@ homepage: http://rabbit-shocker.org/
 licenses:
 - GPLv2+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1087,34 +1073,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Rabbit is a presentation tool for Rubyist
 test_files:
-- test/test-utils.rb
+- test/command/test-rabbit.rb
+- test/helper/fixture.rb
+- test/helper/parser.rb
 - test/helper.rb
-- test/run-test.rb
-- test/test-color.rb
-- test/test-canvas.rb
-- test/test-slideshare.rb
+- test/image/test-dia.rb
+- test/image/test-eps.rb
 - test/parser/test-markdown.rb
-- test/parser/test-wiki.rb
 - test/parser/test-rd.rb
-- test/test-element.rb
-- test/command/test-rabbit.rb
-- test/test-slide-configuration.rb
-- test/test-author-configuration.rb
-- test/test-theme-configuration.rb
-- test/test-size.rb
-- test/test-applier.rb
-- test/source-generator/test-markdown.rb
+- test/parser/test-wiki.rb
+- test/run-test.rb
 - test/source-generator/test-hiki.rb
+- test/source-generator/test-markdown.rb
 - test/source-generator/test-rd.rb
-- test/image/test-eps.rb
-- test/image/test-dia.rb
+- test/test-applier.rb
+- test/test-author-configuration.rb
+- test/test-canvas.rb
+- test/test-color.rb
+- test/test-element.rb
 - test/test-readme-parser.rb
+- test/test-size.rb
+- test/test-slide-configuration.rb
 - test/test-source.rb
-- test/helper/fixture.rb
-- test/helper/parser.rb
+- test/test-theme-configuration.rb
+- test/test-utils.rb