rabbit 3.0.0 → 3.0.2

data/lib/rabbit/image/mermaid.rb

@@ -0,0 +1,73 @@
+# Copyright (C) 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/image/pdf"
+
+module Rabbit
+  module ImageManipulable
+    class Mermaid < Base
+
+      unshift_loader(self)
+
+      include SystemRunner
+
+      class << self
+        def match?(filename)
+          File.extname(filename).downcase.end_with?(".mmd")
+        end
+      end
+
+      delegate
+
+      def initialize(filename, props, canvas: nil)
+        init_delegated_loader(filename, props, canvas)
+        super
+      end
+
+      private
+      def init_delegated_loader(filename, props, canvas)
+        background_color = props["background_color"] || "transparent"
+        pdf_path = File.open(filename, "rb") do |source|
+          cache_processed_data(canvas, [source, background_color], "pdf") do
+            @pdf_file = Tempfile.new(["rabbit-image-loader-mermaid", ".pdf"])
+            command_line = [
+              "npx",
+              "--yes",
+              "--package=@mermaid-js/mermaid-cli",
+              "mmdc",
+              "--backgroundColor", background_color,
+              "--input", filename,
+              "--output", @pdf_file.path,
+              "--pdfFit",
+            ]
+            unless SystemRunner.run(*command_line)
+              format = _("tried mermaid command: %s")
+              additional_info = format % command_line.inspect
+              raise MermaidCanNotHandleError.new(command_line.join(' '),
+                                                 additional_info)
+            end
+            @pdf_file.path
+          end
+        end
+        @delegated_loader = PDF.new(pdf_path, props)
+      end
+
+      def load_image
+        # do nothing
+      end
+    end
+  end
+end

data/lib/rabbit/image/pdf.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2006-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 "poppler"
 
 require "rabbit/gettext"
@@ -25,10 +41,7 @@ module Rabbit
 
       def draw(canvas, x, y, params={})
         if @document
-          default_params = {
-            :width => width,
-            :height => height,
-          }
+          default_params = default_draw_params(x, y)
           canvas.draw_poppler_page(page, x, y, default_params.merge(params))
         else
           super
@@ -39,6 +52,11 @@ module Rabbit
         @pixbuf ||= to_pixbuf
       end
 
+      def update_size
+        @document = Poppler::Document.new(uri)
+        @width, @height = page.size
+      end
+
       private
       def page
         index = self["page"] || 1
@@ -56,11 +74,6 @@ module Rabbit
         _page
       end
 
-      def update_size
-        @document = Poppler::Document.new(uri)
-        @width, @height = page.size
-      end
-
       def filename
         File.expand_path(@filename)
       end

data/lib/rabbit/image/svg.rb

@@ -42,10 +42,7 @@ module Rabbit
 
       def draw(canvas, x, y, params={})
         if @handle
-          default_params = {
-            :width => width,
-            :height => height,
-          }
+          default_params = default_draw_params(x, y)
           canvas.draw_rsvg_handle(@handle, x, y, default_params.merge(params))
         else
           super

data/lib/rabbit/image.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2020  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
@@ -16,12 +16,12 @@
 
 require "forwardable"
 require "tempfile"
-require 'thread'
 
 require "rabbit/image/default"
 require "rabbit/image/dia"
 require "rabbit/image/eps"
 require "rabbit/image/gimp"
+require "rabbit/image/mermaid"
 require "rabbit/image/pdf"
 require "rabbit/image/svg"
 
@@ -29,21 +29,21 @@ module Rabbit
   module ImageManipulable
     extend Forwardable
 
-    def_delegators(:@loader, :keep_ratio, :keep_ratio=)
+    def_delegators(:@loader, :keep_ratio, :keep_ratio?, :keep_ratio=)
     def_delegators(:@loader, :x_aspect_ratio, :y_aspect_ratio)
     def_delegators(:@loader, :pixbuf, :width, :height)
     def_delegators(:@loader, :original_width, :original_height)
     def_delegators(:@loader, :resize, :draw)
     def_delegators(:@loader, :[], :[]=)
+    def_delegators(:@loader, :properties)
     alias_method :scale, :resize
 
-    def initialize(filename, props=nil, *args, &block)
+    def initialize(filename, props=nil, *args, canvas: nil, &block)
       unless File.exist?(filename)
         raise ImageFileDoesNotExistError.new(filename)
       end
       super(*args, &block)
-      props = Utils.stringify_hash_key(props) if props
-      @loader = Base.find_loader(filename).new(filename, props)
+      @loader = Base.find_loader(filename).new(filename, props, canvas: canvas)
     end
   end
 

data/lib/rabbit/info-window.rb

@@ -62,7 +62,7 @@ module Rabbit
       @window.signal_handler_disconnect(@window_destroy_id)
       @window.destroy
       @window = @window_destroy_id = nil
