rabbit 3.0.0 → 3.0.2

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2018  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
@@ -27,31 +27,58 @@ module Rabbit
     module Ext
       module Image
         module_function
-        def make_image(canvas, uri_str, prop={})
+        def make_image(canvas, uri_str, prop={}, body: nil)
           path = Private.uri_string_to_image_filename(canvas, uri_str)
           begin
-            Element::Image.new(path, prop)
+            image = Element::Image.new(path, prop, canvas: canvas)
           rescue Error
             canvas.logger.warn($!.message)
             nil
+          else
+            if prop["align"] == "right" and body
+              if body["background-image"]
+                raise ParseError,
+                      _("multiple right aligns aren't supported.")
+              end
+              prop.each do |name, value|
+                name = name.gsub(/_/, "-")
+                next if name == "src"
+                property_name = "background-image-#{name}"
+                body[property_name] = value
+              end
+              body["background-image"] = uri_str
+              :no_element
+            else
+              image
+            end
           end
         end
 
-        def make_image_from_file(canvas, source)
-          src_file = Tempfile.new("rabbit-image-source")
+        def make_image_from_file(canvas, source, extension: nil, **options)
+          src_basename = "rabbit-image-source"
+          src_basename = [src_basename, extension] if extension
+          src_file = Tempfile.new(src_basename)
           src_file.open
           src_file.print(source)
           src_file.close
           image_file = prop = nil
           begin
-            image_file, prop = yield(src_file.path)
+            image_file, prop = yield(src_file)
           rescue ImageLoadError
             canvas.logger.warn($!.message)
           end
           return nil if image_file.nil?
