rabbit 2.2.0 → 2.2.1

data/lib/rabbit/parser/wiki/output.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2015  Kouhei Sutou <kou@cozmixng.org>
+# 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
@@ -27,6 +27,7 @@ require "rabbit/parser/ext/blockdiag"
 require "rabbit/parser/ext/coderay"
 require "rabbit/parser/ext/emacs"
 require "rabbit/parser/ext/entity"
+require "rabbit/parser/ext/rouge"
 
 module Rabbit
   module Parser
@@ -248,7 +249,7 @@ module Rabbit
           @table_head << @parent if @parent.parent.nil?
           header = TableHeader.new(item)
           def header.default_align
-            Pango::Layout::ALIGN_CENTER
+            Pango::Alignment::CENTER
           end
           @parent << header
         end
@@ -282,7 +283,7 @@ module Rabbit
           result = nil
 
           if lang
-            result = Ext::CodeRay.highlight(lang, contents, @canvas.logger)
+            result = Ext::Rouge.highlight(lang, contents, @canvas.logger)
           end
 
           if result
@@ -534,6 +535,11 @@ module Rabbit
             Ext::Emacs.highlight(source, logger, mode_line)
           end
 
+          def rouge(lang, source)
+            logger = @output.canvas.logger
+            Ext::Rouge.highlight(lang, source, logger)
+          end
+
           def tag(name, value=nil)
             if value
               CustomTag.new(name, @output.text(value))

data/lib/rabbit/progress.rb

@@ -4,51 +4,59 @@ module Rabbit
   class Progress
     attr_reader :window, :foreground, :background
     def initialize
-      @window = Gtk::Window.new(:popup)
-      @window.app_paintable = true
-      @bar = Gtk::ProgressBar.new
-      @bar.show_text = true
-      @window.add(@bar)
       @foreground = nil
       @background = nil
     end
 
     def foreground=(color)
       @foreground = color
-      setup_progress_color
     end
 
     def background=(color)
       @background = color
-      setup_progress_color
     end
 
     def clear_color
       @foreground = nil
       @background = nil
-      setup_progress_color
     end
 
     def start_progress(max, parent)
       return if max.zero?
+
+      @window = Gtk::Window.new(:popup)
       @window.transient_for = parent
+      @window.app_paintable = true
+      @bar = Gtk::ProgressBar.new
+      @bar.show_text = true
+      @window.add(@bar)
       @window.show_all
       @bar.fraction = @current = 0
       @max = max.to_f
+
+      setup_progress_color
     end
 
     def update_progress(i)
       return if @max.nil?
+
       @current = i
       @bar.fraction = @current / @max
     end
 
     def end_progress
       return if @max.nil?
+
       @current = @max
       @bar.fraction = @current / @max
     end
 
+    def hide
+      @window.destroy
+      @bar = nil
+      @window = nil
+    end
+
     private
     def setup_progress_color
       if Gtk.const_defined?(:CssProvider)

data/lib/rabbit/renderer/display/drawing-area-base.rb

@@ -241,6 +241,13 @@ module Rabbit
         def post_init_gui
         end
 
+        def draw_slide(slide, simulation, &block)
+          super do |*args|
+            block.call(*args)
+            magnify {block.call(*args)} unless simulation
+          end
+        end
+
         private
         def add_widgets_to_container(container)
           @hbox = Gtk::Box.new(:horizontal)
@@ -288,7 +295,7 @@ module Rabbit
           context.paint
         end
 
-        def draw(widget, context)
+        def draw(widget)
           reload_source unless @caching
 
           if whiteouting?
@@ -303,13 +310,6 @@ module Rabbit
           end
         end
 
-        def draw_slide(slide, simulation, &block)
-          super do |*args|
-            block.call(*args)
-            magnify {block.call(*args)} unless simulation
-          end
-        end
-
         def draw_current_slide_pixbuf(pixbuf)
           width, height = pixbuf.width, pixbuf.height
           x = @adjustment_x * width

data/lib/rabbit/renderer/display/drawing-area-primitive.rb

@@ -140,21 +140,21 @@ module Rabbit
           if @area.class.signals.include?("draw")
             @area.signal_connect("draw") do |widget, context|
               init_context(context)
-              draw(widget, context)
+              draw(widget)
               finish_renderer
               stop_events
             end
           else
             @area.signal_connect("expose_event") do |widget, event|
               init_renderer(@drawable)
-              draw(widget, @drawable.create_cairo_context)
+              draw(widget)
               finish_renderer
               stop_events
             end
           end
         end
 