-      @canvas_widgets = @outer_box = nil
+      @canvas_widgets = @grid = nil
       GLib::Source.remove(@timer_id) if @timer_id
       @timer_id = nil
       @previous_canvas = @current_canvas = @next_canvas = nil
@@ -72,9 +72,9 @@ module Rabbit
       !@window.nil?
     end
 
-    def moved(index)
+    def moved
       return unless showing?
-      update(index)
+      update
     end
 
     def parsed
@@ -114,13 +114,14 @@ module Rabbit
       @window = Gtk::Window.new
       @window_destroy_id = @window.signal_connect("destroy") do
         @canvas.activate("ToggleInfoWindow")
+        Gdk::Event::PROPAGATE
       end
       @window.title = _("%s: Information window") % @canvas.title
       @window.set_default_size(width, height) if width and height
       if on_note_mode?
-        init_widgets_on_note_mode(width, height)
+        init_widgets_on_note_mode
       else
-        init_widgets(width, height)
+        init_widgets
       end
       init_menu
       attach_key(@window)
@@ -133,61 +134,91 @@ module Rabbit
       @window.add_events(event_mask)
       set_button_event(@window)
       set_scroll_event(@window)
-      @window.add(@outer_box)
+      @window.add(@grid)
     end
 
-    def init_widgets(width, height)
-      init_timer_label(width * (1.0 / 3.0), height * (1.0 / 3.0))
-      @outer_box = Gtk::Box.new(:vertical)
-
-      current_box = Gtk::Box.new(:horizontal)
-      @current_canvas.attach_to(nil, @window, current_box) do |container, widget|
-        widget.set_size_request(width * (2.0 / 3.0), height * (2.0 / 3.0))
-        container.pack_start(widget, :expand => true, :fill => false)
+    def init_widgets
+      init_timer_area
+      @grid = Gtk::Grid.new
+      @grid.column_homogeneous = true
+      @grid.row_homogeneous = true
+
+      base_width = 1
+      base_height = 1
+      @current_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width,
+                         0,
+                         base_width * 2,
+                         base_height * 2)
       end
-      @outer_box.pack_start(current_box, :expand => true, :fill => false)
 
-      bottom_box = Gtk::Box.new(:horizontal)
-      @previous_canvas.attach_to(nil, @window, bottom_box) do |container, widget|
-        widget.set_size_request(width * (1.0 / 3.0), height * (1.0 / 3.0))
-        container.pack_start(widget, :expand => false, :fill => false)
+      @previous_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         0,
+                         base_height * 2,
+                         base_width,
+                         base_height)
       end
-      bottom_box.pack_start(@timer_label, :expand => true, :fill => false)
-      @next_canvas.attach_to(nil, @window, bottom_box) do |container, widget|
-        widget.set_size_request(width * (1.0 / 3.0), height * (1.0 / 3.0))
-        container.pack_end(widget, :expand => false, :fill => false)
+      @next_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width * 3,
+                         base_height * 2,
+                         base_width,
+                         base_height)
       end
-      @outer_box.pack_end(bottom_box, :expand => false, :fill => false)
 
-      @outer_box.show
+      @grid.attach(@timer_area,
+                   base_width,
+                   base_height * 2,
+                   base_width * 2,
+                   base_height)
+
+      @grid.show
     end
 
-    def init_widgets_on_note_mode(width, height)
-      init_timer_label(width * (1.0 / 5.0), height * (2.0 / 5.0))
+    def init_widgets_on_note_mode
+      init_timer_area
       init_note_area
-      @outer_box = Gtk::Box.new(:vertical)
-
-      current_box = Gtk::Box.new(:horizontal)
-      current_box.pack_start(@timer_label, :expand => false, :fill => false)
-      @previous_canvas.attach_to(nil, @window, current_box) do |container, widget|
-        widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_start(widget, :expand => true, :fill => true, :padding => 10)
+      @grid = Gtk::Grid.new
+      @grid.column_homogeneous = true
+      @grid.row_homogeneous = true
+
+      base_width = 1
+      base_height = 4
+      @previous_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         0,
+                         0,
+                         base_width,
+                         base_height)
       end
