rabbit 2.1.6 → 2.1.7

data/lib/rabbit/logger/gui.rb

@@ -78,15 +78,15 @@ module Rabbit
         @dialog = Gtk::Dialog.new(title, nil, flags, *buttons)
         @dialog.vbox.add(init_buffer)
         @dialog.set_default_size(width, height)
+        @dialog.title = title
         set_dialog_delete
         set_dialog_response
-        set_dialog_expose_event
         set_dialog_accel_group
       end
 
       def set_dialog_delete
         @dialog.signal_connect("destroy") do |widget, event|
-          exit if @current_severity >= FATAL
+          exit if @current_severity >= Severity::FATAL
           true
         end
       end
@@ -103,16 +103,9 @@ module Rabbit
         end
       end
 
-      def set_dialog_expose_event
-        @dialog.signal_connect("expose_event") do |widget, event|
-          @dialog.title = title
-          false
-        end
-      end
-
       def set_dialog_accel_group
         accel_group = Gtk::AccelGroup.new
-        mod = Gdk::Window::ModifierType.new
+        mod = Gdk::ModifierType.new
         flags = Gtk::AccelFlags::VISIBLE
         Keys::QUIT_KEYS.each do |val|
           accel_group.connect(val, mod, flags) do

data/lib/rabbit/menu.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2004-2015  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 "erb"
 require "stringio"
 
@@ -59,7 +75,7 @@ module Rabbit
       name = "JumpTo#{i}"
       label = "#{i}: #{escape_label(Utils.unescape_title(title))}"
       tooltip = _("Jump to the %dth slide") % i
-      action = Gtk::Action.new(name, label, tooltip, nil)
+      action = Gtk::Action.new(name, :label => label, :tooltip => tooltip)
       action.signal_connect("activate") do
         jump_to_action.activate {i}
       end
@@ -86,7 +102,7 @@ module Rabbit
         @jump_to_actions.add_action(action)
         @jump_to_actions_keeper << action # Workaround for > Ruby/GTK2 0.16
         @merge.add_ui(@jump_to_merge_id, jump_to_path, action.name,
-                      action.name, Gtk::UIManager::AUTO, false)
+                      action.name, :auto, false)
       end
     end
 
@@ -129,25 +145,23 @@ module Rabbit
     def theme_menu_add_category(prefix, path, category)
       name = "#{prefix}ThemeCategory#{category}"
       label = _(category)
-      action = Gtk::Action.new(name, label, nil, nil)
+      action = Gtk::Action.new(name, :label => label)
       @theme_actions.add_action(action)
-      @merge.add_ui(@theme_merge_id, path, category, name,
-                    Gtk::UIManager::MENU, false)
+      @merge.add_ui(@theme_merge_id, path, category, name, :menu, false)
     end
 
     def theme_menu_add_theme(prefix, path, entry, canvas)
       path = "#{path}/#{entry.category}"
       name = "#{prefix}ThemeEntry#{entry.name}"
       label = _(entry.title)
-      action = Gtk::Action.new(name, label, nil, nil)
+      action = Gtk::Action.new(name, :label => label)
       action.signal_connect("activate") do
         canvas.activate("#{prefix}Theme") do
           [entry, Utils.process_pending_events_proc]
         end
       end
       @theme_actions.add_action(action)
-      @merge.add_ui(@theme_merge_id, path, entry.name, name,
-                    Gtk::UIManager::AUTO, false)
+      @merge.add_ui(@theme_merge_id, path, entry.name, name, :auto, false)
     end
 
     def show_tearoff(sub_menus=@menu.children)

data/lib/rabbit/parser.rb

@@ -12,8 +12,10 @@ module Rabbit
       parser = Base.find_loader(source)
       if parser.nil?
         format = _("unsupported format. (supported: %s)")
-        loader_names = Base.loaders.collect {|loader| loader.name}
-        message = format % "[#{loader_names.join(', ')}]"
+        format_names = Base.loaders.collect do |loader|
+          loader.format_name
+        end
+        message = format % "[#{format_names.join(', ')}]"
         raise UnsupportedFormatError.new(message)
       end
       parser.new(canvas, source).parse

data/lib/rabbit/parser/base.rb

@@ -5,12 +5,6 @@ module Rabbit
     class Base
       extend ModuleLoader
 
