rabbit 3.0.0 → 3.0.2

data/lib/rabbit/renderer/base.rb

@@ -267,6 +267,12 @@ module Rabbit
       def add_gesture_action(sequence, action, &block)
       end
 
+      def pre_terminal
+      end
+
+      def post_terminal
+      end
+
       private
       def offscreen_renderer?
         false

data/lib/rabbit/renderer/display/drawing-area-base.rb

@@ -5,7 +5,6 @@ require "rabbit/renderer/display/mask"
 require "rabbit/renderer/display/search"
 require "rabbit/renderer/display/gesture"
 require "rabbit/renderer/display/graffiti"
-require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/button-handler"
 require "rabbit/renderer/display/key-handler"
 require "rabbit/renderer/display/scroll-handler"
@@ -179,7 +178,7 @@ module Rabbit
         end
 
         def confirm(message)
-          confirm_dialog(message) == Gtk::MessageDialog::RESPONSE_OK
+          confirm_dialog(message) == Gtk::ResponseType::OK
         end
 
         def reload_theme(&callback)

data/lib/rabbit/renderer/display/drawing-area-primitive.rb

@@ -83,6 +83,7 @@ module Rabbit
 
         def post_parse
           clear_compiled_slides
+          update_cursor(:blank, true)
         end
 
         def pre_toggle_index_mode

data/lib/rabbit/renderer/display/info.rb

@@ -32,7 +32,12 @@ module Rabbit
 
         def post_move(old_index, index)
           super
-          @info_window.moved(index)
+          @info_window.moved
+        end
+
+        def post_move_in_slide(old_index, index)
+          super
+          @info_window.moved
         end
 
         def index_mode_on

data/lib/rabbit/renderer/display/key-handler.rb

@@ -19,10 +19,19 @@ module Rabbit
           @user_accel_group.disconnect_key(keyval, modifier)
         end
 
+        def pre_terminal
+          @window.remove_accel_group(@accel_group)
+        end
+
+        def post_terminal
+          @window.add_accel_group(@accel_group)
+        end
+
         private
         def init_key_handler
           @user_accel_group = nil
           init_accel_group
+          init_toggle_terminal_accel_group
         end
 
         def clear_user_accel_group
@@ -31,10 +40,12 @@ module Rabbit
 
         def attach_key(window)
           window.add_accel_group(@accel_group)
+          window.add_accel_group(@toggle_terminal_accel_group)
         end
 
         def detach_key(window)
           window.remove_accel_group(@accel_group)
+          window.remove_accel_group(@toggle_terminal_accel_group)
         end
 
         def clear_keys
@@ -53,10 +64,24 @@ module Rabbit
           init_alt_keys
         end
 
-        def set_keys(keys, mod, flags=nil, &block)
+        def init_toggle_terminal_accel_group
+          @toggle_terminal_accel_group = Gtk::AccelGroup.new
+          mod = Gdk::ModifierType::SHIFT_MASK |
+                Gdk::ModifierType::CONTROL_MASK |
+                Gdk::ModifierType::MOD1_MASK
+          keys = Keys::ShiftControlAlt::TOGGLE_TERMINAL_KEYS
+          set_keys(keys,
+                   mod,
+                   nil,
+                   @toggle_terminal_accel_group) do |group, obj, val, modifier|
+            @canvas.activate("ToggleTerminal")
+          end
+        end
+
+        def set_keys(keys, mod, flags=nil, accel_group=@accel_group, &block)
           flags ||= Gtk::AccelFlags::VISIBLE
           keys.each do |val|
-            @accel_group.connect(val, mod, flags, &block)
+            accel_group.connect(val, mod, flags, &block)
           end
         end
 

data/lib/rabbit/renderer/engine/cairo.rb

@@ -195,6 +195,7 @@ module Rabbit
         def draw_pixbuf(pixbuf, x, y, params={})
           x, y = from_screen(x, y)
           @context.save do
