rabbit 2.2.1 → 3.0.0

data/lib/rabbit/logger/stderr.rb

@@ -21,7 +21,7 @@ module Rabbit
         $stderr.puts(format_severity(severity))
         $stderr.print("[#{prog_name}]: ") if prog_name
         $stderr.puts(message)
-        exit if severity >= Severity::FATAL
+        exit(false) if severity >= Severity::FATAL
       end
     end
   end

data/lib/rabbit/pango-markup.rb

@@ -0,0 +1,44 @@
+# Copyright (C) 2018  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 "cgi/util"
+
+module Rabbit
+  class PangoMarkup
+    def initialize(name, attributes, content=nil)
+      @name = name
+      @attributes = attributes
+      @content = content
+    end
+
+    def to_s
+      tag = "<#{@name}"
+      @attributes.each do |name, value|
+        next if value.nil?
+        formatter_name = Utils.to_class_name(name)
+        if Format.const_defined?(formatter_name)
+          formatter = Format.const_get(formatter_name).new(value)
+          value = formatter.pango_value
+        end
+        tag << " #{CGI.escapeHTML(name.to_s)}='#{CGI.escapeHTML(value.to_s)}'"
+      end
+      tag << ">"
+      tag << @content.to_s if @content
+      tag << "</#{@name}>"
+      tag
+    end
+  end
+end

data/lib/rabbit/parser.rb

@@ -1,7 +1,24 @@
-require "rabbit/utils"
+# Copyright (C) 2007-2017  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.
 
-dir = File.join("rabbit", "parser")
-Rabbit::Utils.require_files_under_directory_in_load_path(dir)
+require "rabbit/parser/image"
+require "rabbit/parser/markdown"
+require "rabbit/parser/pdf"
+require "rabbit/parser/rd"
+require "rabbit/parser/wiki"
 
 module Rabbit
   module Parser

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

@@ -1,9 +1,26 @@
-require 'uri'
-require 'cgi'
-require 'open-uri'
-require 'fileutils'
+# Copyright (C) 2007-2018  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 'rabbit/element'
+require "uri"
+require "cgi"
+require "open-uri"
+require "fileutils"
+
+require "rabbit/element"
+require "rabbit/filename"
 
 module Rabbit
   module Parser
@@ -39,7 +56,7 @@ module Rabbit
         end
 
         module Private
-          ALLOWED_IMG_URL_SCHEME = ['http', 'https', 'file']
+          ALLOWED_IMG_URL_SCHEME = ["http", "https", "file"]
 
           module_function
           def uri_string_to_image_filename(canvas, uri_string)
@@ -58,7 +75,7 @@ module Rabbit
           def uri_to_image_filename(canvas, uri)
             case uri.scheme.to_s.downcase
             when "file"
-              GLib.filename_from_utf8(uri.path)
+              Filename.new(uri.path).encode
             when "http", "https", "ftp"
               other_uri_filename(canvas, uri)
             else
@@ -67,7 +84,7 @@ module Rabbit
           end
 
           def local_path_to_image_filename(canvas, path)
-            path = Pathname.new(GLib.filename_from_utf8(path))
+            path = Pathname.new(Filename.new(path).encode)
             return path.to_s if path.absolute?
 
             expanded_path = canvas.full_path(path.to_s)

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

@@ -1,10 +1,29 @@
-require 'rabbit/element'
+# Copyright (C) 2012  Narihiro Nakamura <authornari@gmail.com>
+# Copyright (C) 2018  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 "rabbit/element"
+require "rabbit/parser/ext/image"
 
 module Rabbit
   module Parser
     module Ext
       module Video
-        def make_video(canvas, path, prop)
+        def make_video(canvas, uri_str, prop)
+          path = Image::Private.uri_string_to_image_filename(canvas, uri_str)
           begin
             Element::Video.new(path, prop)
           rescue Error

data/lib/rabbit/parser/markdown.rb

@@ -1,6 +1,5 @@
 require "kramdown"
-require "kramdown/parser/kramdown"
-require "kramdown/parser/gfm"
+require "kramdown-parser-gfm"
 
 require "rabbit/parser/base"
 

data/lib/rabbit/parser/pdf.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2007-2018  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 "tempfile"
 
 require "poppler"
@@ -26,13 +42,13 @@ module Rabbit
 
       include Element
       def parse
