rabbit 2.1.9 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb7d4c4da1f200c5e29e65dc548e9a4dfe21a127
-  data.tar.gz: 74e3c6893db6afeaee4d260ef2dfd2b330c93c1e
+  metadata.gz: 6f8a805af9b4c6690fe8f9453cfceb0c1e0892d4
+  data.tar.gz: ad5fe1b1e857c6915e385411d4bfb39ea1e0584b
 SHA512:
-  metadata.gz: cee32005d4a4536cdc07c074d0d2105f588ed4dde786667402fa2ac1135aa7313460a2b0970001ba214994d0a6188d108575270481725bf355995fb0ce34923f
-  data.tar.gz: b179a707b24fee6d6406bd818cf28aaf61e3959580a12404a20b72ef33b396cab0372134dc76ebce757b661a27626cc4c5470ad8134da83a36d3ac1ca17cda9b
+  metadata.gz: 358394e487119026459084289744f958c54a964ca165f2b9a1d138a34f67a132ac32e3c3bb6034909a634c5891b3a51e3f039acb350a53b11bf725229785950b
+  data.tar.gz: ef2ed17a7b5dcbe187382a92f0a43adc8d431b639f0fe4e700cd977e66d62331761b7fcd33ee547519cce4cedbce9153d4facd047a6f1c4fb51cbe9e701821c1

data/doc/_config.yml

@@ -1,8 +1,8 @@
 markdown: kramdown
-version: 2.1.9
-release_date: 2016-05-27
-rabbiter_version: 2.0.1
-rabbiter_release_date: 2013-08-29
+version: 2.2.0
+release_date: 2017-01-22
+rabbiter_version: 2.0.3
+rabbiter_release_date: 2016-08-21
 rabbirack_version: 2.0.0
 rabbirack_release_date: 2012-08-29
 rabwii_version: 2.0.0

data/doc/en/faq.rd

@@ -4,20 +4,20 @@ title: FAQ
 ---
 == FAQ
 
-This page lists frequently asked questions. Here is a format used in this page.
+This page lists frequently asked questions. Here is the format used on this page.
 
 == Question...
 
 Answer...
 
-== How can I embed tweets on Rabbit slide?
+== How can I embed tweets on a Rabbit slide?
 
-Use "rabbiter" command. For exapmle, you hit rabbitter command as follows
- after starting Rabbit and you will see tweets including word "ruby" in the bottom of the slides in form of comment.
+Use the "rabbiter" command. For exapmle, you use the rabbiter command as follows:
+ (after starting Rabbit, you will see tweets including the word "ruby" at the bottom of the slides in the form of comments)
 
   % rabbiter --filter ruby
 
-== How can I flow tweets on slides like embeded video?
+== How can I flow tweets on slides like an embeded video?
 
 Run ((%rabbit%)) command with ((%--comment-theme stream-comment%)) options.
 
@@ -26,7 +26,7 @@ Run ((%rabbit%)) command with ((%--comment-theme stream-comment%)) options.
 Taking into tweets with ((%rabbiter%)) command,
 you can flow them on your slides.
 
-== How to make a PDF which has some slides per page?
+== How to create a PDF with multiple slides per page?
 
 For example, we make XXX_multi.pdf which has 8 slides per
 page from XXX.rd.
@@ -138,8 +138,8 @@ Use following charachters.
 
 This is available in both content and title.
 
-TODO: Formery we should use 
 but now can use \n
-, which means following sentence is oblsolate. Oh my god...
+TODO: Formerly we used 
 but now can use \n
+, which means following sentence is oblsolete. Oh my god...
 
 Rabbit has got into the magic as well as Ruby, which "makes what you shouldn't looks ugly". ((-Using (({$})) for global vars is a kind of "Magic Powder" for Ruby. -))。
 

data/doc/en/news.rd

@@ -3,6 +3,110 @@ layout: en
 title: News
 ---
 {% raw %}
