rabbit 2.1.3 → 2.1.4

data/lib/rabbit/html/template.erb

@@ -101,7 +101,7 @@ function handle_key(e)
 <div class="footer">
 <p>
 Generated by
-<a href="http://rabbit-shocker.org/">Rabbit</a> 
+<a href="http://rabbit-shocker.org/">Rabbit</a>
 version <%= Rabbit::VERSION %>
 </p>
 </div>

data/lib/rabbit/image/default.rb

@@ -6,13 +6,13 @@ module Rabbit
     class Default < Base
 
       push_loader(self)
-      
+
       class << self
         def match?(filename)
           true
         end
       end
-      
+
       private
       def update_size
         File.open(@filename, "rb") do |file|

data/lib/rabbit/image/eps.rb

@@ -7,7 +7,7 @@ module Rabbit
     class EPS < Base
 
       unshift_loader(self)
-      
+
       GS_COMMANDS = %w(gs gswin32c)
 
       include SystemRunner
@@ -45,15 +45,15 @@ module Rabbit
                end
         load_data(data)
       end
-      
+
       def eps_to_png(width=nil, height=nil)
         eps_to(width, height, "pngalpha")
       end
-      
+
       def eps_to_pnm(width=nil, height=nil)
         eps_to(width, height, "pnm")
       end
-      
+
       def eps_to(width, height, device, *gs_options)
         x, y, w, h, r = eps_size
         resolution = (r || Canvas::INTERNAL_DPI).round
@@ -81,7 +81,7 @@ module Rabbit
           end
         end
       end
-      
+
       def eps_size
         sx, sy, w, h, r = nil
         File.read(@filename).split(/(?:\r\n?|\n)/).each do |line|

data/lib/rabbit/image/pdf.rb

@@ -30,7 +30,7 @@ module Rabbit
       end
 
       def draw(canvas, x, y, params={})