-          image = make_image(canvas, %Q[file://#{image_file.path}], prop)
-          return nil if image.nil?
-          image["_src"] = image_file # for protecting from GC
+          image = make_image(canvas,
+                             "file://#{image_file.path}",
+                             prop,
+                             **options)
+          # Protect image from GC
+          case image
+          when Element::Image
+            image["_src"] = image_file
+          when :no_element
+            options[:body]["_background-image-src"] = image_file
+          end
           image
         end
 
@@ -108,8 +135,9 @@ module Rabbit
           end
 
           def setup_image_file(canvas, uri, filename)
+            return if File.exist?(filename)
             begin
-              open(uri, "rb") do |in_file|
+              URI.open(uri, "rb") do |in_file|
                 File.open(filename, "wb") do |out|
                   out.print(in_file.read)
                 end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2017  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
@@ -20,8 +20,8 @@ require "rabbit/gettext"
 require "rabbit/parser/pause-support"
 require "rabbit/parser/ext/blockdiag"
 require "rabbit/parser/ext/escape"
-require "rabbit/parser/ext/inline"
 require "rabbit/parser/ext/image"
+require "rabbit/parser/ext/inline"
 require "rabbit/parser/ext/rouge"
 require "rabbit/parser/ext/tex"
 
@@ -165,9 +165,15 @@ module Rabbit
           if child_types == [:img]
             convert_container(element)[0]
           else
-            if child_types.include?(:img)
+            if child_types.count(:img) > 1
               raise ParseError,
-                      _("multiple ![alt]{image} in a paragraph isn't supported.")
+                    _("multiple ![alt]{image}s in a paragraph isn't supported.")
+            end
+            if child_types.include?(:img)
+              message =
+                _("![alt]{image} and other contents in a paragraph " \
+                  "isn't supported: %{types}")
+              raise ParseError, message % {types: child_types}
             end
             if element.options[:transparent] and child_types == [:text]
               element.children.first.value.chomp!
@@ -325,12 +331,14 @@ module Rabbit
         def convert_codeblock_language(element, language, content)
           case language
           when "blockdiag"
-            args = [@canvas, content]
-            Ext::Image.make_image_from_file(*args) do |src_file_path|
-              [
-                Ext::BlockDiag.make_image(src_file_path, element.attr, @canvas),
-                element.attr,
-              ]
+            make_image_from_file(element, content) do |src_file, prop|
+              Ext::BlockDiag.make_image(src_file.path, prop, @canvas)
+            end
+          when "mermaid"
+            make_image_from_file(element,
+                                 content,
+                                 extension: ".mmd") do |src_file, prop|
+              src_file
             end
           else
             logger = @canvas.logger
@@ -349,23 +357,11 @@ module Rabbit
           alt = options.delete("alt")
           caption = title || alt
           options["caption"] ||= caption if caption
-          if options["align"] == "right"
-            body = @slides.last.body
-            if body["background-image"]
-              raise ParseError,
-                    _("multiple ![]('XXX.png'){:align='right'} " + \
-                      "isn't supported.")
-            end
-            body["background-image"] = uri
-            options.each do |name, value|
-              name = name.to_s.gsub(/_/, "-")
-              body["background-image-#{name}"] = value
-            end
-            :no_element
-          else
-            image = Ext::Image.make_image(@canvas, uri, options)
-            image || text(alt || src)
-          end
+          image = Ext::Image.make_image(@canvas,
+                                        uri,
+                                        options,
+                                        body: @slides.last.body)
+          image || text(alt || src)
         end
 
         def convert_em(element)
@@ -376,10 +372,20 @@ module Rabbit
           Emphasis.new(Emphasis.new(convert_container(element)))
         end
 
+        def make_image_from_file(element, source, **options)
+          Ext::Image.make_image_from_file(@canvas,
+                                          source,
+                                          body: @slides.last.body,
+                                          **options) do |src_file|
+            prop = element.attr
+            image = yield(src_file, prop)
+            [image, prop]
+          end
+        end
+
         def convert_math(element)
-          args = [@canvas, element.value]
-          Ext::Image.make_image_from_file(*args) do |src_file_path|
-            [Ext::TeX.make_image_by_LaTeX(src_file_path, {}, @canvas), {}]
+          make_image_from_file(element, element.value) do |src_file, prop|
+            Ext::TeX.make_image_by_LaTeX(src_file.path, prop, @canvas)
           end
         end
 

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2017  Kouhei Sutou <kou@cozmixng.org>
+# 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
@@ -22,13 +22,14 @@ require "rabbit/parser/rd/rt/rt2rabbit-lib"
 require "rabbit/parser/rd/ext/base"
 require "rabbit/parser/rd/ext/image"
 require "rabbit/parser/rd/ext/video"
-require "rabbit/parser/ext/enscript"
-require "rabbit/parser/ext/tex"
 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"
 
 module Rabbit
   module Parser
@@ -54,26 +55,7 @@ module Rabbit
             return nil unless /\A(?:image|img)\z/i =~ label
             src, prop = parse_source(source)
             return nil if prop["src"].nil?
-
-            if prop["align"] == "right"
-              body = visitor.current_body
-              if body["background-image"]
-                raise ParseError,
-                      _("multiple 'align = right' isn't supported.")
-              end
-              prop.each do |name, value|
-                name = name.gsub(/_/, "-")
-                if name == "src"
-                  property_name = "background-image"
-                else
-                  property_name = "background-image-#{name}"
-                end
-                body[property_name] = value
-              end
-              :no_element
-            else
-              make_image(visitor, prop["src"], prop)
-            end
+            make_image(visitor, prop["src"], prop, body: visitor.current_body)
           end
 
           def ext_block_verb_video(label, source, content, visitor)
@@ -86,7 +68,7 @@ module Rabbit
 
           def ext_block_verb_enscript(label, source, content, visitor)
             return nil unless /\Aenscript (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -100,36 +82,36 @@ module Rabbit
 
           def ext_block_verb_LaTeX(label, source, content, visitor)
             return nil unless /\ALaTeX\z/i =~ label
-            make_image_from_file(source, visitor) do |src_file_path, prop|
-              Parser::Ext::TeX.make_image_by_LaTeX(src_file_path, prop, visitor)
+            make_image_from_file(source, visitor) do |src_file, prop|
+              Parser::Ext::TeX.make_image_by_LaTeX(src_file.path, prop, visitor)
             end
           end
 
           def ext_block_verb_mimeTeX(label, source, content, visitor)
             return nil unless /\AmimeTeX\z/i =~ label
-            make_image_from_file(source, visitor) do |src_file_path, prop|
-              Parser::Ext::TeX.make_image_by_mimeTeX(src_file_path, prop,
+            make_image_from_file(source, visitor) do |src_file, prop|
+              Parser::Ext::TeX.make_image_by_mimeTeX(src_file.path, prop,
                                                      visitor)
             end
           end
 
           def ext_block_verb_aafigure(label, source, content, visitor)
             return nil unless /\Aaafigure\z/i =~ label
-            make_image_from_file(source, visitor) do |src_file_path, prop|
-              Parser::Ext::AAFigure.make_image(src_file_path, prop, visitor)
+            make_image_from_file(source, visitor) do |src_file, prop|
+              Parser::Ext::AAFigure.make_image(src_file.path, prop, visitor)
             end
           end
 
           def ext_block_verb_blockdiag(label, source, content, visitor)
             return nil unless /\Ablockdiag\z/i =~ label
-            make_image_from_file(source, visitor) do |src_file_path, prop|
-              Parser::Ext::BlockDiag.make_image(src_file_path, prop, visitor)
+            make_image_from_file(source, visitor) do |src_file, prop|
+              Parser::Ext::BlockDiag.make_image(src_file.path, prop, visitor)
             end
           end
 
           def ext_block_verb_coderay(label, source, content, visitor)
             return nil unless /\Acoderay (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -140,7 +122,7 @@ module Rabbit
 
           def ext_block_verb_emacs(label, source, content, visitor)
             return nil unless /\Aemacs(?:\s+(.+))?\z/i =~ label
-            mode_line = $1.untaint
+            mode_line = $1
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -193,7 +175,7 @@ module Rabbit
 
           def ext_block_verb_rouge(label, source, content, visitor)
             return nil unless /\Arouge (\w+)\z/i =~ label
-            lang = $1.downcase.untaint
+            lang = $1.downcase
 
             src, prop = parse_source(source)
             logger = visitor.logger
@@ -201,6 +183,22 @@ module Rabbit
             result = Parser::Ext::Rouge.highlight(lang, src, logger)
             result || default_ext_block_verbatim(label, src, src, visitor)
           end
+
+          def ext_block_verb_charty(label, source, content, visitor)
+            return nil unless /\Acharty\z/i =~ label
+            make_image_from_file(source, visitor) do |src_file, prop|
+              Parser::Ext::Charty.make_image(src_file.path, prop, visitor)
+            end
+          end
+
+          def ext_block_verb_mermaid(label, source, content, visitor)
+            return nil unless /\Amermaid\z/i =~ label
+            make_image_from_file(source,
+                                 visitor,
+                                 extension: ".mmd") do |src_file, prop|
+              src_file
+            end
+          end
         end
       end
     end

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/progress.rb

@@ -92,7 +92,7 @@ trough {
       provider = Gtk::CssProvider.new
       provider.load(:data => css)
       @bar.style_context.add_provider(provider,
-                                        Gtk::StyleProvider::PRIORITY_USER)
+                                      Gtk::StyleProvider::PRIORITY_USER)
     end
   end
 end

data/lib/rabbit/properties.rb

@@ -0,0 +1,154 @@
+# 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
+# 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/relative-size"
+require "rabbit/yaml-loader"
+
+module Rabbit
+  class Properties
+    include Enumerable
+
+    def initialize(data)
+      @data = normalize(data)
+    end
+
+    def [](key)
+      @data[normalize_key(key)]
+    end
+
+    def []=(key, value)
+      @data[normalize_key(key)] = value
+    end
+
+    def each(&block)
+      @data.each(&block)
+    end
+
+    def get_boolean(key, default=nil)
+      value = self[key]
+      return default if value.nil?
+      true_value?(value)
+    end
+
+    def get_integer(key, default=nil)
+      integer_value(self[key] || default)
+    end
+
+    def get_float(key, default=nil)
+      float_value(self[key] || default)
+    end
+
+    def get_size(key, filename, default=nil)
+      size_value(self[key] || default, filename, key)
+    end
+
+    def get_relative_size(key, filename, default=nil)
+      relative_size_value(self[key] || default,
+                          filename,
+                          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
+
+    def method_missing(name, *args, &block)
+      case args.size
+      when 0
+        key = name.to_s
+        if key.end_with?("?")
+          key = key[0..-2]
+          is_predict = true
+        else
+          is_predict = false
+        end
+        key = normalize_key(key)
+        return super unless @data.key?(key)
+        value = @data[key]
+        if is_predict
+          true_value?(value)
+        else
+          value
+        end
+      when 1
+        key = name.to_s
+        return super unless key.end_with?("=")
+        key = key[0..-2]
+        @data[normalize_key(key)] = args[0]
+      else
+        super
+      end
+    end
+
+    private
+    def normalize(data)
+      normalized_data = {}
+      (data || {}).each do |key, value|
+        normalized_data[normalize_key(key)] = value
+      end
+      normalized_data
+    end
+
+    def normalize_key(key)
+      key.to_s.gsub(/-/, "_")
+    end
+
+    def true_value?(value)
+      value == true or value == "true"
+    end
+
+    def integer_value(value)
+      return nil if value.nil?
+      Integer(value, 10)
+    end
+
+    def float_value(value)
+      return nil if value.nil?
+      Float(value)
+    end
+
+    def size_value(value, filename, name)
+      return nil if value.nil?
+      begin
+        Integer(value, 10)
+      rescue ArgumentError
+        raise InvalidSizeError.new(filename, name, value)
+      end
+    end
+
+    def relative_size_value(value, filename, name)
+      return nil if value.nil?
+      begin
+        value = Float(value)
+      rescue ArgumentError
+        raise InvalidSizeError.new(filename, name, value)
+      end
+      RelativeSize.new(value)
+    end
+  end
+end

data/lib/rabbit/rabbit.rb

@@ -32,7 +32,9 @@ module Rabbit
 
   class << self
     def application
-      @@application ||= Gtk::Application.new(nil, :handles_command_line)
+      @@application ||=
+        Gtk::Application.new("org.rabbit-shocker.Rabbit",
+                             [:non_unique, :handles_command_line])
     end
   end
 end

data/lib/rabbit/relative-size.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 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
+# 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.
+
+module Rabbit
+  class RelativeSize
+    def initialize(size)
+      @size = size
+    end
+
+    def resolve(base_size)
+      return nil if base_size.nil?
+      ((@size / 100.0) * base_size).ceil
+    end
+  end
+end