+            apply_clip(x, y, pixbuf.width, pixbuf.height, params)
             @context.translate(x, y)
             set_source_pixbuf(pixbuf, params)
             @context.paint(params[:alpha])
@@ -244,11 +245,14 @@ module Rabbit
         def draw_rsvg_handle(handle, x, y, params={})
           x, y = from_screen(x, y)
           dim = handle.dimensions
-          width = (params[:width] || dim.width).to_f
-          height = (params[:height] || dim.height).to_f
+          w = dim.width
+          h = dim.height
+          width = (params[:width] || w).to_f
+          height = (params[:height] || h).to_f
           @context.save do
+            apply_clip(x, y, w, h, params)
             @context.translate(x, y)
-            @context.scale(width / dim.width, height / dim.height)
+            @context.scale(width / w, height / h)
             @context.render_rsvg_handle(handle)
           end
 
@@ -262,6 +266,7 @@ module Rabbit
           width = (params[:width] || w).to_f
           height = (params[:height] || h).to_f
           @context.save do
+            apply_clip(x, y, w, h, params)
             @context.translate(x, y)
             @context.scale(width / w, height / h)
             @context.render_poppler_page(page)
@@ -396,6 +401,22 @@ module Rabbit
           end
         end
 
+        def apply_clip(x, y, w, h, params)
+          clip_x = params[:clip_x]
+          clip_y = params[:clip_y]
+          clip_width = params[:clip_width]
+          clip_height = params[:clip_height]
+          if clip_x or clip_y or clip_width or clip_height
+            @context.rectangle(x,
+                               y,
+                               clip_width || w,
+                               clip_height || h)
+            @context.clip
+            @context.translate(x - (clip_x || x),
+                               y - (clip_y || y))
+          end
+        end
+
         def make_matrix(xx, xy, x0, yx, yy, y0)
           ::Cairo::Matrix.new(xx, yx, xy, yy, x0, y0)
         end

data/lib/rabbit/renderer/screen.rb

@@ -25,7 +25,6 @@ require "rabbit/renderer/display/mask"
 require "rabbit/renderer/display/search"
 require "rabbit/renderer/display/gesture"
 require "rabbit/renderer/display/graffiti"
-require "rabbit/renderer/display/menu"
 require "rabbit/renderer/display/button-handler"
 require "rabbit/renderer/display/key-handler"
 require "rabbit/renderer/display/scroll-handler"

data/lib/rabbit/slide-configuration.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  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
@@ -17,12 +17,11 @@
 require "date"
 require "time"
 
-require "yaml"
-
 require "rabbit/gettext"
 require "rabbit/logger"
 require "rabbit/author-configuration"
 require "rabbit/path-manipulatable"
+require "rabbit/yaml-loader"
 
 module Rabbit
   class SlideConfiguration
@@ -41,11 +40,13 @@ module Rabbit
     attr_accessor :licenses
     attr_accessor :slideshare_id
     attr_accessor :speaker_deck_id
-    attr_accessor :ustream_id
     attr_accessor :vimeo_id
     attr_accessor :youtube_id
     attr_writer :version
     attr_accessor :author
+    attr_accessor :width
+    attr_accessor :height
+    attr_accessor :source_code_uri
     def initialize(logger=nil)
       @logger = logger || Logger.default
       clear
@@ -65,7 +66,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
@@ -94,10 +95,12 @@ module Rabbit
       @licenses          = []
       @slideshare_id     = nil
       @speaker_deck_id   = nil
-      @ustream_id        = nil
       @vimeo_id          = nil
       @youtube_id        = nil
       @author            = nil
+      @width             = 800
+      @height            = 600
+      @source_code_uri   = nil
     end
 
 
@@ -113,7 +116,6 @@ module Rabbit
       @version           = conf["version"]           || @version
       @slideshare_id     = conf["slideshare_id"]     || @slideshare_id
       @speaker_deck_id   = conf["speaker_deck_id"]   || @speaker_deck_id