-      class << self
-        def name
-          super.split(/::/).last
-        end
-      end
-
       def initialize(canvas, source)
         @canvas = canvas
         @source = source

data/lib/rabbit/parser/image.rb

@@ -10,6 +10,10 @@ module Rabbit
       push_loader(self)
 
       class << self
+        def format_name
+          "image"
+        end
+
         def match?(source)
           options = {
             :prefix => "image-parser-match",

data/lib/rabbit/parser/markdown.rb

@@ -9,13 +9,28 @@ module Kramdown
     class Kramdown
       alias_method :handle_extension_raw, :handle_extension
       def handle_extension(name, opts, body, type, line_no=nil)
-        case name
-        when "wait"
-          @tree.children << Element.new(:wait, body, nil, :category => type, :location => line_no)
-          true
-        else
-          handle_extension_raw(name, opts, body, type, line_no)
+        return true if handle_extension_raw(name, opts, body, type, line_no)
+        element = Element.new(name.to_sym,
+                              nil,
+                              opts,
+                              :category => type,
+                              :location => line_no)
+        if body
+          root, warnings = self.class.parse(body, @options)
+          fix_location(root, line_no)
+          if type == :span
+            p_element = root.children.first
+            p_element.children.each do |sub_element|
+              element.children << sub_element
+            end
+          else
+            root.children.each do |sub_element|
+              element.children << sub_element
+            end
+          end
         end
+        @tree.children << element
+        true
       end
 
       alias_method :configure_parser_raw, :configure_parser
@@ -40,6 +55,14 @@ module Kramdown
           self.class.const_set(:FENCED_CODEBLOCK_MATCH, original_match)
         end
       end
+
+      private
+      def fix_location(element, base_location)
+        element.options[:location] += base_location - 1
+        element.children.each do |sub_element|
+          fix_location(sub_element, base_location)
+        end
+      end
     end
   end
 end
@@ -58,12 +81,15 @@ module Rabbit
     class Markdown
       unshift_loader(self)
       class << self
+        def format_name
+          "Makrdown"
+        end
+
         def match?(source)
           /\A(?:md|markdown)\z/i =~ source.extension.to_s
         end
       end
 
-      include Element
       def parse
         document = Kramdown::Document.new(@source.read)
         converter = Converter.new(@canvas)

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

@@ -1,9 +1,11 @@
 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/tex"
 
@@ -11,6 +13,7 @@ module Rabbit
   module Parser
     class Markdown
       class Converter
+        include GetText
         include Element
         include PauseSupport
 
@@ -142,15 +145,18 @@ module Rabbit
         end
 
         def convert_p(element)
-          if element.children.collect {|child| child.type} == [:img]
+          child_types = element.children.collect {|child| child.type}
+          if child_types == [:img]
             convert_container(element)[0]
           else
-            if element.children.any? {|child| child.type == :img}
+            if child_types.include?(:img)
               raise ParseError,
                       _("multiple ![alt]{image} in a paragraph isn't supported.")
-            else
-              create_paragraph(convert_container(element))
             end
+            if element.options[:transparent] and child_types == [:text]
+              element.children.first.value.chomp!
+            end
+            create_paragraph(convert_container(element))
           end
         end
 
@@ -361,6 +367,11 @@ module Rabbit
         def convert_wait(element)
           WaitTag.new
         end
+
+        def convert_note(element)
+          # TODO: Should we validate element.options[:category] == "span"?
+          Ext::Inline.note(convert_container(element))
+        end
       end
     end
   end

data/lib/rabbit/parser/pdf.rb

@@ -10,6 +10,10 @@ module Rabbit
     class PDF < Base
       unshift_loader(self)
       class << self
+        def format_name
+          "PDF"
+        end
+
         def match?(source)
           extension = source.extension
           if extension.nil?

data/lib/rabbit/parser/rd.rb

@@ -16,6 +16,10 @@ module Rabbit
     class RD
       push_loader(self)
       class << self
+        def format_name
+          "RD"
+        end
+
         def match?(source)
           extension = source.extension
           if extension.nil?

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

@@ -1,20 +1,33 @@
+# Copyright (C) 2004-2015  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 'rabbit/rabbit'
-require 'rabbit/utils'
-begin
-  require 'rabbit/parser/rd/rt/rt2rabbit-lib'
-rescue LoadError
-end
-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/coderay'
-require 'rabbit/parser/ext/emacs'
+require "rabbit/rabbit"
+require "rabbit/utils"
+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/coderay"
+require "rabbit/parser/ext/emacs"
 
 module Rabbit
   module Parser
@@ -32,23 +45,23 @@ module Rabbit
           end
 
           def ext_block_verb_quote(label, source, content, visitor)
-            return nil unless /^_$/i =~ label
+            return nil unless /\A_\z/i =~ label
             default_ext_block_verbatim("", source, source, visitor)
           end
 
           def ext_block_verb_img(label, source, content, visitor)
-            return nil unless /^(?:image|img)$/i =~ label
+            return nil unless /\A(?:image|img)\z/i =~ label
             src, prop = parse_source(source)
-            return nil if prop['src'].nil?
+            return nil if prop["src"].nil?
 
-            if prop['align'] == "right"
+            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(/_/, '-')
+                name = name.gsub(/_/, "-")
                 if name == "src"
                   property_name = "background-image"
                 else
@@ -58,20 +71,20 @@ module Rabbit
               end
               :no_element
             else
-              make_image(visitor, prop['src'], prop)
+              make_image(visitor, prop["src"], prop)
             end
           end
 
           def ext_block_verb_video(label, source, content, visitor)
-            return nil unless /^video$/i =~ label
+            return nil unless /\Avideo\z/i =~ label
             src, prop = parse_source(source)
-            return nil if prop['src'].nil?
+            return nil if prop["src"].nil?
 
-            make_video(visitor, prop['src'], prop)
+            make_video(visitor, prop["src"], prop)
           end
 
           def ext_block_verb_enscript(label, source, content, visitor)
-            return nil unless /^enscript (\w+)$/i =~ label
+            return nil unless /\Aenscript (\w+)\z/i =~ label
             lang = $1.downcase.untaint
 
             src, prop = parse_source(source)
@@ -85,14 +98,14 @@ module Rabbit
           end
 
           def ext_block_verb_LaTeX(label, source, content, visitor)
-            return nil unless /^LaTeX$/i =~ label
+            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)
             end
           end
 
           def ext_block_verb_mimeTeX(label, source, content, visitor)