-        def draw(widget, context)
+        def draw(widget)
           draw_current_slide
         end
 

data/lib/rabbit/renderer/display/graffiti.rb

@@ -25,6 +25,45 @@ module Rabbit
           graffiti_mode_action.active = false
         end
 
+        def graffiti_mode?
+          graffiti_mode_action.active?
+        end
+
+        def have_graffiti?
+          @graffiti.have_graffiti?
+        end
+
+        def can_undo_graffiti?
+          @graffiti.can_undo?
+        end
+
+        def toggle_graffiti_mode
+          if graffiti_mode?
+            update_cursor(:pencil)
+          else
+            restore_cursor(nil)
+          end
+          update_menu
+        end
+
+        def clear_graffiti
+          @graffiti.clear
+          Action.update_graffiti_action_status(@canvas)
+          @area.queue_draw
+        end
+
+        def undo_graffiti
+          @graffiti.undo
+          Action.update_graffiti_action_status(@canvas)
+          @area.queue_draw
+        end
+
+        def change_graffiti_color
+          @graffiti.change_color do
+            redraw
+          end
+        end
+
         private
         def init_graffiti
           @graffiti = Rabbit::Graffiti::Processor.new
@@ -75,45 +114,6 @@ module Rabbit
         def graffiti_mode_action
           @canvas.action("ToggleGraffitiMode")
         end
-
-        def graffiti_mode?
-          graffiti_mode_action.active?
-        end
-
-        def have_graffiti?
-          @graffiti.have_graffiti?
-        end
-
-        def can_undo_graffiti?
-          @graffiti.can_undo?
-        end
-
-        def toggle_graffiti_mode
-          if graffiti_mode?
-            update_cursor(:pencil)
-          else
-            restore_cursor(nil)
-          end
-          update_menu
-        end
-
-        def clear_graffiti
-          @graffiti.clear
-          Action.update_graffiti_action_status(@canvas)
-          @area.queue_draw
-        end
-
-        def undo_graffiti
-          @graffiti.undo
-          Action.update_graffiti_action_status(@canvas)
-          @area.queue_draw
-        end
-
-        def change_graffiti_color
-          @graffiti.change_color do
-            redraw
-          end
-        end
       end
     end
   end

data/lib/rabbit/renderer/display/progress.rb

@@ -27,6 +27,7 @@ module Rabbit
 
         def start_progress(max)
           return if max.zero?
+
           update_menu
           @progress.start_progress(max, @canvas.window)
           adjust_progress_window
@@ -40,7 +41,7 @@ module Rabbit
         def end_progress
           @progress.end_progress
           GLib::Timeout.add(100) do
-            @progress.window.hide
+            @progress.hide
             update_menu
             false
           end
@@ -52,7 +53,7 @@ module Rabbit
         end
 
         def adjust_progress_window
-          if @window
+          if @window and @progress.window
             Utils.move_to_top_left(@window, @progress.window)
           end
         end

data/lib/rabbit/renderer/display/search.rb

@@ -24,7 +24,7 @@ module Rabbit
         end
 
         def stop_slide_search
-          @search_window.hide
+          @search_window.destroy
           @search_window = nil
         end
 

data/lib/rabbit/renderer/kernel.rb

@@ -160,7 +160,7 @@ module Rabbit
                            text_height, flag_height)
         base_x = x + pole_width
         layout.width = flag_width * Pango::SCALE
-        layout.alignment = Pango::Layout::ALIGN_CENTER
+        layout.alignment = Pango::Alignment::CENTER
         base_y = y
         if text_height < flag_height
           base_y += (flag_height - text_height) / 2

data/lib/rabbit/search-window.rb

@@ -17,9 +17,9 @@ module Rabbit
       @window.show
     end
 
-    def hide
+    def destroy
       send_focus_change(false)
-      @window.hide
+      @window.destroy
     end
 
     def forward=(forward)

data/lib/rabbit/source/memory.rb

@@ -9,14 +9,18 @@ module Rabbit
         N_("[FILENAME_OR_NOT]")
       end
 
+      attr_accessor :extension
+
       def initialize(encoding, logger, name=nil)
         super(encoding, logger)
         if name
           file_source = File.new(encoding, logger, name)
           @original_source = file_source.read
           set_base(file_source.base)
+          @extension = extract_extension(name)
         else
           @original_source = ""
+          @extension = nil
         end
         reset
       end

data/lib/rabbit/theme/background-image-toolkit/background-image-toolkit.rb