-      @ustream_id        = conf["ustream_id"]        || @ustream_id
       @vimeo_id          = conf["vimeo_id"]          || @vimeo_id
       @youtube_id        = conf["youtube_id"]        || @youtube_id
 
@@ -122,6 +124,10 @@ module Rabbit
 
       @author ||= AuthorConfiguration.new(@logger)
       @author.merge!(conf["author"] || {})
+
+      @width             = conf["width"]             || @width
+      @height            = conf["height"]            || @height
+      @source_code_uri   = conf["source_code_uri"]   || @source_code_uri
     end
 
     def to_hash
@@ -136,9 +142,11 @@ module Rabbit
         "licenses"          => @licenses,
         "slideshare_id"     => @slideshare_id,
         "speaker_deck_id"   => @speaker_deck_id,
-        "ustream_id"        => @ustream_id,
         "vimeo_id"          => @vimeo_id,
         "youtube_id"        => @youtube_id,
+        "width"             => @width,
+        "height"            => @height,
+        "source_code_uri"   => @source_code_uri,
       }
       config["author"] = @author.to_hash if @author
       config

data/lib/rabbit/task/slide.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016 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
@@ -65,6 +65,9 @@ module Rabbit
           spec.summary = readme_parser.title || "TODO"
           spec.description = readme_parser.description || "TODO"
           spec.licenses = @slide.licenses
+          if @slide.source_code_uri
+            spec.metadata["source_code_uri"] = @slide.source_code_uri
+          end
 
           slide_conf_path = @slide.path
           spec.files = [".rabbit", slide_conf_path, "Rakefile"]
@@ -155,11 +158,6 @@ module Rabbit
 
         publish_tasks = []
         namespace :publish do
-          if @slide.author.slideshare_user
-            define_publish_slideshare_task
-            publish_tasks << :slideshare
-          end
-
           if @slide.author.speaker_deck_user
             define_publish_speaker_deck_task
             publish_tasks << :speaker_deck
@@ -174,40 +172,15 @@ module Rabbit
       end
 
       def define_publish_rubygems_task
-        desc(_("Publish the slide to %s" % "RubyGems.org"))
+        desc(_("Publish the slide to %s") % "RubyGems.org")
         task :rubygems => :gem do
           pusher = GemPusher.new(gem_path, @slide.author.rubygems_user)
           pusher.push
         end
       end
 
