rabbit 3.0.4 → 4.0.0

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

@@ -1,5 +1,21 @@
-require 'rabbit/parser/rd/ext/base'
-require 'rabbit/parser/rd/ext/image'
+# Copyright (C) 2004-2025  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_relative "base"
+require_relative "image"
 
 module Rabbit
   module Parser

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

@@ -1,5 +1,22 @@
-require 'rabbit/element'
-require 'rabbit/parser/ext/video'
+# Copyright (C) 2012  Narihiro Nakamura <authornari@gmail.com>
+# Copyright (C) 2025  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_relative "../../../element"
+require_relative "../../ext/video"
 
 module Rabbit
   module Parser

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

@@ -1,12 +1,28 @@
+# Copyright (C) 2004-2025  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/element"
-require 'rabbit/parser/pause-support'
-require 'rabbit/parser/ext/escape'
-require 'rabbit/parser/rd/visitor'
-require "rabbit/parser/rd/ext/refer"
-require "rabbit/parser/rd/ext/inline-verbatim"
-require "rabbit/parser/rd/ext/block-verbatim"
+require_relative "../../element"
+require_relative "../pause-support"
+require_relative "../ext/escape"
+require_relative "visitor"
+require_relative "ext/refer"
+require_relative "ext/inline-verbatim"
+require_relative "ext/block-verbatim"
 
 module Rabbit
   module Parser
@@ -53,7 +69,7 @@ module Rabbit
           "block_verbatim" => Ext::BlockVerbatim,
         }
 
-        def_delegators(:@canvas, :logger, :full_path, :tmp_dir_name)
+        def_delegators(:@canvas, :full_path, :tmp_dir_name)
 
         attr_reader :canvas
         attr_reader :progress

data/lib/rabbit/parser/rd/rt/rt2rabbit-lib.rb

@@ -1,6 +1,22 @@
-require 'rt/rtparser'
+# Copyright (C) 2004-2025  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 "rt/rtparser"
+
+require_relative "../../../element"
 
 module Rabbit
 

data/lib/rabbit/parser/rd/visitor.rb

@@ -1,7 +1,23 @@
+# Copyright (C) 2004-2025  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 "rd/rdvisitor"
 require "rd/version"
 
-require 'rabbit/rabbit'
+require_relative "../../rabbit"
 
 module Rabbit
   module Parser
@@ -47,7 +63,7 @@ module Rabbit
 
         def fatal_on_extension_not_available(label, type)
           message = _("[BUG] [%s] %s extension isn't available.")
-          logger.fatal(message % [label, ext_type])
+          Rabbit.logger.fatal(message % [label, ext_type])
         end
       end
     end

data/lib/rabbit/parser/rd.rb

@@ -1,6 +1,22 @@
+# Copyright (C) 2004-2025  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 "rd/rdfmt"
 
-require "rabbit/parser/base"
+require_relative "base"
 
 module Rabbit
   module Parser
@@ -9,7 +25,7 @@ module Rabbit
   end
 end
 
-require "rabbit/parser/rd/rd2rabbit-lib"
+require_relative "rd/rd2rabbit-lib"
 
 module Rabbit
   module Parser

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2022  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2007-2025  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,19 +14,19 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
-require "rabbit/element"
-require "rabbit/parser/pause-support"
-require "rabbit/parser/ext/escape"
-require "rabbit/parser/ext/inline"
-require "rabbit/parser/ext/image"
-require "rabbit/parser/ext/enscript"
-require "rabbit/parser/ext/tex"
-require "rabbit/parser/ext/aafigure"
-require "rabbit/parser/ext/blockdiag"
-require "rabbit/parser/ext/coderay"
-require "rabbit/parser/ext/entity"
-require "rabbit/parser/ext/rouge"
+require_relative "../../gettext"
+require_relative "../../element"
+require_relative "../pause-support"
+require_relative "../ext/escape"
+require_relative "../ext/inline"
+require_relative "../ext/image"
+require_relative "../ext/enscript"
+require_relative "../ext/tex"
+require_relative "../ext/aafigure"
+require_relative "../ext/blockdiag"
+require_relative "../ext/coderay"
+require_relative "../ext/entity"
+require_relative "../ext/rouge"
 
 module Rabbit
   module Parser
@@ -102,7 +102,7 @@ module Rabbit
         end
 
         def hrule
-          @canvas.logger.warn(_("horizontal rule is unsupported")) if @parent
+          Rabbit.logger.warn(_("horizontal rule is unsupported")) if @parent
         end
 
         def list_begin
@@ -282,7 +282,7 @@ module Rabbit
           result = nil
 
           if lang
-            result = Ext::Rouge.highlight(lang, contents, @canvas.logger)
+            result = Ext::Rouge.highlight(lang, contents, {})
           end
 
           if result
@@ -352,7 +352,7 @@ module Rabbit
 
         private
         def unsupported_list_type(type)
-          @canvas.logger.warn(_("unsupported list type: %s") % type)
+          Rabbit.logger.warn(_("unsupported list type: %s") % type)
         end
 
         def evaluate_inline_plugin(src)