-        if @document and canvas.poppler_available?
+        if @document
           default_params = {
             :width => width,
             :height => height,

data/lib/rabbit/image/svg.rb

@@ -20,7 +20,7 @@ module Rabbit
       end
 
       def draw(canvas, x, y, params={})
-        if @handle and canvas.rsvg_available?
+        if @handle
           default_params = {
             :width => width,
             :height => height,

data/lib/rabbit/logger/base.rb

@@ -50,18 +50,18 @@ module Rabbit
         @prog_name = prog_name
         @webrick_mode = false
       end
-      
+
       def debug?; @level <= Severity::DEBUG; end
       def info?; @level <= Severity::INFO; end
       def warning?; @level <= Severity::WARNING; end
       def error?; @level <= Severity::ERROR; end
       def fatal?; @level <= Severity::FATAL; end
       def unknown?; @level <= Severity::UNKNOWN; end
-    
+
       def debug(message_or_error=nil, &block)
         log(Severity::DEBUG, message_or_error, &block)
       end
-      
+
       def info(message_or_error=nil, &block)
         log(Severity::INFO, message_or_error, &block)
       end
@@ -78,7 +78,7 @@ module Rabbit
       def fatal(message_or_error=nil, &block)
         log(Severity::FATAL, message_or_error, &block)
       end
-      
+
       def unknown(message_or_error=nil, &block)
         log(Severity::UNKNOWN, message_or_error, &block)
       end
@@ -86,7 +86,7 @@ module Rabbit
       def <<(message_or_error)
         info(message_or_error)
       end
-      
+
       def log(severity, message_or_error, prog_name=nil, &block)
         severity ||= Severity::UNKNOWN
         prog_name ||= @prog_name

data/lib/rabbit/logger/stderr.rb

@@ -13,7 +13,10 @@ module Rabbit
           message = message.encode("locale")
         rescue EncodingError
           format = _("can't convert to current locale from UTF-8: %s")
-          $stderr.puts(format % message.encode(format.encoding))
+          sanitized_message = message.encode(format.encoding,
+                                             :invalid => :replace,
+                                             :undef   => :replace)
+          $stderr.puts(format % sanitized_message)
         end
         $stderr.puts(format_severity(severity))
         $stderr.print("[#{prog_name}]: ") if prog_name

data/lib/rabbit/menu.rb

@@ -89,7 +89,7 @@ module Rabbit
                       action.name, Gtk::UIManager::AUTO, false)
       end
     end
-    
+
     def update_ui
       @merge_ui = @merge.add_ui(ui_xml)
       @menu = @merge.get_widget("/popup")
@@ -101,13 +101,13 @@ module Rabbit
     def update_theme_menu(canvas)
       @merge.remove_ui(@theme_merge_id) if @theme_merge_id
       @merge.remove_action_group(@theme_actions) if @theme_actions
-      
+
       @theme_merge_id = @merge.new_merge_id
       @theme_actions = Gtk::ActionGroup.new("ThemeActions")
       @merge.insert_action_group(@theme_actions, 0)
 
       themes = Theme::Searcher.collect_theme
-      
+
       categories = themes.collect do |entry|
         entry.category
       end.uniq.sort_by {|cat| _(cat)}
@@ -220,7 +220,7 @@ module Rabbit
         end
       end
     end
-    
+
     def items
       [
         [:item, "ToggleIndexMode"],

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

@@ -9,10 +9,12 @@ module Rabbit
                              "option"]
         def make_image(path, prop, logger)
           image_file = Tempfile.new("rabbit-image-aafigure")
-          command = ["aafigure",
-                     "--type", "svg",
-                     "--encoding", "utf-8",
-                     "--output", image_file.path]
+          command = [
+            "aafigure",
+            "--type", "svg",
+            "--encoding", "utf-8",
+            "--output", image_file.path,
+          ]
           aafigure_options = []
           AVAILABLE_OPTIONS.each do |name|
             command.concat(["--#{name}", prop[name]]) if prop.has_key?(name)

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

@@ -10,9 +10,11 @@ module Rabbit
         AVAILABLE_VALUE_OPTIONS = []
         def make_image(path, prop, logger)
           image_file = Tempfile.new("rabbit-image-blockdiag")
-          command = ["blockdiag",
-                     "-T", "svg",
-                     "-o", image_file.path]
+          command = [
+            "blockdiag",
+            "-T", "svg",
+            "-o", image_file.path,
+          ]
           font = find_font(prop)
           command.concat(["-f", font]) if font
           AVAILABLE_FLAG_OPTIONS.each do |name|

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

@@ -3963,13 +3963,13 @@ module Rabbit
           "zeetrf" => "ℨ",
           # character showing function application in presentation tagging
           "af" => "⁡",
-          # 
+          #
           "aopf" => "𝕒",
           # Old ISOAMSR asymp (for HTML compatibility)
           "asympeq" => "≍",
-          # 
+          #
           "bopf" => "𝕓",
-          # 
+          #
           "copf" => "𝕔",
           # cross or vector product
           "Cross" => "⨯",
@@ -3977,7 +3977,7 @@ module Rabbit
           "DD" => "ⅅ",
           # d for use in differentials, e.g., within integrals
           "dd" => "ⅆ",
-          # 
+          #
           "dopf" => "𝕕",
           # down arrow to bar
           "DownArrowBar" => "⤓",
@@ -3997,7 +3997,7 @@ module Rabbit
           "EmptySmallSquare" => "◻",
           # empty small square
           "EmptyVerySmallSquare" => "▫",
-          # 
+          #
           "eopf" => "𝕖",
           # two consecutive equal signs
           "Equal" => "⩵",
@@ -4005,15 +4005,15 @@ module Rabbit
           "FilledSmallSquare" => "◼",
           # filled very small square
           "FilledVerySmallSquare" => "▪",
-          # 
+          #
           "fopf" => "𝕗",
-          # 
+          #
           "gopf" => "𝕘",
           # alias for GT
           "GreaterGreater" => "⪢",
           # circumflex accent
           "Hat" => "^",
-          # 
+          #
           "hopf" => "𝕙",
           # short horizontal line
           "HorizontalLine" => "─",
@@ -4021,13 +4021,13 @@ module Rabbit
           "ic" => "⁣",
           # i for use as a square root of -1
           "ii" => "ⅈ",
-          # 
+          #
           "iopf" => "𝕚",
           # marks multiplication when it is understood without a mark
           "it" => "⁢",
-          # 
+          #
           "jopf" => "𝕛",
-          # 
+          #
           "kopf" => "𝕜",
           # leftwards arrow to bar
           "larrb" => "⇤",
@@ -4051,7 +4051,7 @@ module Rabbit
           "LeftVectorBar" => "⥒",
           # alias for Lt
           "LessLess" => "⪡",
-          # 
+          #
           "lopf" => "𝕝",
           # downwards arrow from bar
           "mapstodown" => "↧",
@@ -4061,7 +4061,7 @@ module Rabbit
           "mapstoup" => "↥",
           # space of width 4/18 em
           "MediumSpace" => " ",
-          # 
+          #
           "mopf" => "𝕞",
           # not bumpy equals
           "nbump" => "≎̸",
@@ -4073,7 +4073,7 @@ module Rabbit
           "NewLine" => "
",
           # never break line here
           "NoBreak" => "⁠",
-          # 
+          #
           "nopf" => "𝕟",
           # alias for &nasymp;
           "NotCupCap" => "≭",
@@ -4093,7 +4093,7 @@ module Rabbit
           "NotSquareSuperset" => "⊐̸",
           # not succeeds or similar
           "NotSucceedsTilde" => "≿̸",
-          # 
+          #
           "oopf" => "𝕠",
           # over bar
           "OverBar" => "¯",
@@ -4105,11 +4105,11 @@ module Rabbit
           "OverParenthesis" => "︵",
           # the ring (skew field) of quaternions
           "planckh" => "ℎ",
-          # 
+          #
           "popf" => "𝕡",
           # alias for ∏
           "Product" => "∏",
-          # 
+          #
           "qopf" => "𝕢",
           # leftwards arrow to bar
           "rarrb" => "⇥",
@@ -4129,19 +4129,19 @@ module Rabbit
           "RightUpVectorBar" => "⥔",
           # up-right harpoon to bar
           "RightVectorBar" => "⥓",
-          # 
+          #
           "ropf" => "𝕣",
           # round implies
           "RoundImplies" => "⥰",
           # rule-delayed (colon right arrow)
           "RuleDelayed" => "⧴",
-          # 
+          #
           "sopf" => "𝕤",
           # tabulator stop; horizontal tabulation
           "Tab" => "	",
           # space of width 5/18 em
           "ThickSpace" => "   ",
-          # 
+          #
           "topf" => "𝕥",
           # under brace
           "UnderBrace" => "︸",
@@ -4149,7 +4149,7 @@ module Rabbit
           "UnderBracket" => "⎵",
           # under parenthesis
           "UnderParenthesis" => "︶",
-          # 
+          #
           "uopf" => "𝕦",
           # up arrow to bar
           "UpArrowBar" => "⤒",
@@ -4159,17 +4159,17 @@ module Rabbit
           "VerticalLine" => "|",
           # vertical separating operator
           "VerticalSeparator" => "❘",
-          # 
+          #
           "vopf" => "𝕧",
-          # 
+          #
           "wopf" => "𝕨",
-          # 
+          #
           "xopf" => "𝕩",
-          # 
+          #
           "yopf" => "𝕪",
           # zero width space
           "ZeroWidthSpace" => "​",
-          # 
+          #
           "zopf" => "𝕫",
         }
       end