+== 2.2.0: 2017-01-22
+
+Markdown support improvement release.
+
+=== Improvements
+
+==== All
+
+  * Dropped Ruby 2.0 support.
+
+  * Dropped gdk_pixbuf2 gem 3.0.8 or earlier support.
+
+==== rabbit
+
+  * PDF: Supported PDF file that has "%" in its name.
+
+  * Dropped Migemo support.
+
+  * Markdown: Supported tag.
+
+    Example (Inline):
+
+      Normal {::tag name="center"}Centered{:/tag} Normal
+
+    Example (Paragraph):
+
+      Normal
+
+      {:.center}
+      Centered
+
+      Normal
+
+  * Markdown: Supported (({wait})) in nested list item.
+
+  * Improved performance on deciding font size dynamically.
+
+  * Changed to use RubyGems user in (({config.yaml})) on pushing
+    slide/theme gems.
+
+  * PDF: Supported link. But there are the following limitations:
+      * cairo 1.15.4 is required. (If you use Rabbit with cairo 1.15.2
+        or earlier, you just can't use this feature.)
+      * Link target is paragraph not link text.
+
+==== Theme
+
+  * slide-logo: Supported logo per side by specifying image file name
+    to (({logo-image})) slide property.
+
+  * title-on-image-toolkit: Improved readability by rendering
+    character border.
+
+  * syntax-highlighting: Changed color for path of (({#include})) in
+    C. Now, it uses the same color as normal string.
+
+==== rabbit-slide
+
+  * Markdown: Fixed a bug that required newlines are missing.
+    [GitHub#95][Patch by znz]
+
+==== Document
+
+  * Improve English in FAQ.
+    [GitHub#100][Patch by Todd Trimble]
+
+=== Fixes
+
+==== rabbit
+
+  * Fixed a bug that error isn't reported when multibyte image file
+    name is specified and it doesn't exist.
+    [GitHub#91][Reported by takiy33]
+
+  * Windows: Fixed encoding error on image file detection.
+    [GitHub#93][Reported by dogatana]
+
+  * Fixed a bug that an error is occurred when you cancel in slide
+    select dialog.
+
+  * Fixed typos.
+    [GitHub#97][Patch by znz]
+
+  * Fixed a bug that spotlight and magnifier uses wrong position when
+    slide aspect ratio and window aspect ratio are difference.
+    [GitHub#99][Patch by OBATA Akio]
+
+  * Windows: Fixed a bug that unfullscreen doesn't restore window size.
+    [GitHub#98][Reported by TADA, Tadashi]
+
+==== Document
+
+  * Fix typos.
+    [GitHub#101][Patch by znz]
+
+=== Thanks
+
+  * takiy33
+  * dogatana
+  * znz
+  * Todd Trimble
+  * OBATA Akio
+  * TADA, Tadashi
+
 == 2.1.9: 2016-05-27
 
 Markdown support improvement release.
@@ -1150,7 +1254,7 @@ Markdown support release!
   * [GitHub#3]: Fixed a wrong variable name.
     [Patch by TAKATSU Tomonari]
 
-==== rabbitter
+==== rabbiter
 
   * Supported HTTPS. [Patch by OBATA Akio]
 

data/doc/ja/news.rd

@@ -4,6 +4,109 @@ title: お知らせ
 apply_data: false
 ---
 {% raw %}
+== 2.2.0: 2017-01-22
+
+Markdownサポートを強化したリリース。
+
+=== 改良
+
+==== 全体
+
+  * Ruby 2.0のサポートをやめた。
+
+  * gdk_pixbuf2 gem 3.0.8以前のサポートをやめた。
+
+==== rabbit
+
+  * PDF：「%」が含まれているファイル名に対応。
+
+  * Migemoサポートを削除した。
+
+  * Markdown：タグをサポート。
+
+    例（インライン）：
+
+      普通のテキスト{::tag name="center"}中央寄せされたテキスト{:/tag}普通のテキスト
+
+    例（段落単位）：
+
+      普通のテキスト
+
+      {:.center}
+      中央寄せされたテキスト
+
+      普通のテキスト
+
+  * Markdown：ネストしたリストの項目での(({wait}))をサポート。
+
+  * 動的にフォントサイズを決めるときのパフォーマンスを改善。
+
+  * スライド・テーマのgemをpushするときに(({config.yaml}))で指定してい
+    るRubyGemsユーザーを使うようにした。
+
+  * PDF：リンクをサポート。ただし、以下の制限がある。
+      * cairo 1.15.4以降が必要。（1.15.4未満の場合は単にこの機能を使えないだけ。）
+      * リンクテキストだけでなく段落全体がリンクになってしまう。
+
+==== テーマ
+
+  * slide-logo：(({logo-image}))スライドプロパティーに画像ファイル名を
+    指定することでスライド毎にロゴを変えられるようにした。
+
+  * title-on-image-toolkit：文字の縁も描画して読みやすくした。
+
+  * syntax-highlighting：Cの(({#include}))のパスの色を通常の文字列と同
+    じ色にした。
+
+==== rabbit-slide
+
+  * Markdown：必要な改行が出力されていない問題を修正。
+    [GitHub#95][znzさんがパッチ提供]
+
+==== ドキュメント
+
+  * FAQの英語を改良。
+    [GitHub#100][Todd Trimbleさんがパッチ提供]
+
+=== 修正
+
+==== rabbit
+
+  * マルチバイトの画像ファイル名を指定してそのファイルが見つからなかっ
+    たときに適切にエラーを報告できない問題を修正。
+    [GitHub#91][takiy33さんが報告]
+
+  * Windows：画像ファイル検出時のエンコーディングエラーを修正。
+    [GitHub#93][dogatanaさんが報告]
+
+  * スライド選択ダイアログでキャンセルしたときにエラーが発生していた問
+    題を修正。
+
+  * typoを修正。
+    [GitHub#97][znzさんがパッチ提供]
+
+  * スライドのアスペクト比とウィンドウのアスペクト比が異なるときにスポッ
+    トライト・虫眼鏡が対象とする位置がずれる問題を修正。
+    [GitHub#99][おばたさんがパッチ提供]
+
+  * Windows：フルスクリーンを解除してもウィンドウサイズが戻らない問題
+    を修正。
+    [GitHub#98][ただただしさんが報告]
+
+==== ドキュメント
+
+  * typoを修正。
+    [GitHub#101][znzさんがパッチ提供]
+
+=== 感謝
+
+  * takiy33さん
+  * dogatanaさん
+  * znzさん
+  * Todd Trimbleさん
+  * おばたさん
+  * ただただしさん
+
 == 2.1.9: 2016-05-27
 
 Markdownサポートを強化したリリース。
@@ -1144,7 +1247,7 @@ Markdown対応リリース！
   * [GitHub#3]: 変数名が間違っていた問題を修正。
     [TAKATSU Tomonariさんが修正]
 
-==== rabbitter
+==== rabbiter
 
   * HTTPS対応。 [OBATA Akioさんが修正]
 

data/lib/rabbit/canvas.rb

@@ -45,7 +45,7 @@ module Rabbit
     def_delegators(:@renderer, :redraw, :clear_slide)
     def_delegators(:@renderer, :cursor=, :filename, :filename=)
     def_delegators(:@renderer, :each_slide_pixbuf)
-    def_delegators(:@renderer, :off_screen_canvas)
+    def_delegators(:@renderer, :offscreen_canvas)
     def_delegators(:@renderer, :foreground, :background)
     def_delegators(:@renderer, :foreground=, :background=)
     def_delegators(:@renderer, :background_image, :background_image=)
@@ -66,6 +66,7 @@ module Rabbit
     def_delegators(:@renderer, :draw_rounded_rectangle)
     def_delegators(:@renderer, :draw_rsvg_handle)
     def_delegators(:@renderer, :draw_poppler_page)
+    def_delegators(:@renderer, :draw_link)
 
     def_delegators(:@renderer, :draw_cube, :draw_sphere, :draw_cone)
     def_delegators(:@renderer, :draw_torus, :draw_tetrahedron)

data/lib/rabbit/command/rabbit.rb

@@ -56,7 +56,10 @@ module Rabbit
         end
         application.signal_connect("activate") do
           begin
-            succeeded = __send__("do_#{@options.action}")
+            succeeded = catch do |abort_tag|
+              @abort_tag = abort_tag
+              __send__("do_#{@options.action}")
+            end
           rescue
             @logger.error($!)
           end
@@ -666,7 +669,7 @@ module Rabbit
         if @options.source_type == :auto
           if rest_arguments.empty?
             file_name = choose_source_file_by_dialog
-            exit if file_name.nil?
+            throw(@abort_tag, true) if file_name.nil?
             rest_arguments = [file_name]
             @options.source_type = Source::File
           elsif rest_arguments.size == 1 and
@@ -821,7 +824,7 @@ module Rabbit
 
       def do_save_as_image
         source = make_source
-        canvas = make_canvas(Renderer::Pixmap::Cairo)
+        canvas = make_canvas(Renderer::Offscreen)
         setup_size(canvas)
         setup_image_info(canvas)
         setup_print_info(canvas)

data/lib/rabbit/element/index-slide.rb

@@ -1,5 +1,5 @@
 require 'rabbit/canvas'
-require 'rabbit/renderer/pixmap'
+require 'rabbit/renderer/offscreen'
 require 'rabbit/element/container-element'
 require 'rabbit/element/slide-element'
 
@@ -87,7 +87,7 @@ module Rabbit
 
         private
         def make_thumbnail_maker(canvas, width, height)
-          new_canvas = Canvas.new(canvas.logger, Renderer::Pixmap::Cairo)
+          new_canvas = Canvas.new(canvas.logger, Renderer::Offscreen)
           new_canvas.width = width
           new_canvas.height = height
           new_canvas.pango_context = canvas.create_pango_context

data/lib/rabbit/element/text-container-element.rb

@@ -15,7 +15,10 @@ module Rabbit
 
       def draw_elements(canvas, x, y, w, h, simulation)
         unless simulation
-          draw_layout(canvas, x, y)
+          # TODO: This is too workaround. :<
+          draw_sub_elements(canvas, x, y, w, h) do
+            draw_layout(canvas, x, y)
+          end
         end
         [x, y + @height, w, h - @height]
       end
@@ -103,6 +106,32 @@ module Rabbit
         end
         super(my_font_size)
       end
+
+      private
+      # TODO: This is too workaround. :<
+      def draw_sub_elements(canvas, x, y, w, h)
+        draw_sub_elements_recursive(canvas, x, y, w, h, 0) do
+          yield
+        end
+      end
+
+      # TODO: This is too workaround. :<
+      def draw_sub_elements_recursive(canvas, x, y, w, h, i)
+        if i == @elements.size
+          yield
+        else
+          draw_sub_elements_recursive(canvas, x, y, w, h, i + 1) do
+            element = @elements[i]
+            if element.respond_to?(:draw_sub_elements)
+              element.draw_sub_elements(canvas, x, y, w, h) do
+                yield
+              end
+            else
+              yield
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/rabbit/element/text-renderer.rb

@@ -148,7 +148,12 @@ module Rabbit
                                    max_width, max_height|
           if (max_width and initial_width > max_width) or
               (max_height and initial_height > max_height)
-            scale = 0.95
+            scale = lambda do |_width, _height|
+              candidates = [0.95]
+              candidates << (max_width.to_f) / _width if max_width
+              candidates << (max_height.to_f) / _height if max_height
+              candidates.min
+            end
             compare = Proc.new do |_width, _height|
               (max_width.nil? or _width < max_width) and
                 (max_height.nil? or _height < max_height)
@@ -306,10 +311,16 @@ module Rabbit
 
         return if scale.nil? or compare.nil?
 
+        if scale.respond_to?(:call)
+          compute_scale = scale
+          scale = nil
+        end
+
         size = new_size = initial_font_size_for_compute_font_size
         current_layout_size = @layout.pixel_size
         unless compare.call(*@layout.pixel_size)
           loop do
+            scale = compute_scale.call(*@layout.pixel_size) if compute_scale
             new_size = compute_next_font_size(size, scale)
             break if new_size == size
             set_computed_font_size(new_size)