rabbit 3.0.1 → 3.0.2

data/lib/rabbit/parser/rd/ext/image.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 require 'rabbit/element'
 require 'rabbit/parser/ext/image'
 
@@ -11,13 +27,16 @@ module Rabbit
           def img(label, content, visitor)
             label = label.to_s
             return nil unless /^img:\s*(.+)$/ =~ label
-            make_image(visitor.canvas, $1)
+            make_image(visitor.canvas, $1, body: visitor.current_body)
           end
 
-          def make_image_from_file(source, visitor)
+          def make_image_from_file(source, visitor, **options)
             src, prop = parse_source(source)
-            super(visitor.canvas, src) do |src_file_path|
-              [yield(src_file_path, prop), prop]
+            super(visitor.canvas,
+                  src,
+                  body: visitor.current_body,
+                  **options) do |src_file|
+              [yield(src_file, prop), prop]
             end
           end
         end

data/lib/rabbit/parser/rd/rd2rabbit-lib.rb

@@ -56,8 +56,10 @@ module Rabbit
         def_delegators(:@canvas, :logger, :full_path, :tmp_dir_name)
 
         attr_reader :canvas
-        def initialize(canvas)
+        attr_reader :progress
+        def initialize(canvas, progress)
           @canvas = canvas
+          @progress = progress
 
           @slides = []
           @slide = nil

data/lib/rabbit/parser/rd.rb

@@ -38,7 +38,7 @@ module Rabbit
         source = @source.read.gsub(/\r\n/, "\n")
         source = "=begin\n#{source}\n=end\n"
         tree = ::RD::RDTree.new(source)
-        visitor = RD2RabbitVisitor.new(@canvas)
+        visitor = RD2RabbitVisitor.new(@canvas, @progress)
         visitor.visit(tree)
       rescue Racc::ParseError
         message = format_parse_error_message($!.message, source)

data/lib/rabbit/parser/wiki/output.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2007-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
@@ -489,9 +489,9 @@ module Rabbit
 
           def LaTeX(source, props={})
             args = [@output.canvas, source]
-            Ext::Image.make_image_from_file(*args) do |src_file_path|
+            Ext::Image.make_image_from_file(*args) do |src_file|
               props = Utils.stringify_hash_key(props)
-              args = [src_file_path, props, @output.canvas]
+              args = [src_file.path, props, @output.canvas]
               [Ext::TeX.make_image_by_LaTeX(*args), props]
             end
           end
@@ -499,9 +499,9 @@ module Rabbit
 
           def mimeTeX(source, props={})
             args = [@output.canvas, source]
-            Ext::Image.make_image_from_file(*args) do |src_file_path|
+            Ext::Image.make_image_from_file(*args) do |src_file|
               props = Utils.stringify_hash_key(props)
-              args = [src_file_path, props, @output.canvas]
+              args = [src_file.path, props, @output.canvas]
               [Ext::TeX.make_image_by_mimeTeX(*args), props]
             end
           end
@@ -509,18 +509,18 @@ module Rabbit
 
           def aafigure(source, props={})
             args = [@output.canvas, source]
-            Ext::Image.make_image_from_file(*args) do |src_file_path|
+            Ext::Image.make_image_from_file(*args) do |src_file|
               props = Utils.stringify_hash_key(props)
-              args = [src_file_path, props, @output.canvas]
+              args = [src_file.path, props, @output.canvas]
               [Ext::AAFigure.make_image(*args), props]
             end
           end
 
           def blockdiag(source, props={})
             args = [@output.canvas, source]
-            Ext::Image.make_image_from_file(*args) do |src_file_path|
+            Ext::Image.make_image_from_file(*args) do |src_file|
               props = Utils.stringify_hash_key(props)
-              args = [src_file_path, props, @output.canvas]
+              args = [src_file.path, props, @output.canvas]
               [Ext::BlockDiag.make_image(*args), props]
             end
           end

data/lib/rabbit/parser.rb

@@ -25,7 +25,7 @@ module Rabbit
     include GetText
 
     module_function
-    def parse(canvas, source)
+    def parse(canvas, source, **options)
       parser = Base.find_loader(source)
       if parser.nil?
         format = _("unsupported format. (supported: %s)")
@@ -35,7 +35,7 @@ module Rabbit
         message = format % "[#{format_names.join(', ')}]"
         raise UnsupportedFormatError.new(message)
       end
-      parser.new(canvas, source).parse
+      parser.new(canvas, source, **options).parse
     end
 
     def normalize_property_name(name)

data/lib/rabbit/properties.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2020  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2020-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,6 +15,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require "rabbit/relative-size"
+require "rabbit/yaml-loader"
 
 module Rabbit
   class Properties
@@ -60,6 +61,18 @@ module Rabbit
                           key)
     end
 
+    def draws
+      targets = @data.select do |key, _|
+        /\Adraw\d+\z/.match?(key)
+      end
+      targets = targets.sort_by do |key, _|
+        Integer(key[/\d+/], 10)
+      end
+      targets.collect do |_, value|
+        YAMLLoader.load(value)
+      end
+    end
+
     def respond_to_missing?(name, include_private)
       @data.key?(normalize_key(name.to_s.gsub(/\?\z/, "")))
     end

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

@@ -178,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/slide-configuration.rb

@@ -46,6 +46,7 @@ module Rabbit
     attr_accessor :author
     attr_accessor :width
     attr_accessor :height
+    attr_accessor :source_code_uri
     def initialize(logger=nil)
       @logger = logger || Logger.default
       clear
@@ -99,6 +100,7 @@ module Rabbit
       @author            = nil
       @width             = 800
       @height            = 600
+      @source_code_uri   = nil
     end
 
 
@@ -125,6 +127,7 @@ module Rabbit
 
       @width             = conf["width"]             || @width
       @height            = conf["height"]            || @height
+      @source_code_uri   = conf["source_code_uri"]   || @source_code_uri
     end
 
     def to_hash
@@ -143,6 +146,7 @@ module Rabbit
         "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
@@ -181,31 +179,6 @@ module Rabbit
         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")
         task :speaker_deck => :pdf do

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

@@ -96,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/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)
@@ -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/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.1"
+  VERSION = "3.0.2"
 end