rabbit 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac1e9a044b494427ee4a86ff4acac595284072d727b51bed4796fd7eba213ed
-  data.tar.gz: 1bcdaae93582301350310d3beb14ebeecc5884cd1a68e75f8f50f6f7faf545cc
+  metadata.gz: 1ce2e5a227e5b700aab7ed9bf170bd44cdd322e2acf75fdfbd7e846d0a95f5f4
+  data.tar.gz: 73e79afd0c49ecb664fb98594b589521a4bbaf74bcd1b91209335a22e90f5d74
 SHA512:
-  metadata.gz: 373124d83ef693e876daff6330bd6e41a77561d5e465e8dfce3cc16199cb7f9b6976999cbd7a6bd6ba04a903d715b31c90c30d6285869a702d40d9f702f4dae6
-  data.tar.gz: 77d70fdd763523ccb33f4d640559aeeeb817da7c6a94b5a8c0def05af0a6e76d100cb5e5f41c28e96f8f84e8bc34e933278202c9314fde1068acf2adcf90b698
+  metadata.gz: 8a76046159d4c2dc9bb19703a59222f1c93d993f9c5928b41b57868b15377f2659629a15492058ede5e3dbeeb32592099dcadb39a8b686187fa45e47129f1107
+  data.tar.gz: aee5a1944c8fe477b7a879fae1641fcbfa4f02ea050aab9f82415e1eb194a21a994e33512182a51a36c5a595fb992a335e176e7eddc555812bb090b43139affe

data/doc/_config.yml

@@ -1,6 +1,6 @@
 markdown: kramdown
-version: 3.0.0
-release_date: 2019-09-06
+version: 3.0.1
+release_date: 2021-09-25
 rabbiter_version: 2.0.3
 rabbiter_release_date: 2016-08-21
 rabbirack_version: 2.0.0

data/doc/en/faq.rd

@@ -39,16 +39,18 @@ Use --allotted-time option.
 
   % rabbit --allotted-time 5m slide.pdf
 
-The same value format of 
+The same value format of
 
   # _
   : allotted-time
       5m
 
-on slides are available for that of --allotted-time. 
+on slides are available for that of --allotted-time.
 
 For this example you set "5m" and the tortoise runs just 5 minutes.
 
+Note that not all themes support the hare and tortoise feature. For example, the "default" theme supports it but the "lightning-talk" theme doesn't support it.
+
 == How can I reset tortoise to start?
 
 Hit Alt+t

data/doc/en/news.rd

@@ -3,6 +3,97 @@ layout: en
 title: News
 ---
 {% raw %}