-            return nil unless /^mimeTeX$/i =~ label
+            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,
                                                      visitor)
@@ -100,21 +113,21 @@ module Rabbit
           end
 
           def ext_block_verb_aafigure(label, source, content, visitor)
-            return nil unless /^aafigure$/i =~ label
+            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)
             end
           end
 
           def ext_block_verb_blockdiag(label, source, content, visitor)
-            return nil unless /^blockdiag$/i =~ label
+            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)
             end
           end
 
           def ext_block_verb_coderay(label, source, content, visitor)
-            return nil unless /^coderay (\w+)$/i =~ label
+            return nil unless /\Acoderay (\w+)\z/i =~ label
             lang = $1.downcase.untaint
 
             src, prop = parse_source(source)
@@ -125,7 +138,7 @@ module Rabbit
           end
 
           def ext_block_verb_emacs(label, source, content, visitor)
-            return nil unless /^emacs(?:\s+(.+))?$/i =~ label
+            return nil unless /\Aemacs(?:\s+(.+))?\z/i =~ label
             mode_line = $1.untaint
 
             src, prop = parse_source(source)
@@ -136,7 +149,7 @@ module Rabbit
           end
 
           def ext_block_verb_rt(label, source, content, visitor)
-            return nil unless /^rt$/i =~ label
+            return nil unless /\Art\z/i =~ label
             unless defined?(RT2RabbitVisitor)
               visitor.logger.warn(_("RTtool isn't available"))
               return nil
@@ -146,7 +159,7 @@ module Rabbit
           end
 
           def ext_block_verb_block_quote(label, source, content, visitor)
-            return nil unless /^block[_-]?quote$/i =~ label
+            return nil unless /\Ablock[_-]?quote\z/i =~ label
             src, prop = parse_source(source)
             tree = ::RD::RDTree.new("=begin\n#{src}\n=end\n")
             elems = tree.root.children.collect do |child|
@@ -156,7 +169,7 @@ module Rabbit
           end
 
           def ext_block_verb_wait(label, source, content, visitor)
-            return nil unless /^wait$/i =~ label
+            return nil unless /\Await\z/i =~ label
 
             src, prop = parse_source(source)
             tree = ::RD::RDTree.new("=begin\n#{src}\n=end\n")