@@ -360,7 +360,7 @@ module Rabbit
         rescue ParseError
           raise
         rescue
-          @canvas.logger.warn($!)
+          Rabbit.logger.warn($!)
           nil
         end
 
@@ -369,7 +369,7 @@ module Rabbit
         rescue ParseError
           raise
         rescue
-          @canvas.logger.warn($!)
+          Rabbit.logger.warn($!)
           nil
         end
 
@@ -478,9 +478,8 @@ module Rabbit
           alias_method :img, :image
 
           def enscript(lang, source)
-            logger = @output.canvas.logger
-            if Ext::Enscript.check_availability(lang, logger)
-              Ext::Enscript.highlight(lang, source, logger)
+            if Ext::Enscript.check_availability(lang)
+              Ext::Enscript.highlight(lang, source)
             else
               nil
             end
@@ -490,7 +489,7 @@ module Rabbit
             args = [@output.canvas, source]
             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]
               [Ext::TeX.make_image_by_LaTeX(*args), props]
             end
           end
@@ -500,7 +499,7 @@ module Rabbit
             args = [@output.canvas, source]
             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]
               [Ext::TeX.make_image_by_mimeTeX(*args), props]
             end
           end
@@ -525,13 +524,11 @@ module Rabbit
           end
 
           def coderay(lang, source)
-            logger = @output.canvas.logger
-            Ext::CodeRay.highlight(lang, source, logger)
+            Ext::CodeRay.highlight(lang, source)
           end
 
           def rouge(lang, source)
-            logger = @output.canvas.logger
-            Ext::Rouge.highlight(lang, source, logger)
+            Ext::Rouge.highlight(lang, source, {})
           end
 
           def tag(name, value=nil)

data/lib/rabbit/parser/wiki.rb

@@ -1,6 +1,22 @@
+# Copyright (C) 2007-2025  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 "hikidoc"
 
-require "rabbit/parser/base"
+require_relative "base"
 
 module Rabbit
   module Parser
@@ -9,7 +25,7 @@ module Rabbit
   end
 end
 
-require "rabbit/parser/wiki/output"
+require_relative "wiki/output"
 
 module Rabbit
   module Parser

data/lib/rabbit/parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2017  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2007-2025  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,13 @@
 # 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"
+require_relative "parser/markdown"
+require_relative "parser/pdf"
+require_relative "parser/rd"
+require_relative "parser/wiki"
+
+# Image is fallback
+require_relative "parser/image"
 
 module Rabbit
   module Parser

data/lib/rabbit/path-manipulatable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  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,7 +17,7 @@
 require "fileutils"
 require "pathname"
 
-require "rabbit/gettext"
+require_relative "rabbit"
 
 module Rabbit
   module PathManipulatable
@@ -25,12 +25,12 @@ module Rabbit
 
     private
     def create_directory(path)
-      @logger.info(_("Creating directory: %s") % path)
+      Rabbit.logger.info(_("Creating directory: %s") % path)
       FileUtils.mkdir_p(path)
     end
 
     def create_file(path, &block)
-      @logger.info(_("Creating file:      %s") % path)
+      Rabbit.logger.info(_("Creating file:      %s") % path)
       File.open(path, "w", &block)
     end
   end

data/lib/rabbit/progress.rb

@@ -1,4 +1,20 @@
-require 'rabbit/gtk'
+# Copyright (C) 2004-2025  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_relative "gtk"
 
 module Rabbit
   class Progress

data/lib/rabbit/properties.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021  Sutou Kouhei <kou@cozmixng.org>
+# Copyright (C) 2020-2025  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,8 +14,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/relative-size"
-require "rabbit/yaml-loader"
+require_relative "relative-size"
+require_relative "yaml-loader"
 
 module Rabbit
   class Properties

data/lib/rabbit/rabbit.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-2025  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,19 +14,19 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/config"
+require_relative "config"
 
-require "rabbit/gettext"
-require "rabbit/version"
+require_relative "gettext"
+require_relative "version"
 
-require "rabbit/error"
-
-require "rabbit/gtk"
+require_relative "error"
+require_relative "logger"
 
 module Rabbit
   TMP_DIR_NAME = ".tmp"
 
   @@application = nil
+  @@logger = nil
   @@gui_init_procs = []
   @@cleanup_procs = []
 
@@ -36,5 +36,13 @@ module Rabbit
         Gtk::Application.new("org.rabbit-shocker.Rabbit",
                              [:non_unique, :handles_command_line])
     end
+
+    def logger
+      @@logger ||= Logger.default
+    end
+
+    def logger=(logger)
+      @@logger = logger
+    end
   end
 end

data/lib/rabbit/readme-parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-2025  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,18 +14,16 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-require "rabbit/gettext"
-require "rabbit/path-manipulatable"
+require_relative "gettext"
+require_relative "path-manipulatable"
 
 module Rabbit
   class READMEParser
     include GetText
     include PathManipulatable
 
-    attr_accessor :logger
     attr_reader :title, :description
-    def initialize(logger=nil)
-      @logger = logger || Logger.default
+    def initialize
       @title = nil
       @description = nil
     end