-      def define_publish_slideshare_task
-        slideshare_user = @slide.author.slideshare_user
-        desc(_("Publish the slide to %s" % "SlideShare"))
-        task :slideshare => [:pdf, "gem:validate"] do
-          require "rabbit/slideshare"
-          slideshare = SlideShare.new(@logger)
-          slideshare.user = slideshare_user
-          slideshare.pdf_path = pdf_path
-          slideshare.id = @slide.id
-          slideshare.title = spec.summary
-          slideshare.description = spec.description
-          slideshare.tags = @slide.tags if @slide.tags
-          url = slideshare.upload
-          if url
-            @logger.info(_("Uploaded successfully!"))
-            @logger.info(_("See %s") % url)
-            Gtk.show_uri(url) if Gtk.respond_to?(:show_uri)
-
-            slide_id = url.split(/\//).last
-            @slide.slideshare_id = slide_id
-            @slide.save(".")
-          end
-        end
-      end
-
       def define_publish_speaker_deck_task
-        desc(_("Publish the slide to %s" % "Speaker Deck"))
+        desc(_("Publish the slide to %s") % "Speaker Deck")
         task :speaker_deck => :pdf do
           puts "Not implemented yet."
         end

data/lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb

@@ -32,6 +32,11 @@ def apply_background_image_property(element, options={})
     image.vertical_centering = true
   end
 
+  layout = nil
+  caption_height = 0
+  caption_text = image.caption
+  caption_text = nil if caption_text and caption_text.empty?
+
   element.add_pre_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
     if simulation
       if compute_initial_geometry
@@ -78,6 +83,39 @@ def apply_background_image_property(element, options={})
       end
     end
     image.draw(simulation)
+
+    if caption_text
+      # TODO: Should we move this to Image#draw and unify this and
+      # similar code in lib/rabbit/theme/image/image.rb?
+      if simulation
+        caption = Text.new(caption_text)
+        caption_font_size = image.caption_font_size
+        caption_font_size = font_size(caption_font_size) if caption_font_size
+        caption.prop_set("size",
+                         caption_font_size || @image_caption_font_size)
+        set_font_family(caption)
+        if image.horizontal_centering
+          caption.do_horizontal_centering(canvas, x, y, w, h)
+        end
+        caption.compile(canvas,
+                        (image.x || x) + image.margin_left,
+                        y + image.height + image.margin_top,
+                        image.ow || w,
+                        h - image.height)
+        layout = caption.layout
+        caption_height = caption.height
+      end
+      if !simulation and layout
+        base_x = (image.x || x) + image.margin_left
+        base_y = image.height + y + image.margin_top
+        caption_color = image["caption-color"] || @image_caption_color
+        canvas.draw_layout(layout,
+                           base_x,
+                           base_y + image.margin_bottom,
+                           caption_color)
+      end
+    end
+
     [x, y, w - element_margin_right, h]
   end
 

data/lib/rabbit/theme/clear-blue/clear-blue.rb

@@ -77,8 +77,10 @@ match(Slide, HeadLine) do |heads|
 end
 
 match(Slide, Body) do |bodies|
-  bodies.vertical_centering = true
   bodies.each do |body|
+    if body.slide["enable-clear-blue-slide-body-vertical-centering"] != "false"
+      body.vertical_centering = true
+    end
     next if body.elements.all? {|element| element.is_a?(Image)}
     next if body.elements.any? {|element| element.is_a?(BlockQuote)}
     next if body.elements.any? {|element| element.is_a?(PreformattedBlock)}
@@ -94,6 +96,6 @@ include_theme("slide-logo")
 @icon_images = ["clear-blue-icon.png"]
 include_theme("icon")
 
-@slide_footer_info_left_text ||= canvas.title.gsub(/\n/, '')
+@slide_footer_info_left_text ||= canvas.title.gsub(/\n/, " ")
 @slide_footer_info_right_text ||= "Powered by Rabbit #{Rabbit::VERSION}"
 include_theme("slide-footer-info")

data/lib/rabbit/theme/edge-info-toolkit/edge-info-toolkit.rb

@@ -13,6 +13,7 @@ match(SlideElement) do |slides|
           line_color = options[:line_color] || "#666"
           line_params = options[:line_params] || {}
           left_text = options[:left_text]
+          center_text = options[:center_text]
           right_text = options[:right_text]
           text_position = options[:text_position] || :lower
           text_over_line = options[:text_over_line]
@@ -36,15 +37,20 @@ match(SlideElement) do |slides|
             "size" => text_size,
             "color" => text_color,
           }
-          left_layout = right_layout = nil
+          left_layout = center_layout = right_layout = nil
           if left_text and !left_text.empty?
             left_layout = make_formatted_layout.call(props, left_text)
           end
+          if center_text and !center_text.empty?
+            center_layout = make_formatted_layout.call(props, center_text)
+            center_layout.alignment = :center
+            center_layout.width = (w - (x_margin * 2)) * Pango::SCALE
+          end
           if right_text and !right_text.empty?
             right_layout = make_formatted_layout.call(props, right_text)
           end
 
-          layouts = [left_layout, right_layout].compact
+          layouts = [left_layout, center_layout, right_layout].compact
           unless layouts.empty?
             max_height = layouts.collect {|layout| layout.pixel_size[1]}.max
             if text_position == :lower