data/lib/rabbit/parser/markdown.rb

@@ -1,7 +1,49 @@
 require "kramdown"
+require "kramdown/parser/kramdown"
+require "kramdown/parser/gfm"
 
 require "rabbit/parser/base"
 
+module Kramdown
+  module Parser
+    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)
+        end
+      end
+
+      alias_method :configure_parser_raw, :configure_parser
+      def configure_parser
+        position = @block_parsers.index(:codeblock_fenced)
+        @block_parsers.insert(position, :codeblock_fenced_gfm)
+
+        configure_parser_raw
+      end
+
+      parser(:codeblock_fenced_gfm).method = "parse_codeblock_fenced_gfm"
+
+      def parse_codeblock_fenced_gfm
+        original_match = self.class::FENCED_CODEBLOCK_MATCH
+        begin
+          self.class.send(:remove_const, :FENCED_CODEBLOCK_MATCH)
+          self.class.const_set(:FENCED_CODEBLOCK_MATCH,
+                               GFM::FENCED_CODEBLOCK_MATCH)
+          parse_codeblock_fenced
+        ensure
+          self.class.send(:remove_const, :FENCED_CODEBLOCK_MATCH)
+          self.class.const_set(:FENCED_CODEBLOCK_MATCH, original_match)
+        end
+      end
+    end
+  end
+end
+
 module Rabbit
   module Parser
     class Markdown < Base

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

@@ -1,8 +1,18 @@
+require "English"
+
+require "rabbit/parser/pause-support"
+require "rabbit/parser/ext/blockdiag"
+require "rabbit/parser/ext/coderay"
+require "rabbit/parser/ext/escape"
+require "rabbit/parser/ext/image"
+require "rabbit/parser/ext/tex"
+
 module Rabbit
   module Parser
     class Markdown
       class Converter
         include Element
+        include PauseSupport
 
         def initialize(canvas)
           @canvas = canvas
@@ -11,15 +21,17 @@ module Rabbit
           @slide_property_mode = false
         end
 
-        def convert(element)
-          __send__("convert_#{element.type}", element)
+        def convert(element, context=nil)
+          method_name = "convert_#{element.type}"
+          method_name << "_#{context}" if context
+          __send__(method_name, element)
         end
 
         private
-        def convert_container(element)
+        def convert_container(element, context=nil)
           elements = []
           element.children.each do |child|
-            element = convert(child)
+            element = convert(child, context)
             case element
             when nil, :no_element
               # ignore