-      @current_canvas.attach_to(nil, @window, current_box) do |container, widget|
-        widget.set_size_request(width * (2.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_start(widget, :expand => true, :fill => true)
+      @current_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width,
+                         0,
+                         base_width * 2,
+                         base_height)
       end
-      @next_canvas.attach_to(nil, @window, current_box) do |container, widget|
-        widget.set_size_request(width * (1.0 / 5.0), height * (2.0 / 5.0))
-        container.pack_end(widget, :expand => true, :fill => true, :padding => 10)
+      @next_canvas.attach_to(nil, @window, @grid) do |container, widget|
+        container.attach(widget,
+                         base_width * 3,
+                         0,
+                         base_width,
+                         base_height)
       end
-      @outer_box.pack_start(current_box, :expand => false, :fill => false)
-
-      bottom_box = Gtk::Box.new(:horizontal)
-      bottom_box.pack_start(@note_area, :expand => true, :fill => true, :padding => 20)
-      @outer_box.pack_start(bottom_box, :expand => true, :fill => true, :padding => 20)
 
-      @outer_box.show
+      @grid.attach(@note_area,
+                   0,
+                   base_height,
+                   base_width * 4,
+                   base_height)
+      @grid.attach(@timer_area,
+                   0,
+                   base_height * 2,
+                   base_width * 4,
+                   1)
+      @grid.show
     end
 
     def init_canvas_widgets
@@ -196,10 +227,16 @@ module Rabbit
       @next_canvas.attach_to(nil, @window, @canvas_widgets)
     end
 
-    def init_timer_label(width, height)
-      @timer_label = Gtk::Label.new
-      @timer_label.justify = :center
-      @timer_label.markup = markupped_timer_label(width, height)
+    def init_timer_area
+      @timer_area = Gtk::DrawingArea.new
+      @timer_area.signal_connect("draw") do |area, context|
+        context.set_source_rgb(1, 0, 0) if rest_time and rest_time < 0
+        draw_text_as_large_as_possible(area,
+                                       context,
+                                       timer_text,
+                                       alignment: :center)
+        Gdk::Event::PROPAGATE
+      end
     end
 
     def init_note_area
@@ -210,10 +247,10 @@ module Rabbit
       end
     end
 
-    def update(index=nil)
+    def update
       start_timer if @timer_id.nil?
       @note_area.queue_draw if @note_area
-      adjust_slide(index)
+      adjust_slide
     end
 
     def note_text
@@ -222,10 +259,14 @@ module Rabbit
       note.gsub(/\\n/, "\n")
     end
 
-    def draw_text_as_large_as_possible(area, context, markupped_text)
+    def draw_text_as_large_as_possible(area,
+                                       context,
+                                       markupped_text,
+                                       options={})
       return if markupped_text.nil?
 
-      area_width, area_height = area.window.size
+      area_width = area.window.width
+      area_height = area.window.height
 
       layout = context.create_pango_layout
       layout.context.resolution = @canvas.font_resolution
@@ -234,6 +275,9 @@ module Rabbit
       layout.attributes = attributes
       layout.width = area_width * Pango::SCALE
       layout.wrap = :word_char
+      layout.alignment = options[:alignment] if options.key?(:alignment)
+
+      layout.justify = options[:justify] if options.key?(:justify)
       set_as_large_as_font_description(layout, area_height)
 
       context.update_pango_layout(layout)
@@ -258,8 +302,8 @@ module Rabbit
 
     def start_timer
       @timer_id = GLib::Timeout.add(1000) do
-        @timer_label.markup = markupped_timer_label if showing?
         if showing? and @canvas.rest_time
+          @timer_area.queue_draw
           GLib::Source::CONTINUE
         else
           @timer_id = nil
@@ -268,19 +312,11 @@ module Rabbit
       end
     end
 
-    def markupped_timer_label(width=nil, height=nil)
-      width ||= @window.size[0] * (1.0 / 3.0)
-      height ||= @window.size[1] * (1.0 / 3.0)
-      attrs = {}
-      font_size = on_note_mode? ? 100 : 200
-      attrs["font_desc"] = ((height * font_size) / Pango::SCALE).to_s
-      rest_time = @canvas.rest_time
-      attrs["foreground"] = "red" if rest_time and rest_time < 0
-      PangoMarkup.new("span", attrs, timer_label).to_s
+    def rest_time
+      @canvas.rest_time || @canvas.allotted_time
     end
 
-    def timer_label
-      rest_time = @canvas.rest_time || @canvas.allotted_time
+    def timer_text
       if rest_time
         "%s%02d:%02d" % Utils.split_number_to_minute_and_second(rest_time)
       else
@@ -288,18 +324,6 @@ module Rabbit
       end
     end
 
-    def markupped_note_text(width=nil, height=nil)
-      height ||= @window.size[1] * (3.0 / 5.0)
-      if @canvas.current_slide["note"]
-        text = @canvas.current_slide["note"].gsub(/\\n/, "\n")
-      else
-        text = ""
-      end
-      attrs = {}
-      attrs["font_desc"] = ((height * 40) / Pango::SCALE).to_s
-      PangoMarkup.new("span", attrs, text).to_s
-    end
-
     def update_source
       each do |canvas|
         source = Source::Memory.new("UTF-8", @canvas.logger)
@@ -319,10 +343,12 @@ module Rabbit
       end
     end
 
-    def adjust_slide(base_index=nil)
-      base_index ||= @canvas.current_index
+    def adjust_slide
+      base_index = @canvas.current_index
       @previous_canvas.move_to_if_can([base_index - 1, 0].max)
       @current_canvas.move_to_if_can(base_index)
+      @current_canvas.current_slide.drawing_index =
+        @canvas.current_slide.drawing_index
       @next_canvas.move_to_if_can([base_index + 1, @canvas.slide_size - 1].min)
     end
 

data/lib/rabbit/keys.rb

@@ -178,5 +178,11 @@ module Rabbit
         Gdk::Keyval::KEY_t,
       ]
     end