@@ -63,6 +69,10 @@ match(SlideElement) do |slides|
               canvas.draw_layout(left_layout, x_margin, text_base_y)
             end
 
+            if center_layout
+              canvas.draw_layout(center_layout, x_margin, text_base_y)
+            end
+
             if right_layout
               text_width, text_height = right_layout.pixel_size
               right_text_x = canvas.width - text_width - x_margin

data/lib/rabbit/theme/image/image.rb

@@ -51,6 +51,9 @@ match("**", Image) do |images|
     caption_height = 0
 
     image.add_post_draw_proc(proc_name) do |canvas, x, y, w, h, simulation|
+      # TODO: Should we move this to Image#draw and unify this and
+      # similar code in
+      # lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb?
       if simulation
         caption = Text.new(caption_text)
         caption.prop_set("size", @image_caption_font_size)

data/lib/rabbit/theme/image-slide-number/image-slide-number.rb

@@ -32,7 +32,7 @@ end
 target_n_slides = nil
 
 match(Slide) do |slides|
-  slides.delete_post_draw_proc_by_name(proc_name)
+  slides.delete_pre_draw_proc_by_name(proc_name)
 
   break if @image_slide_number_uninstall
 
@@ -63,7 +63,7 @@ match(Slide) do |slides|
     "weight" => "heavy",
   }
 
-  slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
+  draw = lambda do |slide, canvas, x, y, w, h, simulation|
     if simulation
       image_height =  canvas.height * @image_slide_number_space_ratio
       loader.resize(nil, image_height)
@@ -88,7 +88,7 @@ match(Slide) do |slides|
       margin_bottom = @image_slide_number_margin_bottom || slide.margin_bottom
       base_x = margin_left
       base_y = canvas.height - loader.height - margin_bottom
-      max_width = canvas.width - margin_left - base_x - loader.width
+      max_width = canvas.width - margin_right - base_x - loader.width
       start_base_x = base_x
       goal_base_x = canvas.width - margin_right - goal_flag_width
 
@@ -126,4 +126,9 @@ match(Slide) do |slides|
     end
     [x, y, w, h]
   end
+  if slides[0].is_a?(PopplerSlide)
+    slides.add_post_draw_proc(proc_name, &draw)
+  else
+    slides.add_pre_draw_proc(proc_name, &draw)
+  end
 end

data/lib/rabbit/theme/image-timer/image-timer.rb

@@ -38,7 +38,7 @@ end
 @image_timer_target_paths ||= [Slide]
 
 match(*@image_timer_target_paths) do |slides|
-  slides.delete_post_draw_proc_by_name(proc_name)
+  slides.delete_pre_draw_proc_by_name(proc_name)
   stop_auto_redraw_timer
 
   break if @image_timer_uninstall
@@ -51,7 +51,7 @@ match(*@image_timer_target_paths) do |slides|
         @image_timer_auto_updating = true
         start_auto_redraw_timer(@image_timer_interval)
       end
-      slide.delete_post_draw_proc_by_name(init_proc_name)
+      slide.delete_pre_draw_proc_by_name(init_proc_name)
     end
     [x, y, w, h]
   end
@@ -61,7 +61,7 @@ match(*@image_timer_target_paths) do |slides|
   max_width = nil
   base_y = nil
 
-  slides.add_post_draw_proc(proc_name) do |slide, canvas, x, y, w, h, simulation|
+  draw = lambda do |slide, canvas, x, y, w, h, simulation|
     margin_left = @image_timer_margin_left || slide.margin_left
     margin_right = @image_timer_margin_right || slide.margin_right
     margin_bottom = @image_timer_margin_bottom || slide.margin_bottom
@@ -111,4 +111,9 @@ match(*@image_timer_target_paths) do |slides|
     end
     [x, y, w, h]
   end
