rabbit 3.0.2 → 3.0.4

data/lib/rabbit/source/base.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2024  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 'fileutils'
 require 'tmpdir'
 
@@ -35,7 +51,7 @@ module Rabbit
           @source = _read
           case @encoding
           when nil
-            enc = guess_encoding(@source)
+            enc = guess_encoding(@source) || Encoding::ASCII_8BIT
           when Encoding
             enc = @encoding
           else
@@ -128,15 +144,24 @@ module Rabbit
         end
       end
 
-      def guess_encoding(str)
-        return Encoding::UTF_8 if utf8_encoding?(str)
-
-        require 'nkf'
-        NKF.guess(str)
-      end
-
-      def utf8_encoding?(string)
-        string.dup.force_encoding(Encoding::UTF_8).valid_encoding?
+      def guess_encoding(string)
+        string = string.dup
+        candidates = [
+          Encoding::UTF_8,
+          Encoding::EUCJP_MS,
+          Encoding::EUCJP,
+          Encoding::WINDOWS_31J,
+          Encoding::Shift_JIS,
+          Encoding::CP51932,
+          Encoding::CP50221,
+          Encoding::ISO2022_JP,
+          Encoding::UTF_16BE,
+          Encoding::UTF_16LE,
+        ]
+        candidates.find do |candidate|
+          next if candidate.dummy?
+          string.force_encoding(candidate).valid_encoding?
+        end
       end
 
       def extract_extension(path)

data/lib/rabbit/source/file.rb

@@ -1,3 +1,19 @@
+# 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 'rabbit/source/base'
 
 module Rabbit
@@ -25,7 +41,7 @@ module Rabbit
         rescue SourceUnreadableError
           @logger.error($!.message)
           @mtime = Time.now + LimitAccessInterval::MINIMUM_ACCESS_TIME
-          ""
+          +""
         end
       end
 

data/lib/rabbit/source/uri.rb

@@ -1,3 +1,19 @@
+# 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 "uri"
 require "open-uri"
 
@@ -52,7 +68,7 @@ module Rabbit
         rescue
           @logger.error($!.message)
           @last_modified = Time.now + MINIMUM_ACCESS_TIME
-          ""
+          +""
         end
       end
 

data/lib/rabbit/theme/dark-gradation/dark-gradation.rb

@@ -9,7 +9,7 @@
 @monospace_font = "Monospace"
 @monospace_font_family = find_font_family(@monospace_font)
 #-------------------------
-# forground color
+# foreground color
 #-------------------------
 @default_foreground = "#ffeeee"
 set_foreground(@default_foreground)
@@ -94,7 +94,7 @@ set_foreground(@default_foreground)
 @block_quote_close_quote_image = nil
 @block_quote_image_max_width = canvas.width * 0.1
 #-------------------------
-# include defaul theme!
+# include default theme!
 #-------------------------
 include_theme("default")
 #-------------------------

data/lib/rabbit/theme/default-comment/default-comment.rb

@@ -1,9 +1,5 @@
 if canvas.comment_theme
   include_theme(canvas.comment_theme)
 else
-  if display? and canvas.renderer.widget.class.name == "Clutter::GtkEmbed"
-    include_theme("clutter-comment")
-  else
-    include_theme("footer-comment")
-  end
+  include_theme("footer-comment")
 end

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