@@ -44,7 +44,7 @@ def apply_background_image_property(element, options={})
       image.compile(canvas, _x, _y, _w, _h)
 
       case vertical_align
-      when "center"
+      when "middle"
         adjust_height = ((_h - image.height - image.padding_bottom) / 2.0).ceil
         if _y + adjust_height > 0
           _y += adjust_height

data/lib/rabbit/theme/color-circle-title-slide/color-circle-title-slide.rb

@@ -9,7 +9,7 @@ match(TitleSlide, "*") do |elements|
     element.margin_left = canvas.width * 0.2
     element.margin_right = canvas.width * 0.05
     unless [Title, Subtitle, Author].find {|type| element.is_a?(type)}
-      element.align = Pango::Layout::ALIGN_RIGHT
+      element.align = Pango::Alignment::RIGHT
     end
   end
 end

data/lib/rabbit/theme/default-block-quote/default-block-quote.rb

@@ -112,7 +112,7 @@ create_title_layout = lambda do |close_quote, block, canvas, x, y, w, h|
   title = Text.new(_("[cited from `%s']") % block.title)
   title.font(:size => @block_quote_title_font_size,
              :style => "italic")
-  title.align = Pango::Layout::ALIGN_RIGHT
+  title.align = Pango::Alignment::RIGHT
   set_font_family(title)
   title_w = w + block.padding_left + block.padding_right
   if @block_quote_image_frame

data/lib/rabbit/theme/image-slide-number/image-slide-number.rb

@@ -29,11 +29,20 @@ end
   :draw_scaled_pixbuf => false,
 }
 
+target_n_slides = nil
+
 match(Slide) do |slides|
   slides.delete_post_draw_proc_by_name(proc_name)
 
   break if @image_slide_number_uninstall
 
+  slides.each do |slide|
+    if slide["image-slide-number-last-slide"] == "true"
+      target_n_slides = slide.index + 1
+      break
+    end
+  end
+
   loader = ImageLoader.new(find_file(@image_slide_number_image))
   unless @image_slide_number_show_text
     start_loader = ImageLoader.new(find_file(@image_slide_number_start_image))
@@ -104,10 +113,12 @@ match(Slide) do |slides|
         end
       end
 
-      if canvas.slide_size < 3
+      target_n_slides ||= canvas.slide_size
+      if target_n_slides < 3
         ratio = 1
       else
-        ratio = (slide.index - 1.0) / (canvas.slide_size - 2.0)
+        ratio = (slide.index - 1.0) / (target_n_slides - 2.0)
+        ratio = 1 if ratio > 1
       end
       current_base_x = base_x + max_width * ratio
       loader.draw(canvas, current_base_x, base_y,

data/lib/rabbit/theme/lightning-talk-toolkit/lightning-talk-toolkit.rb

@@ -7,7 +7,7 @@
 @lightning_talk_contact_information_color ||= nil
 @lightning_talk_contact_information_font_family ||= @font_family
 @lightning_talk_as_large_as_possible ||= false
-@lightning_talk_wrap_mode ||= Pango::Layout::WRAP_WORD
+@lightning_talk_wrap_mode ||= Pango::WrapMode::WORD
 if @lightning_talk_horizontal_centering.nil?
   @lightning_talk_horizontal_centering = true
 end
@@ -99,7 +99,7 @@ def setup_lightning_talk_slide(slide)
               :family => contact_information_family,
             }
             text.font(params)
-            text.align = Pango::Layout::ALIGN_RIGHT
+            text.align = Pango::Alignment::RIGHT
             text.compile(canvas, x, y, w, h)
             text.layout.set_width(width * Pango::SCALE)
             text_x = margin_left

data/lib/rabbit/theme/slide-number/slide-number.rb

@@ -17,7 +17,7 @@ match(Slide) do |slides|
     unless simulation
       text = Text.new("#{slide.index}/#{canvas.slide_size - 1}")
       text.font @slide_number_props
-      text.align = Pango::Layout::ALIGN_RIGHT
+      text.align = Pango::Alignment::RIGHT
       text.compile(canvas, x, y, w, h)
       layout = text.layout
       layout.set_width(w * Pango::SCALE)

data/lib/rabbit/theme/syntax-highlighting/syntax-highlighting.rb

@@ -68,6 +68,9 @@ theme_exit if @syntax_highlighting_uninstall
   :operator => {
     :color => "#ce5c00",
   },
+  :punctuation => {
+    :color => "#ce5c00",
+  },
   :ident => {
     # :color => "#f57900",
   },