-        doc = Poppler::Document.new(@source.read)
-
-        title_page, *rest = doc.to_a
-
-        @canvas << PopplerTitleSlide.new(title_page, doc)
-        rest.each do |page|
-          @canvas << PopplerSlide.new(page)
+        doc = Poppler::Document.new(:data => @source.read)
+        doc.each_with_index do |page, i|
+          if i.zero?
+            @canvas << PopplerTitleSlide.new(page, doc)
+          else
+            @canvas << PopplerSlide.new(page)
+          end
         end
       end
     end

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

@@ -8,6 +8,26 @@ require "rabbit/parser/rd/ext/refer"
 require "rabbit/parser/rd/ext/inline-verbatim"
 require "rabbit/parser/rd/ext/block-verbatim"
 
+module Rabbit
+  module Parser
+    class RD
+      module NoURLMark
+        def to_reference_content
+          [::RD::StringElement.new(url)]
+        end
+      end
+    end
+  end
+end
+
+module RD
+  class Reference
+    class URL
+      prepend Rabbit::Parser::RD::NoURLMark
+    end
+  end
+end
+
 module Rabbit
   module Parser
     class RD

data/lib/rabbit/progress.rb

@@ -4,6 +4,8 @@ module Rabbit
   class Progress
     attr_reader :window, :foreground, :background
     def initialize
+      @width = 100
+      @height = 20
       @foreground = nil
       @background = nil
     end
@@ -27,8 +29,8 @@ module Rabbit
       @window = Gtk::Window.new(:popup)
       @window.transient_for = parent
       @window.app_paintable = true
+      @window.set_default_size(@width, @height)
       @bar = Gtk::ProgressBar.new
-      @bar.show_text = true
       @window.add(@bar)
       @window.show_all
       @bar.fraction = @current = 0
@@ -52,6 +54,7 @@ module Rabbit
     end
 
     def hide
+      @max = nil
       @window.destroy
       @bar = nil
       @window = nil
@@ -59,29 +62,37 @@ module Rabbit
 
     private
     def setup_progress_color
-      if Gtk.const_defined?(:CssProvider)
-        css = "progressbar {\n"
-        if @foreground
-          css << "  color: #{@foreground.to_css_rgba};\n"
-        end
-        if @background
-          css << "  background-color: #{@background.to_css_rgba};\n"
-        end
-        css << "}\n"
-        provider = Gtk::CssProvider.default
-        provider.load(:data => css)
-      else
-        style = @bar.style.copy
-        if @foreground
-          rgb = @foreground.to_gdk_rgb
-          style.set_bg(Gtk::STATE_PRELIGHT, *rgb)
-        end
-        if @background
-          rgb = @background.to_gdk_rgb
-          style.set_bg(Gtk::STATE_NORMAL, *rgb)
-        end
-        @bar.style = style
+      css = <<-CSS
+progress {
+  padding: 0px;
+  padding-top: #{@height}px;
+  padding-bottom: #{@height}px;
+}
+
+trough {
+  border-width: 0px;
+}
+      CSS
+      if @foreground
+        css << <<-CSS
+progress {
+  background-color: #{@foreground.to_css_rgba};
+  border-color: #{@foreground.to_css_rgba};
+}
+        CSS
+      end
+      if @background
+        css << <<-CSS
+progressbar,
+trough {
+  background-color: #{@background.to_css_rgba};
+}
+        CSS
       end
+      provider = Gtk::CssProvider.new
+      provider.load(:data => css)
+      @bar.style_context.add_provider(provider,
+                                        Gtk::StyleProvider::PRIORITY_USER)
     end
   end
 end

data/lib/rabbit/renderer.rb

@@ -1,27 +1,21 @@
-require "rabbit/utils"
+# Copyright (C) 2004-2018  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 "rabbit/renderer/color"
 require "rabbit/renderer/display"
 require "rabbit/renderer/offscreen"
-require "rabbit/renderer/print"
-
-module Rabbit
-  module Renderer
-    extend Utils
-
-    class << self
-      def printable?
-        Print.printable?
-      end
-
-      def printable_renderer(slides_per_page)
-        raise NoPrintSupportError unless printable?
-        if slides_per_page > 1
-          Print::Multiple
-        else
-          Print
-        end
-      end
-    end
-  end
-end
+require "rabbit/renderer/printer"
+require "rabbit/renderer/screen"