@@ -44,7 +44,7 @@
   "@image_slide_number_flag_type" => {
     :default => "'rectangle'",
     :description => N_("Form of the start and goal flags. " \
-                       "Avaiable forms are (({'triangle'})) and " \
+                       "Available forms are (({'triangle'})) and " \
                        "(({'rectangle'})).")
   },
   "@image_slide_number_start_image" => {

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

@@ -1,5 +1,5 @@
 @title_background_image_properties ||= {}
-default_title_backgroud_image_properties = {
+default_title_background_image_properties = {
   "as_large_as_possible" => true,
   "align" => "center",
   "assign_box" => false,
@@ -8,7 +8,7 @@ default_title_backgroud_image_properties = {
 
 match(TitleSlide) do |slides|
   slides.each do |slide|
-    image_properties = default_title_backgroud_image_properties.dup
+    image_properties = default_title_background_image_properties.dup
     @title_background_image_properties.each do |key, value|
       value = value.to_s if value.is_a?(Symbol)
       image_properties[key.to_s.gsub(/-/, "_")] = value

data/lib/rabbit/trackball.rb

@@ -75,31 +75,31 @@ module Rabbit
         range = [size, other.size].min unless range
         (0...range).inject(Vector.new){|ret, i| ret << self[i] - other[i]}
       end
-      
+
       def vcross(other)
         dst = Vector.new
         dst << (self[1] * other[2]) - (self[2] * other[1])
         dst << (self[2] * other[0]) - (self[0] * other[2])
         dst << (self[0] * other[1]) - (self[1] * other[0])
       end
-      
+
       def vlength
         Math.sqrt(inject(0){|ret, i| ret + i ** 2})
       end
-      
+
       def vscale(div); collect{|v| v *= div}; end
       def vnormal; vscale(1.0 / vlength); end
-      
+
       def vdot(other, range = nil)
         range = [size, other.size].min unless range
         (0...range).inject(0.0){|ret, i| ret + self[i] * other[i]}
       end
-      
+
       def vadd(other, range = nil)
         range = [size, other.size].min unless range
         (0...range).inject(Vector.new){|ret, i| ret << self[i] + other[i]}
       end
-      
+
       #
       # Quaternions always obey:  a^2 + b^2 + c^2 + d^2 = 1.0
       # If they don't add up to 1.0, dividing by their magnitued will
@@ -115,7 +115,7 @@ module Rabbit
       def normalize_quat
         collect{|q| q = q / inject(0){|ret, i| ret + i ** 2}}
       end
-      
+
       # Build a rotation matrix, given a quaternion rotation.
       def build_rotmatrix
         m = []
@@ -131,7 +131,7 @@ module Rabbit
         m << [0.0, 0.0, 0.0, 1.0]
         m
       end
-      
+
       # Given an axis and angle, compute quaternion.
       def axis_to_quat(phi)
         b, c, d = self.vnormal.vscale(Math.sin(phi/2.0))
@@ -143,7 +143,7 @@ module Rabbit
       end
     end
 
-    # 
+    #
     # This size should really be based on the distance from the center of
     # rotation to the point on the object underneath the mouse.  That
     # point would then track the mouse as closely as possible.  This is a
@@ -157,7 +157,7 @@ module Rabbit
       if (p1x == p2x && p1y == p2y)
         return Vector.new([0.0, 0.0, 0.0, 1.0])
       end
-    
+
       # First, figure out z-coordinates for projection of P1 and P2 to
       # deformed sphere
       p1 = Vector.new([p1x, p1y, tb_project_to_sphere(SIZE, p1x, p1y)])
@@ -165,19 +165,19 @@ module Rabbit
 
       # Now, we want the cross product of P1 and P2
       a = p2.vcross(p1)
-      
+
       # Figure out how much to rotate around that axis.
       d = p1.vsub(p2)
       t = d.vlength / (2.0 * SIZE)
-      
+
       # Avoid problems with out-of-control values...
       t = 1.0 if (t > 1.0)
       t = -1.0 if (t < -1.0)
       phi = 2.0 * Math.asin(t)
-      
+
       a.axis_to_quat(phi)
     end
-    
+
     #
     # Project an x,y pair onto a sphere of radius r OR a hyperbolic sheet
     # if we are away from the center of the sphere.
@@ -192,20 +192,20 @@ module Rabbit
       end
       z
     end
-    
+
     #
     # Given two rotations, e2 and e2, expressed as quaternion rotations,
     # figure out the equivalent single rotation and stuff it into dest.
-    # 
+    #
     # This routine also normalizes the result every RENORM_COUNT times it is
     # called, to keep error from creeping in.
-    # 
+    #
     # NOTE: This routine is written so that q1 or q2 may be the same
     # as dest (or each other).
     #
-    
+
     RENORM_COUNT = 97
-    
+
     @@quats_count = 0
     def add_quats(q1, q2)
       t1 = q1.vscale(q2[3])
@@ -213,9 +213,9 @@ module Rabbit
       t3 = q2.vcross(q1)
       tf = t1.vadd(t2)
       tf = t3.vadd(tf)
-      
+
       tf[3] = q1[3] * q2[3] - q1.vdot(q2, 3)
-      
+
       @@quats_count += 1
       ret = tf
       if (@@quats_count > RENORM_COUNT)

data/lib/rabbit/utils.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
@@ -15,7 +15,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 require 'tempfile'
-require 'nkf'
 
 module Rabbit
   module Utils
@@ -385,45 +384,6 @@ module Rabbit
     end
   end
 
-  module ScreenInfo
-    module_function
-    def default_screen
-      Gdk::Screen.default
-    end
-
-    def screen_width
-      default_screen.width
-    end
-
-    def screen_width_mm
-      default_screen.width_mm
-    end
-
-    def screen_height
-      default_screen.height
-    end
-
-    def screen_height_mm
-      default_screen.height_mm
-    end
-
-    def screen_x_resolution
-      screen_width / mm_to_inch(screen_width_mm)
-    end
-
-    def screen_y_resolution
-      screen_height / mm_to_inch(screen_height_mm)
-    end
-
-    def screen_depth
-      default_screen.system_visual.depth
-    end
-
-    def mm_to_inch(mm)
-      mm / 25.4
-    end
-  end
-
   module HTML
     module_function
     def a_link(start_a, label, label_only)
@@ -491,19 +451,19 @@ module Rabbit
     end
 
     def to_utf8(str)
-      NKF.nkf("-w", str)
+      str.encode(Encoding::UTF_8)
     end
 
     def to_eucjp(str)
-      NKF.nkf("-e", str)
+      str.encode(Encoding::EUCJP)
     end
 
     def to_utf8_from_eucjp(str)
-      NKF.nkf("-wE", str)
+      str.encode(Encoding::UTF_8, Encoding::EUCJP)
     end
 
     def to_eucjp_from_utf8(str)
-      NKF.nkf("-eW", str)
+      str.encode(Encoding::EUCJP, Encoding::UTF_8)
     end
   end
 

data/lib/rabbit/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2012-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
@@ -15,5 +15,5 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Rabbit
-  VERSION = "3.0.2"
+  VERSION = "3.0.4"
 end

data/lib/rabbit/video-window.rb

@@ -15,8 +15,12 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "clutter-gtk"
-require "clutter-gst"
+case ENV["RABBIT_GTK"]
+when "4"
+else
+  require "clutter-gtk"
+  require "clutter-gst"
+end
 
 require "rabbit/gtk"
 

data/po/en/rabbit.edit.po

@@ -392,11 +392,11 @@ msgstr ""
 msgid "Failed to write author configuration: %s: %s"
 msgstr ""
 
-#: ../lib/rabbit/canvas.rb:646
+#: ../lib/rabbit/canvas.rb:637
 msgid "Unknown action: %s"
 msgstr ""
 
-#: ../lib/rabbit/canvas.rb:741
+#: ../lib/rabbit/canvas.rb:733
 msgid "Processing..."
 msgstr ""
 
@@ -493,7 +493,7 @@ msgid "Tags of the new slide"
 msgstr ""
 
 #: ../lib/rabbit/command/rabbit-slide.rb:192
-msgid "Allotted time in presentaion"
+msgid "Allotted time in presentation"
 msgstr ""
 
 #: ../lib/rabbit/command/rabbit-slide.rb:199
@@ -949,7 +949,7 @@ msgstr ""
 msgid "(%s)"
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:550 ../lib/rabbit/theme/clutter-comment/property.rb:1 ../lib/rabbit/theme/footer-comment/property.rb:1 ../lib/rabbit/theme/stream-comment/property.rb:1
+#: ../lib/rabbit/command/rabbit.rb:550 ../lib/rabbit/theme/footer-comment/property.rb:1 ../lib/rabbit/theme/stream-comment/property.rb:1
 msgid "Comment"
 msgstr ""
 
@@ -1021,7 +1021,7 @@ msgstr ""
 msgid "port <%s> for XML-RPC is in use."
 msgstr ""
 
-#: ../lib/rabbit/command/rabbit.rb:858
+#: ../lib/rabbit/command/rabbit.rb:859
 msgid "Window ID: %d"
 msgstr ""
 
@@ -1137,6 +1137,10 @@ msgstr ""
 msgid "print isn't supported"
 msgstr ""
 
+#: ../lib/rabbit/error.rb:236
+msgid "unknown Font Awesome name: %s"
+msgstr ""
+
 #: ../lib/rabbit/gem-finder.rb:46
 msgid "Installing gem: %s"
 msgstr ""
@@ -1173,7 +1177,7 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: ../lib/rabbit/image/mermaid.rb:57
+#: ../lib/rabbit/image/mermaid.rb:58
 msgid "tried mermaid command: %s"
 msgstr ""
 
@@ -1189,7 +1193,7 @@ msgstr ""
 msgid "%s: Information window"
 msgstr ""
 
-#: ../lib/rabbit/info-window.rb:323
+#: ../lib/rabbit/info-window.rb:337
 msgid "unlimited"
 msgstr ""
 
@@ -1241,10 +1245,6 @@ msgstr ""
 msgid "tried blockdiag command: %s"
 msgstr ""
 
-#: ../lib/rabbit/parser/ext/emacs.rb:94
-msgid "emacs: unsupported element name: %s"
-msgstr ""
-
 #: ../lib/rabbit/parser/ext/enscript.rb:30
 msgid "enscript: unsupported language: %s"
 msgstr ""
@@ -1269,11 +1269,11 @@ msgstr ""
 msgid "![alt]{image} and other contents in a paragraph isn't supported: %{types}"
 msgstr ""
 
-#: ../lib/rabbit/parser/markdown/converter.rb:300 ../test/parser/test-markdown.rb:304
+#: ../lib/rabbit/parser/markdown/converter.rb:300
 msgid "horizontal rule isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/markdown/converter.rb:418 ../test/parser/test-markdown.rb:317
+#: ../lib/rabbit/parser/markdown/converter.rb:418
 msgid "tag name is missing."
 msgstr ""
 
@@ -1281,7 +1281,7 @@ msgstr ""
 msgid "HTML isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:137
+#: ../lib/rabbit/parser/rd/ext/block-verbatim.rb:125
 msgid "RTtool isn't available"
 msgstr ""
 
@@ -1289,19 +1289,19 @@ msgstr ""
 msgid "[BUG] [%s] %s extension isn't available."
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:106
+#: ../lib/rabbit/parser/wiki/output.rb:105
 msgid "horizontal rule is unsupported"
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:356
+#: ../lib/rabbit/parser/wiki/output.rb:355
 msgid "unsupported list type: %s"
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:389 ../test/parser/test-wiki.rb:44
+#: ../lib/rabbit/parser/wiki/output.rb:388
 msgid "inline {{image(...)}} isn't supported."
 msgstr ""
 
-#: ../lib/rabbit/parser/wiki/output.rb:465 ../test/parser/test-wiki.rb:64
+#: ../lib/rabbit/parser/wiki/output.rb:464
 msgid "multiple {{image(..., :align => :right)}} isn't supported."
 msgstr ""
 
@@ -1317,11 +1317,11 @@ msgstr ""
 msgid "No README found"
 msgstr ""
 
-#: ../lib/rabbit/renderer/base.rb:357
+#: ../lib/rabbit/renderer/base.rb:354
 msgid "%s does not support: %s"
 msgstr ""
 
-#: ../lib/rabbit/renderer/printer.rb:223
+#: ../lib/rabbit/renderer/printer.rb:217
 msgid "can't find printer for %s"
 msgstr ""
 
@@ -1333,11 +1333,11 @@ msgstr ""
 msgid "Failed to write slide configuration: %s: %s"
 msgstr ""
 
-#: ../lib/rabbit/source/argf.rb:10
+#: ../lib/rabbit/source/argf.rb:26
 msgid "none (get from STDIN) or [FILE_NAMES]"
 msgstr ""
 
-#: ../lib/rabbit/source/file.rb:9
+#: ../lib/rabbit/source/file.rb:25
 msgid "[FILENAME]"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "[FILENAME_OR_NOT]"
 msgstr ""
 
-#: ../lib/rabbit/source/uri.rb:27
+#: ../lib/rabbit/source/uri.rb:43
 msgid "URI"
 msgstr ""
 
@@ -1489,14 +1489,6 @@ msgstr ""
 msgid "Whether uninstalling this toolkit or not. This option is useful for cases you do not want to make the toolkit work for certain slides."
 msgstr ""
 
-#: ../lib/rabbit/theme/clutter-comment/property.rb:2
-msgid "Clutter Comment"
-msgstr ""
-
-#: ../lib/rabbit/theme/clutter-comment/property.rb:3
-msgid "Show comment as a rolling Clutter actor."
-msgstr ""
-
 #: ../lib/rabbit/theme/color-circle-block-quote/property.rb:2
 msgid "Color Circle block quote"
 msgstr ""
@@ -1961,7 +1953,7 @@ msgid "Color of numbers displayed on the start and goal flags."
 msgstr ""
 
 #: ../lib/rabbit/theme/image-slide-number/property.rb:46
-msgid "Form of the start and goal flags. Avaiable forms are (({'triangle'})) and (({'rectangle'}))."
+msgid "Form of the start and goal flags. Available forms are (({'triangle'})) and (({'rectangle'}))."
 msgstr ""
 
 #: ../lib/rabbit/theme/image-slide-number/property.rb:52
@@ -2100,15 +2092,11 @@ msgid "Newline in Slides"
 msgstr ""
 
 #: ../lib/rabbit/theme/newline-in-slides/property.rb:3 ../lib/rabbit/theme/newline-in-title/property.rb:3
-msgid ""
-"Convenience '\n"
-"' newline notation."
+msgid "Convenience '\\n' newline notation."
 msgstr ""
 
 #: ../lib/rabbit/theme/newline-in-slides/property.rb:4
-msgid ""
-"Enable '\n"
-"' notation to insert newline in all slides."
+msgid "Enable '\\n' notation to insert newline in all slides."
 msgstr ""
 
 #: ../lib/rabbit/theme/newline-in-title/property.rb:2
@@ -2116,9 +2104,7 @@ msgid "Newline in Title"
 msgstr ""
 
 #: ../lib/rabbit/theme/newline-in-title/property.rb:4
-msgid ""
-"Enable '\n"
-"' notation to insert newline in title."
+msgid "Enable '\\n' notation to insert newline in title."
 msgstr ""
 
 #: ../lib/rabbit/theme/night-black/property.rb:2
@@ -2678,7 +2664,3 @@ msgstr ""
 #: ../lib/rabbit/theme/title-slide-background-image/property.rb:2
 msgid "TitleSlideBackgroundImage"
 msgstr ""
-
-#: ../test/parser/test-markdown.rb:290
-msgid "![alt]{image} and other contents in a paragraph isn't supported: [:text, :img]"
-msgstr ""