rabbit 3.0.3 → 3.0.5

data/doc/ja/news.rd

@@ -5,6 +5,87 @@ apply_data: false
 ---
 {% raw %}
 
+== 3.0.5: 2025-03-30
+
+=== 改良
+
+==== rabbit
+
+  * ソースの内容の判別方法を改良。
+    * ((<GH-172|URL:https://github.com/rabbit-shocker/rabbit/issues/172>))
+    * NAITOH Junさんが報告
+
+=== Thanks
+
+  * NAITOH Junさん
+
+== 3.0.4: 2025-03-23
+
+=== 改良
+
+==== ドキュメント
+
+  * タイトルスライドのメタデータを追加。
+    * ((<GH-165|URL:https://github.com/rabbit-shocker/rabbit/issues/165>))
+    * makicamelさんがパッチ提供
+
+==== rabbit
+
+  * 描画：点線をサポート。
+
+  * ハイライト：Emacsを使ったハイライト機能を削除。
+
+  * RD：Font Awesomeをサポート。
+
+  * 図：((<Charty|URL:https://github.com/red-data-tools/charty>))をサ
+    ポート。
+
+  * 情報ウィンドウ：明示的に色を設定するように変更。
+
+  * NKFへの依存を削除。
+
+  * Ruby 3.4対応。
+    * ((<GH-170|URL:https://github.com/rabbit-shocker/rabbit/issues/170>))
+    * HASUMI Hitoshiさんがパッチ提供
+
+  * Clutterサポートを削除。
+
+  * GL：組み込みの3Dオブジェクトを描画するメソッドを削除。
+
+=== 修正
+
+==== 全体
+
+  * 誤字を修正。
+    * ((<GH-159|URL:https://github.com/rabbit-shocker/rabbit/issues/159>))
+    * kojix2さんがパッチ提供
+
+==== ドキュメント
+
+  * デフォルトの公開レベルを修正。
+    * ((<GH-162|URL:https://github.com/rabbit-shocker/rabbit/issues/162>))
+    * makicamelさんがパッチ提供
+
+==== rabbit
+
+  * ((%Alt+t%))でタイマーがリセットされない問題を修正。
+    * ((<GH-158|URL:https://github.com/rabbit-shocker/rabbit/issues/158>))
+    * Kingdon Barrettさんが報告
+
+  * dRuby：macOSでスライド移動操作時にクラッシュする問題を修正。
+    * ((<GH-161|URL:https://github.com/rabbit-shocker/rabbit/issues/161>))
+    * makicamelさんが報告
+
+=== 感謝
+
+  * Kingdon Barrettさん
+
+  * kojix2さん
+
+  * makicamelさん
+
+  * HASUMI Hitoshiさん
+
 == 3.0.3: 2023-07-02
 
 マイナーバグフィックスリリース。

data/doc/ja/usage/rabbit.rd

@@ -334,7 +334,7 @@ WindowsユーザならRDファイルをbin/rabbit.batにドラッグアンド
    change-source, source, allから選びます。後ろに挙げた公開
    レベルほど多くの機能を公開します。
 
-   デフォルトではstrictです。
+   デフォルトではallです。
 
 : --comment-source=FILE
    初期コメント用ソースのファイル名を指定します。

data/lib/rabbit/action.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2005-2024  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,28 +16,6 @@
 
 require "rabbit/gtk"
 
-Gtk.init if Gtk.respond_to?(:init)
-
-module Gtk
-  class Action
-    alias _activate activate
-    def activate(&block)
-      @block = block
-      _activate
-    ensure
-      @block = nil
-    end
-
-    def block_given?
-      not @block.nil?
-    end
-
-    def call(*args, &block)
-      @block.call(*args, &block)
-    end
-  end
-end
-
 require 'rabbit/rabbit'
 require 'rabbit/stock'
 require 'rabbit/utils'

data/lib/rabbit/canvas.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2024  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
@@ -93,14 +93,6 @@ module Rabbit
     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)
-    def_delegators(:@renderer, :draw_octahedron, :draw_dodecahedron)
-    def_delegators(:@renderer, :draw_icosahedron, :draw_teapot)
-
-    def_delegators(:@renderer, :gl_compile, :gl_call_list)
-    def_delegators(:@renderer, :new_list_id)
-
     def_delegators(:@renderer, :z_far, :z_view)
 
     def_delegators(:@renderer, :flag_size)
@@ -110,7 +102,6 @@ module Rabbit
     def_delegators(:@renderer, :confirm)
 
     def_delegators(:@renderer, :display?, :printable?)
-    def_delegators(:@renderer, :x_dpi, :y_dpi)
 
     def_delegators(:@renderer, :whiteouting?, :blackouting?)
     def_delegators(:@renderer, :toggle_whiteout, :toggle_blackout)
@@ -684,6 +675,7 @@ module Rabbit
 
     def reset_timer
       @limit_time = nil
+      reload_theme
     end
 
     def apply_timer

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

@@ -189,7 +189,7 @@ module Rabbit
         end
 
         parser.on("--allotted-time=TIME",
-                  _("Allotted time in presentaion"),
+                  _("Allotted time in presentation"),
                   _("(e.g.: %s)") % "--allotted-time=5m",
                   _("(optional)")) do |allotted_time|
           @data.allotted_time = allotted_time

data/lib/rabbit/command/rabbit.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2019  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2024  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
@@ -853,9 +853,11 @@ module Rabbit
         setup_3d_info(canvas)
         frame.init_gui(@options.width, @options.height, true)
         frame.fullscreen if @options.full_screen
-        native_window = frame.window.window
-        if @options.show_native_window_id and native_window.respond_to?(:xid)
-          @logger.info(_("Window ID: %d") % native_window.xid)
+        if @options.show_native_window_id
+          native_surface = frame.window.surface
+          if native_surface.respond_to?(:xid)
+            @logger.info(_("Window ID: %d") % native_surface.xid)
+          end
         end
         apply_theme_if_need(frame)
         parse(frame, source, !Utils.windows?)

data/lib/rabbit/cursor-manager.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2006-2024  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
@@ -39,17 +39,17 @@ module Rabbit
       @stocks[name].push(@current)
     end
 
-    def restore(drawable, name)
+    def restore(surface, name)
       if name.nil?
         type = @current
       else
         type = @stocks[name].pop
       end
-      drawable.cursor = type_to_cursor(type)
+      surface.cursor = type_to_cursor(type)
     end
 
-    def update(drawable, type)
-      drawable.cursor = type_to_cursor(type)
+    def update(surface, type)
+      surface.cursor = type_to_cursor(type)
     end
 
     private

data/lib/rabbit/element/text.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2006-2023  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/text-element'
 require 'rabbit/element/text-container-element'
 require 'rabbit/element/text-block-element'
@@ -8,6 +24,56 @@ module Rabbit
       include TextElement
     end
 
+    class FontAwesomeText
+      include TextElement
+
+      class << self
+        def [](name)
+          mapping[name]
+        end
+
+        private
+        @mapping = nil
+        def mapping
+          @mapping ||= File.open(css_path) do |css|
+            mapping = {}
+            names = []
+            css.each_line do |line|
+              case line
+              when /\A\.fa-(.+?):before/
+                names << Regexp.last_match[1]
+              when /\A\s*content:\s*\"\\(.+?)\"/
+                code_point = Integer(Regexp.last_match[1], 16)
+                character = [code_point].pack("U")
+                names.each do |name|
+                  mapping[name] = character
+                end
+                names.clear
+              when /\A}/
+                names.clear
+              end
+            end
+            mapping
+          end
+        end
+
+        def css_path
+          ENV["RABBIT_FONT_AWESOME_CSS"] ||
+            "/usr/share/fonts-font-awesome/css/font-awesome.css" # Debian
+        end
+      end
+
+      def initialize(*args)
+        super(*args)
+        @character = self.class[@text]
+        raise UnknownFontAwesomeNameError.new(@text) if @character.nil?
+      end
+
+      def markuped_text
+        "<span font_family=\"FontAwesome\">#{@character}</span>"
+      end
+    end
+
     class TextContainer
       include TextContainerElement
     end

data/lib/rabbit/error.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2004-2023  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
@@ -228,4 +228,12 @@ module Rabbit
       super(_("print isn't supported"))
     end
   end
+
+  class UnknownFontAwesomeNameError < Error
+    attr_reader :name
+    def initialize(name)
+      @name = name
+      super(_("unknown Font Awesome name: %s") % @name)
+    end
+  end
 end

data/lib/rabbit/frame.rb

@@ -1,9 +1,30 @@
+# Copyright (C) 2004-2024  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 "forwardable"
 require "rabbit/gtk"
 require "rexml/text"
 
 begin
-  require "vte3"
+  case ENV["RABBIT_GTK"]
+  when "4"
+    require "vte4"
+  else
+    require "vte3"
+  end
 rescue LoadError
 end
 
@@ -12,7 +33,6 @@ require "rabbit/utils"
 
 module Rabbit
   class Frame
-    include ScreenInfo
     extend Forwardable
 
     def_delegators(:@window, :icon, :icon=, :set_icon)

data/lib/rabbit/front.rb

@@ -229,7 +229,7 @@ module Rabbit
           send_arguments = [name.to_s.dump, *arg_list].join(', ')
           dirty_source = nil
           dirty_source = "dirty!" if need_clear_cache
-          if (level & PublicLevel::CONTROL).zero?
+          if (level & (PublicLevel::MOVE | PublicLevel::CONTROL)).zero?
             instance_eval(<<-EOS, __FILE__, __LINE__ + 1)
               def self.#{name}(#{arg_str})
                 result = @canvas.__send__(#{send_arguments})

data/lib/rabbit/gesture/handler.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2006-2024  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
@@ -93,13 +93,10 @@ module Rabbit
       end
 
       def draw(renderer)
-        if @back_color.alpha == 1.0 or
-            (@back_color.alpha < 1.0 and renderer.alpha_available?)
-          size = renderer.size
-          args = [true, 0, 0, size.real_width, size.real_height]
-          args << @back_color
-          renderer.draw_rectangle(*args)
-        end
+        size = renderer.size
+        renderer.draw_rectangle(true,
+                                0, 0, size.real_width, size.real_height,
+                                @back_color)
 
         draw_available_marks(renderer, next_available_motions)
 

data/lib/rabbit/gtk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2014-2024  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,4 +14,46 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "gtk3"
+case ENV["RABBIT_GTK"]
+when "4"
+  require "gtk4"
+else
+  require "gtk3"
+end
+
+Gtk.init if Gtk.respond_to?(:init)
+
+module Gtk
+  if const_defined?(:Action)
+    class Action
+      alias _activate activate
+      def activate(&block)
+        @block = block
+        _activate
+      ensure
+        @block = nil
+      end
+
+      def block_given?
+        not @block.nil?
+      end
+
+      def call(*args, &block)
+        @block.call(*args, &block)
+      end
+    end
+  end
+
+  unless const_defined?(:Native)
+    # For GTK 3
+    #
+    # GTK 4 renames Gdk::Window to Gdk::Surface
+    class Widget
+      def native
+        self
+      end
+
+      alias_method :surface, :window
+    end
+  end
+end

data/lib/rabbit/info-window.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2006-2023  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
@@ -230,7 +230,12 @@ module Rabbit
     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_background(area, context)
+        if rest_time and rest_time < 0
+          context.set_source_rgb(1, 0, 0)
+        else
+          context.set_source_rgb(0, 0, 0)
+        end
         draw_text_as_large_as_possible(area,
                                        context,
                                        timer_text,
@@ -242,6 +247,8 @@ module Rabbit
     def init_note_area
       @note_area = Gtk::DrawingArea.new
       @note_area.signal_connect("draw") do |area, context|
+        draw_background(area, context)
+        context.set_source_rgb(0, 0, 0)
         draw_text_as_large_as_possible(area, context, note_text)
         Gdk::Event::PROPAGATE
       end
@@ -253,6 +260,13 @@ module Rabbit
       adjust_slide
     end
 
+    def draw_background(area, context)
+      context.save do
+        context.set_source_rgb(1, 1, 1)
+        context.paint
+      end
+    end
+
     def note_text
       note = @canvas.current_slide["note"]
       return note if note.nil?

data/lib/rabbit/menu.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2024  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
@@ -92,7 +92,6 @@ module Rabbit
 
       @jump_to_merge_id = @merge.new_merge_id
       @jump_to_actions = Gtk::ActionGroup.new("JumpToActions")
-      @jump_to_actions_keeper = [] # Workaround for > Ruby/GTK2 0.16
       @merge.insert_action_group(@jump_to_actions, 0)
       jump_to_path = "/popup/JumpTo"
       jump_to_action = canvas.action("JumpTo")
@@ -100,7 +99,6 @@ module Rabbit
       canvas.slides.each_with_index do |slide, i|
         action = make_jump_to_action(jump_to_action, slide.title, i)
         @jump_to_actions.add_action(action)
-        @jump_to_actions_keeper << action # Workaround for > Ruby/GTK2 0.16
         @merge.add_ui(@jump_to_merge_id, jump_to_path, action.name,
                       action.name, :auto, false)
       end

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

@@ -27,6 +27,12 @@ module Rabbit
           require "charty"
           backend = prop["backend"]
           ::Charty::Backends.use(backend) if backend
+          font_family = prop["font-family"]
+          if font_family and backend == "pyplot"
+            default_font_family = ::Matplotlib.rcParams["font.sans-serif"]
+            ::Matplotlib.rcParams["font.sans-serif"] =
+              [font_family, *default_font_family]
+          end
           data = CSV.read(path, headers: true, converters: :all)
           type = prop["type"]
           case type
@@ -50,6 +56,9 @@ module Rabbit
           end
           image_file = Tempfile.new(["rabbit-image-charty", ".svg"])
           plotter.save(image_file.path)
+          if font_family and backend == "pyplot"
+            ::Matplotlib.rcParams["font.sans-serif"] = default_font_family
+          end
           image_file
         end
       end

data/lib/rabbit/parser/markdown/converter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-2024  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
@@ -170,10 +170,10 @@ module Rabbit
                     _("multiple ![alt]{image}s in a paragraph isn't supported.")
             end
             if child_types.include?(:img)
-              message =
+              format =
                 _("![alt]{image} and other contents in a paragraph " \
                   "isn't supported: %{types}")
-              raise ParseError, message % {types: child_types}
+              raise ParseError, format % {types: child_types}
             end
             if element.options[:transparent] and child_types == [:text]
               element.children.first.value.chomp!

data/lib/rabbit/parser/rd/ext/block-verbatim.rb

@@ -26,7 +26,6 @@ require "rabbit/parser/ext/aafigure"
 require "rabbit/parser/ext/blockdiag"
 require "rabbit/parser/ext/charty"
 require "rabbit/parser/ext/coderay"
-require "rabbit/parser/ext/emacs"
 require "rabbit/parser/ext/enscript"
 require "rabbit/parser/ext/rouge"
 require "rabbit/parser/ext/tex"
@@ -120,17 +119,6 @@ module Rabbit
             result || default_ext_block_verbatim(label, src, src, visitor)
           end
 
-          def ext_block_verb_emacs(label, source, content, visitor)
-            return nil unless /\Aemacs(?:\s+(.+))?\z/i =~ label
-            mode_line = $1
-
-            src, prop = parse_source(source)
-            logger = visitor.logger
-
-            result = Parser::Ext::Emacs.highlight(src, logger, mode_line)
-            result || default_ext_block_verbatim(label, src, src, visitor)
-          end
-
           def ext_block_verb_rt(label, source, content, visitor)
             return nil unless /\Art\z/i =~ label
             unless defined?(RT2RabbitVisitor)

data/lib/rabbit/parser/rd/ext/inline-verbatim.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2007-2023  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/utils'
 require 'rabbit/parser/ext/inline'
 require 'rabbit/parser/rd/ext/base'
@@ -88,6 +104,13 @@ module Rabbit
               CustomTag.new(name)
             end
           end
+
+          def ext_inline_verb_font_awesome(label, source, content, visitor)
+            label = label.to_s
+            return nil unless /\Afont-awesome:(.+?)\z/ =~ label
+            name = $1
+            FontAwesomeText.new(name)
+          end
         end
       end
     end

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

@@ -25,7 +25,6 @@ require "rabbit/parser/ext/tex"
 require "rabbit/parser/ext/aafigure"
 require "rabbit/parser/ext/blockdiag"
 require "rabbit/parser/ext/coderay"
-require "rabbit/parser/ext/emacs"
 require "rabbit/parser/ext/entity"
 require "rabbit/parser/ext/rouge"
 
@@ -530,11 +529,6 @@ module Rabbit
             Ext::CodeRay.highlight(lang, source, logger)
           end
 
-          def emacs(source, mode_line=nil)
-            logger = @output.canvas.logger
-            Ext::Emacs.highlight(source, logger, mode_line)
-          end
-
           def rouge(lang, source)
             logger = @output.canvas.logger
             Ext::Rouge.highlight(lang, source, logger)

data/lib/rabbit/parser.rb

@@ -14,12 +14,14 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/parser/image"
 require "rabbit/parser/markdown"
 require "rabbit/parser/pdf"
 require "rabbit/parser/rd"
 require "rabbit/parser/wiki"
 
+# Image is fallback
+require "rabbit/parser/image"
+
 module Rabbit
   module Parser
     include GetText