+
+== 3.0.1: 2021-09-25
+
+Ruby 3.0 support release.
+
+=== Improvements
+
+==== rabbit
+
+  * Suppressed warnings.
+    [GitHub#132][Patch by kojix2]
+
+  * image: Added support for Ruby 3.0.
+    [GitHub#133][Patch by kojix2]
+
+  * image: Reused downloaded images.
+
+  * image: Removed support for (({normalized_width})) and
+    (({normalized_height})).
+
+  * image: Added support for clipping by (({clip_x})), (({clip_y})),
+    (({clip_width})) and (({clip_height})).
+
+  * info-window: Moved timer position to bottom on note mode.
+
+  * info-window: Added support for (({wait})).
+
+  * Removed duplicated requires.
+    [GitHub#134][Patch by kojix2]
+
+  * Added support for Charty.
+
+  * Added support for embedding terminal.
+
+  * Dropped support for Ustream.
+
+  * Added support for pushing gem with MFA enabled account.
+    [GitHub#141][Patch by Yusuke Nakamura]
+
+==== rabbit-slide
+
+  * Added support for specifying slide size.
+
+==== Theme
+
+  * clear-blue: Added support for disabling vertical centering.
+
+  * tag: (({margin-*})): Added support for negative and float values.
+
+  * tag: Added support for wrapping by (({wrap-char})),
+    (({wrap-word})) and (({wrap-word-char})).
+
+  * tag: Added support for justifying by (({justify})) and
+    (({no-justify})).
+
+  * edge-info-toolkit: Added support for center text.
+
+  * slide-footer-info: Added support for center text.
+
+==== Document
+
+  * Added note about theme and here + tortoise.
+    [GitHub#139][Patch by Asaf Bartov]
+
+=== Fixes
+
+==== Theme
+
+  * image-slide-number: Fixed wrong width calculation.
+    [GitHub#130][Patch by HASUMI Hitoshi]
+
+==== Document
+
+  * Fixed English.
+    [GitHub#128][Patch by Zero King]
+
+  * Fixed typos.
+    [GitHub#140][Patch by Yusuke Nakamura]
+
+=== Thanks
+
+  * Zero King
+
+  * HASUMI Hitoshi
+
+  * kojix2
+
+  * Asaf Bartov
+
+  * Yusuke Nakamura
+
 == 3.0.0: 2019-09-06
 
 GTK+ 3 support release. GTK+ 2 support is dropped.

data/doc/en/sample/hiki/rabbit.hiki

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

data/doc/en/sample/rd/rabbit.rd

@@ -133,8 +133,6 @@ title: "Sample slide: Rabbit"
     # keep_ratio = true
     # width = 100
     # height = 100
-  #  # normalized_width = 50
-  #  # normalized_height = 50
   #  # relative_width = 100
   #  # relative_height = 50
 
@@ -185,8 +183,6 @@ title: "Sample slide: Rabbit"
     # src = usagi.png
     # caption = USAGI
     # keep_ratio = true
-  #  # normalized_width = 50
-  #  # normalized_height = 50
   #  # relative_width = 100
     # relative_height = 80
 

data/doc/en/usage/rabbit-slide.rd

@@ -201,12 +201,12 @@ For example, here is a theme-benchmark-en case:
   elements. So it's useful for confirming your theme.
 
 You can publish your slide to both RubyGems.org and SlideShare by
-((%rabbit publish%)). The following documentation describes to publish
+((%rake publish%)). The following documentation describes to publish
 your slide separately.
 
 === Publication for RubyGems.org
 
-You can publish your slide to RubyGems.org by ((%rabbit
+You can publish your slide to RubyGems.org by ((%rake
 publish:rubygems%)):
 
   % rake publish:rubygems
@@ -231,7 +231,7 @@ RubyGems.org.
 
 === Publication for SlideShare
 
-You can publish your slide to SlideShare by ((%rabbit publish:slideshare%)).
+You can publish your slide to SlideShare by ((%rake publish:slideshare%)).
 
   % rake publish:slideshare
 

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">{{ site.version }}</a> is the latest release. It had been released at {{ site.release_date }}.</p>
+  <p><a href="/en/news.html">{{ site.version }}</a> is the latest release. It was released on {{ site.release_date }}.</p>
 </div>
 
 <section id="screenshots">

data/doc/ja/faq.rd

@@ -51,6 +51,8 @@ XXX.rdから1ページに8枚のスライドが入ったPDF（XXX_multi.pdf）
 
 上の例だと「5m」なので、亀が5分かけて走ります。
 
+すべてのテーマがうさぎと亀をサポートしているわけではないことに注意してください。たとえば、「default」テーマはサポートしていますが、「lightning-talk」テーマはサポートしていません。
+
 == 亀を元に戻したいときは？
 
  Alt+t

data/doc/ja/news.rd

@@ -4,6 +4,96 @@ title: お知らせ
 apply_data: false
 ---
 {% raw %}
+
+== 3.0.1: 2021-09-25
+
+Ruby 3.0をサポートしたリリース。
+
+=== 改良
+
+==== rabbit
+
+  * 警告を除去。
+    [GitHub#132][kojix2さんがパッチ提供]
+
+  * image: Ruby 3.0をサポート。
+    [GitHub#133][kojix2さんがパッチを提供]
+
+  * image: ダウンロードした画像を再利用するようにしました。
+
+  * image: (({normalized_width}))と(({normalized_height}))のサポートを
+    削除。
+
+  * image: (({clip_x}))と(({clip_y}))と(({clip_width}))と(({clip_height}))で
+    クリップをサポート。
+
+  * info-window: ノートモードではタイマーの位置を下部に移動。
+
+  * info-window: (({wait}))をサポート。
+
+  * 重複した(({require}))を削除。
+    [GitHub#134][kojix2さんがパッチを提供]
+
+  * Chartyをサポート。
+
+  * 埋め込みターミナルをサポート。
+
+  * Ustreamサポートを削除。
+
+  * MFAが有効になったアカウントでのgemのpushをサポート。
+    [GitHub#141][Yusuke Nakamuraさんが報告]
+
+==== rabbit-slide
+
+  * スライドサイズの指定をサポート。
+
+==== テーマ
+
+  * clear-blue: 縦方向のセンタリングの無効化をサポート。
+
+  * tag: (({margin-*})): 負の値と浮動小数点数をサポート。
+
+  * tag: (({wrap-char}))と(({wrap-word}))と(({wrap-word-char}))で折り返し
+    をサポート。
+
+  * tag: (({justify}))と(({no-justify}))で両端揃えをサポート。
+
+  * edge-info-toolkit: テキストのセンタリングをサポート。
+
+  * slide-footer-info: テキストのセンタリングをサポート。
+
+==== ドキュメント
+
+  * うさぎとかめとテーマに関する注意書きを追加。
+    [GitHub#139][Asaf Bartovさんがパッチを提供]
+
+=== 修正
+
+==== テーマ
+
+  * image-slide-number: 幅の計算方法を修正。
+    [GitHub#130][HASUMI Hitoshiさんがパッチを提供]
+
+==== ドキュメント
+
+  * 英語を修正。
+    [GitHub#128][Zero Kingさんがパッチを提供]
+
+  * typoを修正。
+    [GitHub#140][Yusuke Nakamuraさんがパッチを提供]
+
+=== 感謝
+
+  * Zero Kingさん
+
+  * HASUMI Hitoshiさん
+
+  * kojix2さん
+
+  * Asaf Bartovさん
+
+  * Yusuke Nakamuraさん
+
 == 3.0.0: 2019-09-06
 
 GTK+ 3をサポートしたリリース。GTK+ 2のサポートは終了。

data/doc/ja/sample/hiki/rabbit.hiki

@@ -130,8 +130,6 @@ title: "サンプルスライド: Rabbit"
          :caption => "Lavie",
          :width => 100,
          :height => 100,
-#         :normalized_width => 50,
-#         :normalized_height => 50,
 #         :relative_width => 100,
 #         :relative_height => 50,
         })}}
@@ -177,8 +175,6 @@ title: "サンプルスライド: Rabbit"
 {{image("usagi.png",
         {
           :caption => "兎",
-#          :normalized_width => 50,
-#          :normalized_height => 50,
 #          :relative_width => 100,
           :relative_height => 50,
          })}}

data/doc/ja/sample/rd/rabbit.rd

@@ -133,8 +133,6 @@ title: "サンプルスライド: Rabbit"
     # caption = Lavie
     # width = 100
     # height = 100
-  #  # normalized_width = 50
-  #  # normalized_height = 50
   #  # relative_width = 100
   #  # relative_height = 50
 
@@ -184,8 +182,6 @@ title: "サンプルスライド: Rabbit"
     # image
     # src = usagi.png
     # caption = 兎
-  #  # normalized_width = 50
-  #  # normalized_height = 50
   #  # relative_width = 100
     # relative_height = 80
 

data/doc/ja/usage/rabbit-slide.rd

@@ -185,12 +185,12 @@ APIがなかったので諦めました。
   Rabbitのテーマを確認するためのスライドです。スライドで使われる要素がた
   くさん入っているためテーマの確認に便利です。
 
-準備ができたら((%rabbit publish%))でRubyGems.orgとSlideShareにまとめて
+準備ができたら((%rake publish%))でRubyGems.orgとSlideShareにまとめて
 公開できます。別々に公開する方法は以下の通りです。
 
 === RubyGems.orgへ公開
 
-((%rabbit publish:rubygems%))でRubyGems.orgに公開できます。
+((%rake publish:rubygems%))でRubyGems.orgに公開できます。
 
   % rake publish:rubygems
 
@@ -213,7 +213,7 @@ Rabbit Slide ShowはRubyGems.orgに公開されているスライドを自動で
 
 === SlideShareへ公開
 
-((%rabbit publish:slideshare%))でSlideShareに公開できます。
+((%rake publish:slideshare%))でSlideShareに公開できます。
 
   % rake publish:slideshare
 

data/doc/ja/users.rd

@@ -186,4 +186,11 @@ Rabbitショッカーのためにshocker-jaというメーリングリストが
       * ((<効率的なビットマップマーキングを用いたRuby用ごみ集め実装|URL:http://www.narihiro.info/resource/presen/Ruby%20Garbage%20Collection%20Using%20Efficient%20Bitmap%20Marking.pdf>))
   * うえださん
     * ((<エンジニアでありたい人の日記|URL:http://d.hatena.ne.jp/hiro-ueda/>))
+
+# 2019年
+
+  * yoku0825さん
+    * ((<日々の覚書|URL:https://yoku0825.blogspot.com/>))
+    * ((<Shooting a trouble of MySQL|URL:https://speakerdeck.com/yoku0825/shooting-a-trouble-of-mysql>))
+    * 他にもたくさん
   * ...

data/lib/rabbit/action/toggle.rb

@@ -71,5 +71,12 @@ module Rabbit
     def act_toggle_magnifier_config(config, canvas)
       config[:label] = N_("Magnifier")
     end
+
+    def act_toggle_terminal(action, group, canvas)
+      canvas.toggle_terminal
+    end
+    def act_toggle_terminal_config(config, canvas)
+      config[:label] = N_("Terminal")
+    end
   end
 end

data/lib/rabbit/author-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2021  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
@@ -14,11 +14,10 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "yaml"
-
 require "rabbit/gettext"
 require "rabbit/logger"
 require "rabbit/path-manipulatable"
+require "rabbit/yaml-loader"
 
 module Rabbit
   class AuthorConfiguration
@@ -35,7 +34,7 @@ module Rabbit
 
     def load
       return unless File.exist?(path)
-      conf = YAML.load(File.read(path))
+      conf = YAMLLoader.load(File.read(path))
       clear
       merge!(conf)
     rescue

data/lib/rabbit/canvas.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2019  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2021  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
@@ -43,6 +43,8 @@ module Rabbit
     def_delegators(:@frame, :iconify, :window)
     def_delegators(:@frame, :fullscreen_available?)
     def_delegators(:@frame, :iconify_available?)
+    def_delegators(:@frame, :toggle_terminal)
+    def_delegators(:@frame, :in_terminal?)
 
     def_delegators(:@renderer, :width, :height)
     # Deprecated. Use #base_width= instead.
@@ -436,6 +438,14 @@ module Rabbit
       @renderer.post_iconify
     end
 
+    def pre_terminal
+      @renderer.pre_terminal
+    end
+
+    def post_terminal
+      @renderer.post_terminal
+    end
+
     def saved_image_base_name
       if @saved_image_base_name
         base_name = @saved_image_base_name.encode("UTF-8")

data/lib/rabbit/command/rabbit-slide.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2021  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
@@ -106,6 +106,8 @@ module Rabbit
                    "          --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" \
@@ -218,6 +220,22 @@ module Rabbit
           @data.slide_conf.presentation_end_time = time
         end
 
+        width_example = "--width=800"
+        parser.on("--width=WIDTH", Integer,
+                  _("The default slide width"),
+                  _("(e.g.: %s)") % width_example,
+                  _("(optional)")) do |width|
+          @data.slide_conf.width = width
+        end
+
+        height_example = "--width=450"
+        parser.on("--height=HEIGHT", Integer,
+                  _("The default slide height"),
+                  _("(e.g.: %s)") % height_example,
+                  _("(optional)")) do |height|
+          @data.slide_conf.height = height
+        end
+
         parser.separator(_("Your information"))
 
         messages = [
@@ -324,6 +342,20 @@ module Rabbit
         end
       end
 
+      class IntegerMapper
+        def initialize(data)
+          @data = data
+        end
+
+        def attach(entry)
+          entry.value = value if value
+        end
+
+        def apply(entry)
+          apply_value(entry.value_as_int)
+        end
+      end
+
       class SlideIDMapper < TextMapper
         private
         def valid?(value)
@@ -374,11 +406,35 @@ module Rabbit
         end
       end
 
+      class SlideWidthMapper < IntegerMapper
+        private
+        def value
+          @data.slide_conf.width
+        end
+
+        def apply_value(value)
+          @data.slide_conf.width = value
+        end
+      end
+
+      class SlideHeightMapper < IntegerMapper
+        private
+        def value
+          @data.slide_conf.height
+        end
+
+        def apply_value(value)
+          @data.slide_conf.height = value
+        end
+      end
+
       def build_gui_mappers
         {
           "slide-id" => SlideIDMapper.new(@data),
           "slide-base-name" => SlideBaseNameMapper.new(@data),
           "slide-markup-language" => SlideMarkupLanguageMapper.new(@data),
+          "slide-width" => SlideWidthMapper.new(@data),
+          "slide-height" => SlideHeightMapper.new(@data),
         }
       end
 
@@ -484,6 +540,8 @@ EOD
       def generate_dot_rabbit
         create_file(".rabbit") do |dot_rabbit|
           options = []
+          size = [@data.slide_conf.width, @data.slide_conf.height].join(",")
+          options << "--size #{size}"
           if @data.author_conf.markup_language.nil? and @data.allotted_time
             options << "--allotted-time #{@data.allotted_time}"
           end