data/lib/rabbit/renderer/base.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2019  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 "forwardable"
 require "erb"
 require "rabbit/gtk"
@@ -18,6 +34,8 @@ module Rabbit
       def_delegators(:@canvas, :reload_source)
 
       attr_reader :x_dpi, :y_dpi
+      attr_accessor :base_width
+      attr_accessor :base_height
       attr_accessor :paper_width, :paper_height, :slides_per_page
       attr_accessor :margin_left, :margin_right
       attr_accessor :margin_top, :margin_bottom
@@ -34,9 +52,11 @@ module Rabbit
         super()
         @canvas = canvas
         @font_families = nil
+        @base_width = nil
+        @base_height = nil
         @paper_width = nil
         @paper_height = nil
-        @slides_per_page = nil
+        @slides_per_page = 1
         @margin_left = nil
         @margin_right = nil
         @margin_top = nil
@@ -156,16 +176,6 @@ module Rabbit
       def setup_event(area)
       end
 
-      def to_attrs(hash)
-        hash.collect do |key, value|
-          if value
-            "#{h key}='#{h value}'"
-          else
-            nil
-          end
-        end.compact.join(" ")
-      end
-
       def clean
         dirty_count_clean
       end
@@ -290,9 +300,10 @@ module Rabbit
       end
 
       def make_canvas_with_printable_renderer
-        renderer = Renderer.printable_renderer(@canvas.slides_per_page)
+        renderer = Renderer::Printer
         make_canvas_with_renderer(renderer) do |canvas|
           canvas.filename = @canvas.filename
+          setup_size(canvas)
           setup_margin(canvas)
           setup_page_margin(canvas)
           setup_paper_size(canvas)
@@ -303,12 +314,16 @@ module Rabbit
 
       def make_canvas_with_offscreen_renderer
         make_canvas_with_renderer(Offscreen) do |canvas|
-          canvas.width = @canvas.width
-          canvas.height = @canvas.height
+          setup_size(canvas)
           setup_3d(canvas)
         end
       end
 
+      def setup_size(canvas)
+        canvas.width = @canvas.width
+        canvas.height = @canvas.height
+      end
+
       def setup_margin(canvas)
         canvas.margin_left = @canvas.margin_left
         canvas.margin_right = @canvas.margin_right
@@ -324,55 +339,14 @@ module Rabbit
       end
 
       def setup_paper_size(canvas)
-        if @canvas.paper_width and @canvas.paper_height
-          canvas.paper_width = @canvas.paper_width
-          canvas.paper_height = @canvas.paper_height
-        else
-          canvas.paper_width = @canvas.width
-          canvas.paper_height = @canvas.height
-        end
+        canvas.paper_width = @canvas.paper_width
+        canvas.paper_height = @canvas.paper_height
       end
 
       def setup_3d(canvas)
         canvas.use_gl = @canvas.use_gl?
       end
 
-      def setup_flag_params(pole_height, default_flag_width_ratio, params)
-        params = params.dup
-
-        text = params["text"]
-        text_attrs = params["text_attributes"] || {}
-        if text
-          markupped_text = "<span #{to_attrs(text_attrs)}>#{text}</span>"
-          layout = make_layout(markupped_text)
-          text_width, text_height = layout.pixel_size
-          params["layout"] = layout
-          params["text_width"] = text_width
-          params["text_height"] = text_height
-          flag_width_default = [
-            text_width * default_flag_width_ratio,
-            pole_height / 2
-          ].max
-          flag_height_default = [text_height, flag_width_default].max
-        else
-          params["layout"] = nil
-          flag_width_default = flag_height_default = nil
-        end
-
-        params["pole_width"] = params["pole_width"] || 2
-        params["pole_color"] ||= "black"
-        flag_height = params["flag_height"] ||
-          flag_height_default || pole_height / 2
-        flag_height = [flag_height, pole_height].min
-        params["flag_height"] = flag_height
-        params["flag_width"] ||= flag_width_default || flag_height
-        params["flag_color"] ||= "red"
-        params["flag_frame_width"] ||= params["pole_width"]
-        params["flag_frame_color"] ||= params["pole_color"]
-
-        params
-      end
-
       def not_support_method(name)
         format = _("%s does not support: %s")
         msg = format % [self.class.name, name]