+
+    module ShiftControlAlt
+      TOGGLE_TERMINAL_KEYS = [
+        Gdk::Keyval::KEY_t,
+      ]
+    end
   end
 end

data/lib/rabbit/menu.rb

@@ -260,6 +260,8 @@ module Rabbit
         [:item, "ToggleSpotlight"],
         [:item, "ToggleMagnifier"],
         [:separator],
+        [:item, "ToggleTerminal"],
+        [:separator],
         [:menu, "JumpTo"],
         [:separator],
         [:item, "Previous"],

data/lib/rabbit/parser/base.rb

@@ -5,9 +5,10 @@ module Rabbit
     class Base
       extend ModuleLoader
 
-      def initialize(canvas, source)
+      def initialize(canvas, source, progress: nil)
         @canvas = canvas
         @source = source
+        @progress = progress
       end
     end
   end

data/lib/rabbit/parser/ext/blockdiag.rb

@@ -9,29 +9,31 @@ module Rabbit
         # "font" is treated as specially.
         AVAILABLE_VALUE_OPTIONS = []
         def make_image(path, prop, logger)
-          image_file = Tempfile.new("rabbit-image-blockdiag")
-          command = [
-            "blockdiag",
+          image_file = Tempfile.new(["rabbit-image-blockdiag", ".svg"])
+          command_line = [
             "-T", "svg",
             "-o", image_file.path,
           ]
           font = find_font(prop)
-          command.concat(["-f", font]) if font
+          command_line.concat(["-f", font]) if font
           AVAILABLE_FLAG_OPTIONS.each do |name|
-            command << "--#{name}" if /\A(?:true|yes)\z/i =~ prop[name].to_s
+            command_line << "--#{name}" if /\A(?:true|yes)\z/i =~ prop[name].to_s
           end
           AVAILABLE_VALUE_OPTIONS.each do |name|
-            command.concat(["--#{name}", prop[name]]) if prop.has_key?(name)
+            command_line.concat(["--#{name}", prop[name]]) if prop.has_key?(name)
           end
-          command << path
-          if SystemRunner.run(*command)
-            image_file
-          else
-            format = _("tried blockdiag command: %s")
-            additional_info = format % command.inspect
-            raise BlockDiagCanNotHandleError.new(command.join(' '),
-                                                 additional_info)
+          command_line << path
+          blockdiag_commands = ["blockdiag3", "blockdiag"]
+          blockdiag_commands.each do |blockdiag|
+            if SystemRunner.run(blockdiag, *command_line)
+              return image_file
+            end
           end
+          command_line.unshift(blockdiag_commands.first)
+          format = _("tried blockdiag command: %s")
+          additional_info = format % command_line
+          raise BlockDiagCanNotHandleError.new(command_line.join(' '),
+                                               additional_info)
         end
 
         def find_font(prop)

data/lib/rabbit/parser/ext/charty.rb

@@ -0,0 +1,58 @@
+# Copyright (C) 2021  Kouhei Sutou <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 "csv"
+
+module Rabbit
+  module Parser
+    module Ext
+      module Charty
+        include GetText
+
+        module_function
+        def make_image(path, prop, logger)
+          require "charty"
+          backend = prop["backend"]
+          ::Charty::Backends.use(backend) if backend
+          data = CSV.read(path, headers: true, converters: :all)
+          type = prop["type"]
+          case type
+          when "bar"
+            plotter = ::Charty.bar_plot(data: data,
+                                        x: prop["x"],
+                                        y: prop["y"],
+                                        color: prop["color"])
+          when "line"
+            plotter = ::Charty.line_plot(data: data,
+                                         x: prop["x"],
+                                         y: prop["y"],
+                                         color: prop["color"])
+          when "scatter"
+            plotter = ::Charty.scatter_plot(data: data,
+                                            x: prop["x"],
+                                            y: prop["y"],
+                                            color: prop["color"])
+          else
+            raise ArgumentError, "charty: unsupported type: #{type.inspect}"
+          end
+          image_file = Tempfile.new(["rabbit-image-charty", ".svg"])
+          plotter.save(image_file.path)
+          image_file
+        end
+      end
+    end
+  end
+end