@@ -39,7 +51,7 @@ module Rabbit
               next
             when nil
               mode = :ignore
-            when Slide
+            when Element::Slide
               target = content.body
               @canvas << content
               mode = :display
@@ -59,6 +71,7 @@ module Rabbit
               end
             end
           end
+          burn_out_pause_targets
         end
 
         def convert_header(element)
@@ -69,7 +82,7 @@ module Rabbit
             if @slides.empty?
               @slide = TitleSlide.new(Title.new(contents))
             else
-              @slide = Slide.new(HeadLine.new(contents))
+              @slide = Element::Slide.new(HeadLine.new(contents))
               @slide << Body.new
             end
             @slides << @slide
@@ -114,8 +127,14 @@ module Rabbit
           list
         end
 
+        def create_paragraph(elements)
+          paragraph = Paragraph.new(elements)
+          register_pause(paragraph) if paragraph.have_wait_tag?
+          paragraph
+        end
+
         def convert_dt(element)
-          DescriptionTerm.new(Paragraph.new(convert_container(element)))
+          DescriptionTerm.new(create_paragraph(convert_container(element)))
         end
 
         def convert_dd(element)
@@ -130,17 +149,61 @@ module Rabbit
               raise ParseError,
                       _("multiple ![alt]{image} in a paragraph isn't supported.")
             else
-              Paragraph.new(convert_container(element))
+              create_paragraph(convert_container(element))
+            end
+          end
+        end
+
+        def create_list(list_class, contents)
+          list = list_class.new
+          contents.each do |content|
+            list << content
+            if block_given?
+              yield(list, content)
+            end
+          end
+          list
+        end
+
+        def create_list_item(list_item_class, contents)
+          list_item = list_item_class.new(contents)
+
+          waited_paragraphs = list_item.elements.find_all do |element|
+            element.is_a?(Paragraph) and element.have_wait_tag?
+          end
+          unless waited_paragraphs.empty?
+            waited_paragraphs.each do |paragraph|
+              paragraph.default_visible = true
+              paragraph.clear_theme
+              unregister_pause(paragraph)
             end
+
+            list_item.default_visible = false
+            list_item.clear_theme
+            register_pause(list_item)
           end
+
+          list_item
         end
 
         def convert_ul(element)
-          ItemList.new(convert_container(element))
+          create_list(ItemList, convert_container(element, "ul"))
         end
 
-        def convert_li(element)
-          ItemListItem.new(convert_container(element))
+        def convert_li_ul(element)
+          create_list_item(ItemListItem, convert_container(element))
+        end
+
+        def convert_ol(element)
+          i = 1
+          create_list(EnumList, convert_container(element, "ol")) do |list, item|
+            item.order = i
+            i += 1
+          end
+        end
+
+        def convert_li_ol(element)
+          create_list_item(EnumListItem, convert_container(element))
         end
 
         def convert_smart_quote(element)
@@ -198,12 +261,42 @@ module Rabbit
 
         def convert_codeblock(element)
           content = element.value.chomp
+          language = detect_codeblock_language(element)
+          if language
+            converted = convert_codeblock_language(element, language, content)
+          end
+          converted || PreformattedBlock.new(PreformattedText.new(text(content)))
+        end
+
+        def detect_codeblock_language(element)
           lang = element.attr["lang"]
-          if lang
-            highlighted = Ext::CodeRay.highlight(lang, content, @canvas.logger)
-            return highlighted if highlighted
+          return lang if lang
+
+          language = element.attr["language"]
+          return language if language
+
+          klass = element.attr["class"]
+          if klass and /\Alanguage-/ =~ klass
+            return $POSTMATCH
+          end
+
+          nil
+        end
+
+        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,
+              ]
+            end
+          else
+            logger = @canvas.logger
+            Ext::CodeRay.highlight(language, content, logger)
           end
-          PreformattedBlock.new(PreformattedText.new(text(content)))
         end
 
         def convert_blockquote(element)
@@ -226,7 +319,7 @@ module Rabbit
             end
             body["background-image"] = uri
             options.each do |name, value|
-              name = name.to_s.gsub(/_/, '-')
+              name = name.to_s.gsub(/_/, "-")
               body["background-image-#{name}"] = value
             end
             :no_element
@@ -253,7 +346,7 @@ module Rabbit
 
         def convert_a(element)
           ref = ReferText.new(convert_container(element))
-          ref.to = element.attr['href']
+          ref.to = element.attr["href"]
           ref
         end
 
@@ -262,7 +355,11 @@ module Rabbit
         end
 
         def convert_codespan(element)
-          Code.new(Text.new(element.value))
+          Code.new(text(element.value))
+        end
+
+        def convert_wait(element)
+          WaitTag.new
         end
       end
     end