+  if slides[0].is_a?(PopplerSlide)
+    slides.add_post_draw_proc(proc_name, &draw)
+  else
+    slides.add_pre_draw_proc(proc_name, &draw)
+  end
 end

data/lib/rabbit/theme/pdf/pdf.rb

@@ -1,7 +1,7 @@
 set_background("black")
 
 begin
-  include_theme(canvas.title)
+  include_theme(".")
 rescue LoadError
 end
 

data/lib/rabbit/theme/slide-footer-info/slide-footer-info.rb

@@ -25,6 +25,7 @@ end
 @slide_footer_info_base_y ||= canvas.height - @margin_bottom
 
 @slide_footer_info_left_text ||= nil
+@slide_footer_info_center_text ||= nil
 @slide_footer_info_right_text ||= nil
 
 include_theme("edge-info-toolkit")
@@ -39,6 +40,7 @@ match(SlideElement) do
                  :line_color => @slide_footer_info_line_color,
                  :line_params => @slide_footer_info_line_params,
                  :left_text => @slide_footer_info_left_text,
+                 :center_text => @slide_footer_info_center_text,
                  :right_text => @slide_footer_info_right_text,
                  :text_position => :lower,
                  :text_over_line => @slide_footer_info_text_over_line,

data/lib/rabbit/theme/tag/tag.rb

@@ -61,12 +61,19 @@ match("**", CustomTag) do |tags|
       find_target.call(tag).prop_set("size", @xx_large_font_size)
     when /\A(normal|oblique|italic)\z/
       find_target.call(tag).prop_set("style", $1)
-    when /\Amargin-(top|bottom|left|right)(?:\s*\*\s*(\d+))?\z/
+    when /\Amargin-(top|bottom|left|right)(?:\s*\*\s*([-\d.]+))?\z/
       target = "margin_#{$1}"
-      scale = Integer($2 || 1)
+      scale = Float($2 || 1)
       outer_block = find_outer_block.call(tag)
       current_value = outer_block.send(target)
       outer_block.send("#{target}=", current_value + (@space * scale))
+    when /\Awrap-(.+)\z/
+      wrap = $1
+      find_target.call(tag).wrap_mode = wrap
+    when /\Ajustify?\z/
+      find_target.call(tag).justify = true
+    when /\Ano-justify?\z/
+      find_target.call(tag).justify = false
     else
       handler = find_handler.call(tag)
       if handler

data/lib/rabbit/theme-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/author-configuration"
 require "rabbit/path-manipulatable"
+require "rabbit/yaml-loader"
 
 module Rabbit
   class ThemeConfiguration
@@ -42,7 +41,7 @@ module Rabbit
 
     def load
       return unless File.exist?(path)
-      conf = YAML.load(File.read(path))
+      conf = YAMLLoader.load(File.read(path))
       merge!(conf)
     rescue
       format = _("Failed to read slide configuration: %s: %s")

data/lib/rabbit/utils.rb

@@ -352,9 +352,32 @@ module Rabbit
 
   module SystemRunner
     module_function
-    def run(cmd, *args)
+    def run(cmd, *args, progress: nil)
       begin
-        system(cmd, *args)
+        IO.pipe do |input, output|
+          pid = spawn(cmd, *args, out: output)
+          output.close
+          begin
+            loop do
+              readables, = IO.select([input], nil, nil, 0.1)
+              if readables
+                readable = readables[0]
+                begin
+                  $stdout.print(readable.read_nonblock(4096))
+                rescue EOFError
+                  break
+                else
+                  break if readable.eof?
+                end
+              else
+                progress.call if progress
+              end
+            end
+            true
+          ensure
+            Process.waitpid(pid)
+          end
+        end
       rescue SystemCallError
         yield($!) if block_given?
         false

data/lib/rabbit/version.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
@@ -15,5 +15,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Rabbit
-  VERSION = "3.0.0"
+  VERSION = "3.0.2"
 end