rabbit 2.2.0 → 2.2.1

data/doc/ja/usage/rabbit.rd

@@ -15,7 +15,22 @@ Rabbitはコマンドラインから起動する方法とコマンドランチ
 
   % rabbit XXX.rd
 
-例えば、sample/rabbit-implementation.rdを使うには、トップの
+例えば、XXX.rd の内容はこのようになっています。
+
+  = タイトル
+
+  :author
+    発表者名
+
+  = 1ページ目
+
+  ここは内容
+
+  = 2ページ目
+
+  おしまい
+
+sample/rabbit-implementation.rdを使うには、トップの
 ディレクトリで以下のようにします。
 
   % rabbit sample/rabbit-implementation.rd

data/lib/rabbit/command/rabbit.rb

@@ -64,7 +64,11 @@ module Rabbit
             @logger.error($!)
           end
         end
-        application.run.zero?
+        exit_code = application.run
+        application.windows.each(&:destroy)
+        application.unref
+
+        exit_code.zero?
       end
 
       private

data/lib/rabbit/element/index-slide.rb

@@ -154,7 +154,7 @@ module Rabbit
             text = %Q[<span size="#{text_size}">#{text}</span>]
             @layout, _, _ = canvas.make_layout(text)
             @layout.set_width(width * Pango::SCALE)
-            @layout.set_alignment(Pango::Layout::ALIGN_CENTER)
+            @layout.set_alignment(Pango::Alignment::CENTER)
           end
           canvas.draw_pixbuf(@pixbuf, x, y)
           canvas.draw_rectangle(false, x, y, width, height)

data/lib/rabbit/element/text-renderer.rb

@@ -22,7 +22,7 @@ module Rabbit
 
       def align=(new_value)
         if new_value.is_a?(String)
-          new_value = Pango::Layout.const_get("ALIGN_#{new_value.to_s.upcase}")
+          new_value = Pango::Alignment.const_get(new_value.to_s.upcase)
         end
         dirty! if @align != new_value
         @align = new_value
@@ -78,11 +78,11 @@ module Rabbit
       end
 
       def do_horizontal_centering(canvas, x, y, w, h)
-        self.align = Pango::Layout::ALIGN_CENTER
+        self.align = Pango::Alignment::CENTER
       end
 
       def reset_horizontal_centering(canvas, x, y, w, h)
-        self.align = default_align if @align == Pango::Layout::ALIGN_CENTER
+        self.align = default_align if @align == Pango::Alignment::CENTER
       end
 
       def markuped_text
@@ -197,8 +197,8 @@ module Rabbit
         setup_layout(layout, w)
         width, height = layout.pixel_size
         if layout.width != -1 and
-            (layout.alignment == Pango::Layout::ALIGN_CENTER or
-             layout.alignment == Pango::Layout::ALIGN_RIGHT)
+            (layout.alignment == Pango::Alignment::CENTER or
+             layout.alignment == Pango::Alignment::RIGHT)
           width = layout.width / Pango::SCALE
         end
         @width, @height = width, height
@@ -242,11 +242,11 @@ module Rabbit
       end
 
       def default_wrap_mode
-        Pango::Layout::WRAP_WORD_CHAR
+        Pango::WrapMode::WORD_CHAR
       end
 
       def default_align
-        Pango::Layout::ALIGN_LEFT
+        Pango::Alignment::LEFT
       end
 
       def default_justify

data/lib/rabbit/gtk.rb

@@ -37,6 +37,16 @@ module Cairo
   end
 end
 
+module Pango
+  unless const_defined?(:WrapMode)
+    WrapMode = Layout::WrapMode
+  end
+
+  unless const_defined?(:Alignment)
+    Alignment = Layout::Alignment
+  end
+end
+
 module Gdk
   class Event
     STOP = true unless const_defined?(:STOP)
@@ -104,33 +114,30 @@ module Gtk
 
   unless const_defined?(:Application)
     class Application < Gio::Application
+      attr_reader :windows
       def initialize(id, flags)
         super
         signal_connect_after("activate") do
-          Gtk.main if ApplicationWindow.n_instances > 0
+          Gtk.main unless @windows.empty?
         end
+        @windows = []
       end
     end
   end
 
   unless const_defined?(:ApplicationWindow)
     class ApplicationWindow
-      @@n_instances = 0
-
       class << self
         def new(application)
           window = Window.new
-          @@n_instances += 1
+          application.windows << window
           window.signal_connect("destroy") do
-            @@n_instances -= 1
-            Gtk.main_quit if @@n_instances.zero?
+            windows = application.windows
+            windows.delete(window)
+            Gtk.main_quit if windows.empty?
           end
           window
         end
-
-        def n_instances
-          @@n_instances
-        end
       end
     end
   end

data/lib/rabbit/image/svg.rb

@@ -1,10 +1,29 @@
+# Copyright (C) 2004-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.
+
 require "rsvg2"
 
 require "rabbit/image/base"
 
+unless Object.const_defined?(:Rsvg)
+  Rsvg = RSVG
+end
+
 module Rabbit
   module ImageManipulable
-
     class SVG < Base
 
       unshift_loader(self)
@@ -34,23 +53,16 @@ module Rabbit
       end
 
       def pixbuf
-        @pixbuf ||= to_pixbuf(width, height)
+        @handle.pixbuf
       end
 
       private
       def update_size
-        @handle = nil
         rsvg_environment do |name|
-          if RSVG::Handle.respond_to?(:new_from_file)
-            @handle = RSVG::Handle.new_from_file(name)
-            dim = @handle.dimensions
-            @width = dim.width
-            @height = dim.height
-          else
-            @pixbuf = RSVG.pixbuf_from_file(name)
-            @width = @pixbuf.width
-            @height = @pixbuf.height
-          end
+          @handle = Rsvg::Handle.new(:path => name)
+          dim = @handle.dimensions
+          @width = dim.width
+          @height = dim.height
         end
       end
 
@@ -65,16 +77,6 @@ module Rabbit
           yield(name)
         end
       end
-
-      def to_pixbuf(w=nil, h=nil)
-        rsvg_environment do |name|
-          if w or h
-            RSVG.pixbuf_from_file_at_size(name, w || width, h || height)
-          else
-            RSVG.pixbuf_from_file(name)
-          end
-        end
-      end
     end
   end
 end

data/lib/rabbit/info-window.rb

@@ -301,6 +301,7 @@ module Rabbit
         @canvas.source_force_modified(true) do |original_source|
           source.source = original_source.read
           source.base = original_source.base
+          source.extension = original_source.extension
         end
         canvas.parse(source)
       end

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

@@ -0,0 +1,126 @@
+# Copyright (C) 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.
+
+require "rouge"
+
+require "rabbit/utils"
+require "rabbit/parser/ext/escape"
+
+module Rabbit
+  module Parser
+    module Ext
+      module Rouge
+        include GetText
+
+        module_function
+        def highlight(lang, text, logger)
+          lexer = ::Rouge::Lexer.find(lang).new
+          formatter = RabbitFormatter.new
+          block = Element::SyntaxHighlightingBlock.new
+          text_container = Element::TextContainer.new
+          formatter.format(lexer.lex(text.strip)) do |element|
+            text_container << element
+          end
+          block << text_container
+          block
+        end
+
+        class RabbitFormatter < ::Rouge::Formatter
+          tag "rabbit"
+
+          include Element
+
+          def stream(tokens)
+            tokens.each do |token, value|
+              escaped_text = Escape.escape_meta_character(value)
+              text_element = SyntaxHighlightingText.new(Text.new(escaped_text))
+              tag_name = compute_tag_name(token)
+              if Utils.syntax_highlighting_debug?
+                p [tag_name, token.qualname, value]
+              end
+              yield(CustomTag.new("syntax-#{tag_name}", text_element))
+            end
+          end
+
+          private
+          def compute_tag_name(token)
+            group = token.token_chain.first.name
+            case group
+            when :Keyword
+              case token.name
+              when :Constant
+                tag_namenize(token.name)
+              else
+                tag_namenize(group)
+              end
+            when :Name
+              case token.name
+              when :Namespace
+                "include"
+              else
+                case token.parent.name
+                when :Variable
+                  "#{tag_namenize(token.name)}_variable"
+                else
+                  tag_namenize(token.name)
+                end
+              end
+            when :Literal
+              if match_token?("Literal.String", token)
+                case token.name
+                when :Symbol
+                  tag_namenize(token.name)
+                else
+                  "string"
+                end
+              elsif match_token?("Literal.Number", token)
+                if match_token?("Literal.Number.Float", token)
+                  "float"
+                elsif match_token?("Literal.Number.Integer", token)
+                  "integer"
+                else
+                  tag_namenize(token.name)
+                end
+              else
+                tag_namenize(token.name)
+              end
+            when :Generic
+              tag_name = tag_namenize(token.name)
+              case tag_name
+              when "deleted"
+                "delete"
+              when "inserted"
+                "insert"
+              else
+                tag_name
+              end
+            else
+              tag_namenize(group)
+            end
+          end
+
+          def tag_namenize(name)
+            name.to_s.downcase
+          end
+
+          def match_token?(name, token)
+            ::Rouge::Token[name].matches?(token)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2012-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
@@ -19,10 +19,10 @@ require "English"
 require "rabbit/gettext"
 require "rabbit/parser/pause-support"
 require "rabbit/parser/ext/blockdiag"
-require "rabbit/parser/ext/coderay"
 require "rabbit/parser/ext/escape"
 require "rabbit/parser/ext/inline"
 require "rabbit/parser/ext/image"
+require "rabbit/parser/ext/rouge"
 require "rabbit/parser/ext/tex"
 
 module Rabbit
@@ -282,7 +282,7 @@ module Rabbit
           if @in_table_header
             header = TableHeader.new(convert_container(element))
             def header.default_align
-              Pango::Layout::ALIGN_CENTER
+              Pango::Alignment::CENTER
             end
             header
           else
@@ -334,7 +334,7 @@ module Rabbit
             end
           else
             logger = @canvas.logger
-            Ext::CodeRay.highlight(language, content, logger)
+            Ext::Rouge.highlight(language, content, logger)
           end
         end
 

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2015  Kouhei Sutou <kou@cozmixng.org>
+# Copyright (C) 2004-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
@@ -28,6 +28,7 @@ require "rabbit/parser/ext/aafigure"
 require "rabbit/parser/ext/blockdiag"
 require "rabbit/parser/ext/coderay"
 require "rabbit/parser/ext/emacs"
+require "rabbit/parser/ext/rouge"
 
 module Rabbit
   module Parser
@@ -189,6 +190,17 @@ module Rabbit
             text = Text.new(src)
             PreformattedBlock.new(PreformattedText.new(text))
           end
+
+          def ext_block_verb_rouge(label, source, content, visitor)
+            return nil unless /\Arouge (\w+)\z/i =~ label
+            lang = $1.downcase.untaint
+
+            src, prop = parse_source(source)
+            logger = visitor.logger
+
+            result = Parser::Ext::Rouge.highlight(lang, src, logger)
+            result || default_ext_block_verbatim(label, src, src, visitor)
+          end
         end
       end
     end

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

@@ -71,15 +71,15 @@ module Rabbit
       case align
       when :center
         def target.default_align
-          Pango::Layout::ALIGN_CENTER
+          Pango::Alignment::CENTER
         end
       when :right
         def target.default_align
-          Pango::Layout::ALIGN_RIGHT
+          Pango::Alignment::RIGHT
         end
       else
         def target.default_align
-          Pango::Layout::ALIGN_LEFT
+          Pango::Alignment::LEFT
         end
       end
       target.align = target.default_align