rabbit 3.0.0 → 3.0.2

data/lib/rabbit/command/rabbit-slide.ui

@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
+  <object class="GtkAdjustment" id="slide-height-adjustment">
+    <property name="upper">4000</property>
+    <property name="step-increment">10</property>
+    <property name="page-increment">100</property>
+  </object>
+  <object class="GtkAdjustment" id="slide-width-adjustment">
+    <property name="upper">4000</property>
+    <property name="step-increment">10</property>
+    <property name="page-increment">100</property>
+  </object>
   <object class="GtkDialog" id="dialog">
-    <property name="can_focus">False</property>
-    <property name="type_hint">dialog</property>
-    <child>
-      <placeholder/>
-    </child>
+    <property name="can-focus">False</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="cancel-button">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -35,9 +42,9 @@
               <object class="GtkButton" id="apply-button">
                 <property name="label">gtk-apply</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
+                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -55,90 +62,153 @@
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkFrame">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can-focus">False</property>
+                <property name="label-xalign">0</property>
+                <property name="shadow-type">none</property>
                 <child>
                   <object class="GtkAlignment">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
+                    <property name="can-focus">False</property>
+                    <property name="left-padding">12</property>
                     <child>
+                      <!-- n-columns=3 n-rows=5 -->
                       <object class="GtkGrid">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="halign">end</property>
                             <property name="label" translatable="yes">ID:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="slide-id">
+                          <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="placeholder_text" translatable="yes">rubykaigi2012</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">end</property>
+                            <property name="label" translatable="yes">Base name:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">end</property>
-                            <property name="label" translatable="yes">Base name:</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes">Markup language:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes">Height:</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="slide-id">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="placeholder-text" translatable="yes">rubykaigi2012</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="slide-base-name">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="placeholder_text" translatable="yes">rabbit-introduction</property>
+                            <property name="can-focus">True</property>
+                            <property name="placeholder-text" translatable="yes">rabbit-introduction</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBoxText" id="slide-markup-language">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="slide-height">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="adjustment">slide-height-adjustment</property>
+                            <property name="climb-rate">10</property>
+                            <property name="numeric">True</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">4</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Markup language:</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes">Width:</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxText" id="slide-markup-language">
+                          <object class="GtkSpinButton" id="slide-width">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">True</property>
+                            <property name="adjustment">slide-width-adjustment</property>
+                            <property name="climb-rate">10</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">3</property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -146,7 +216,7 @@
                 <child type="label">
                   <object class="GtkLabel">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="label" translatable="yes">Slide information</property>
                   </object>
                 </child>
@@ -158,7 +228,15 @@
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <placeholder/>

data/lib/rabbit/command/rabbit.rb

@@ -636,14 +636,10 @@ module Rabbit
       end
 
       def choose_source_file_by_dialog
-        dialog = Gtk::FileChooserDialog.new(_("Choose a Rabbit source file"),
-                                            nil,
-                                            Gtk::FileChooser::ACTION_OPEN,
-                                            nil,
-                                            [Gtk::Stock::CANCEL,
-                                             Gtk::Dialog::RESPONSE_CANCEL],
-                                            [Gtk::Stock::OPEN,
-                                             Gtk::Dialog::RESPONSE_ACCEPT])
+        dialog = Gtk::FileChooserDialog.new(:title => _("Choose a Rabbit source file"),
+                                            :action => :open,
+                                            :buttons => [[Gtk::Stock::CANCEL, :cancel],
+                                                        [Gtk::Stock::OPEN, :accept]])
         dialog.current_folder = @options.base if @options.base
         add_source_dialog_filter(dialog, "Rabbit files", "*.rab")
         add_source_dialog_filter(dialog, "RD files", "*.rd")
@@ -652,7 +648,7 @@ module Rabbit
         add_source_dialog_filter(dialog, "Markdown files", "*.md")
         add_source_dialog_filter(dialog, "All files", "*")
         file_name = nil
-        if dialog.run == Gtk::Dialog::RESPONSE_ACCEPT
+        if dialog.run == Gtk::ResponseType::ACCEPT
           file_name = dialog.filename
           dialog.destroy
         end

data/lib/rabbit/element/base.rb

@@ -430,11 +430,7 @@ module Rabbit
 
       def make_prop_value(name, *values)
         formatter_name = to_class_name(name)
-        begin
-          unless Format.const_defined?(formatter_name)
-            raise NameError
-          end
-        rescue NameError
+        unless Format.const_defined?(formatter_name)
           raise UnknownPropertyError.new(name)
         end
         Format.const_get(formatter_name).new(*values)

data/lib/rabbit/element/image.rb

@@ -1,5 +1,21 @@
-require 'rabbit/image'
-require 'rabbit/element/block-element'
+# Copyright (C) 2004-2021  Sutou Kouhei <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/image"
+require "rabbit/element/block-element"
 
 module Rabbit
   module Element
@@ -13,61 +29,29 @@ module Rabbit
       alias image_draw draw
       alias draw element_draw
 
-      attr_reader :filename
-      attr_reader :caption
-      attr_reader :normalized_width, :normalized_height
-      attr_reader :relative_width, :relative_height
-      attr_reader :relative_margin_top, :relative_margin_bottom
-      attr_reader :relative_margin_left, :relative_margin_right
-      attr_reader :relative_padding_top, :relative_padding_bottom
-      attr_reader :relative_padding_left, :relative_padding_right
-
-      def initialize(filename, prop)
-        @filename = filename
-        prop = Utils.stringify_hash_key(prop)
-        super(filename, prop)
-        normalized_prop = {}
-        prop.each do |name, value|
-          normalized_prop[name.gsub(/-/, '_')] = value
-        end
-        prop = normalized_prop
-        %w(caption dither_mode).each do |name|
-          instance_variable_set("@#{name}", prop[name])
-        end
-        %w(keep_scale keep_ratio).each do |name|
-          unless prop[name].nil?
-            self.keep_ratio = true_value?(prop[name])
-          end
-        end
-        %w(as_large_as_possible).each do |name|
-          instance_variable_set("@#{name}", true_value?(prop[name]))
-        end
-        %w(width height
-           x_dither y_dither
-           normalized_width normalized_height
-           relative_width relative_height
-           relative_margin_top relative_margin_bottom
-           relative_margin_left relative_margin_right
-           relative_padding_top relative_padding_bottom
-           relative_padding_left relative_padding_right
-          ).each do |name|
-          begin
-            instance_variable_set("@#{name}", prop[name] && Integer(prop[name]))
-          rescue ArgumentError
-            raise InvalidImageSizeError.new(filename, name, prop[name])
-          end
-        end
-
-        setup_draw_parameters(prop)
-        resize(@width, @height)
+      def initialize(filename, props, canvas: nil)
+        super(filename, props, canvas: canvas)
+        setup_draw_parameters
+        resize(properties.get_size("width", @filename),
+               properties.get_size("height", @filename))
       end
 
       def draw_element(canvas, x, y, w, h, simulation)
-        draw_image(canvas, x, y, w, h, simulation)
+        result = draw_image(canvas, x, y, w, h, simulation)
+        draw_properties(canvas, x, y, w, h) unless simulation
+        result
+      end
+
+      def caption
+        self["caption"]
+      end
+
+      def caption_font_size
+        properties.get_float("caption-font-size")
       end
 
       def text
-        @caption.to_s
+        caption.to_s
       end
 
       def to_rd
@@ -85,22 +69,44 @@ module Rabbit
         html
       end
 
-      def dither_mode
-        @dither_mode ||= "normal"
-        mode_name = "DITHER_#{@dither_mode.upcase}"
-        if Gdk::RGB.const_defined?(mode_name)
-          Gdk::RGB.const_get(mode_name)
-        else
-          Gdk::RGB::DITHER_NORMAL
-        end
+      def relative_width
+        properties.get_relative_size("relative_width", @filename)
+      end
+
+      def relative_height
+        properties.get_relative_size("relative_height", @filename)
       end
 
-      def x_dither
-        @x_dither || 0
+      def relative_margin_top
+        properties.get_relative_size("relative_margin_top", @filename)
       end
 
-      def y_dither
-        @y_dither || 0
+      def relative_margin_bottom
+        properties.get_relative_size("relative_margin_bottom", @filename)
+      end
+
+      def relative_margin_left
+        properties.get_relative_size("relative_margin_left", @filename)
+      end
+
+      def relative_margin_right
+        properties.get_relative_size("relative_margin_right", @filename)
+      end
+
+      def relative_padding_top
+        properties.get_relative_size("relative_padding_top", @filename)
+      end
+
+      def relative_padding_bottom
+        properties.get_relative_size("relative_padding_bottom", @filename)
+      end
+
+      def relative_padding_left
+        properties.get_relative_size("relative_padding_left", @filename)
+      end
+
+      def relative_padding_right
+        properties.get_relative_size("relative_padding_right", @filename)
       end
 
       alias _compile compile
@@ -113,32 +119,34 @@ module Rabbit
         adjust_size(canvas, @x, @y, @w, @h)
       end
 
+      alias_method :width_without_padding, :width
       def width
         super + @padding_left + @padding_right
       end
 
+      alias_method :height_without_padding, :height
       def height
         super + @padding_top + @padding_bottom
       end
 
       def as_large_as_possible?
-        @as_large_as_possible
+        properties.get_boolean("as_large_as_possible")
       end
 
       private
-      def setup_draw_parameters(prop)
+      def setup_draw_parameters
         @draw_parameters = {}
 
-        @draw_parameters[:reflect] = {} if true_value?(prop["reflect"])
+        @draw_parameters[:reflect] = {} if properties.get_boolean("reflect")
         [:ratio, :alpha].each do |key|
           name = "reflect_#{key}"
-          value = prop[name]
+          value = self[name]
           next unless value
           @draw_parameters[:reflect] ||= {}
           @draw_parameters[:reflect][key] = Float(value)
         end
 
-        alpha = prop["alpha"]
+        alpha = self["alpha"]
         @draw_parameters[:alpha] = Float(alpha) if alpha
       end
 
@@ -151,24 +159,24 @@ module Rabbit
 
       def adjust_margin(w, h)
         @margin_top =
-          make_relative_size(@relative_margin_top, h) || @margin_top
+          relative_margin_top&.resolve(h) || @margin_top
         @margin_bottom =
-          make_relative_size(@relative_margin_bottom, h) || @margin_bottom
+          relative_margin_bottom&.resolve(h) || @margin_bottom
         @margin_left =
-          make_relative_size(@relative_margin_left, w) || @margin_left
+          relative_margin_left&.resolve(w) || @margin_left
         @margin_right =
-          make_relative_size(@relative_margin_right, w) || @margin_right
+          relative_margin_right&.resolve(w) || @margin_right
       end
 
       def adjust_padding(w, h)
         @padding_top =
-          make_relative_size(@relative_padding_top, h) || @padding_top
+          relative_padding_top&.resolve(h) || @padding_top
         @padding_bottom =
-          make_relative_size(@relative_padding_bottom, h) || @padding_bottom
+          relative_padding_bottom&.resolve(h) || @padding_bottom
         @padding_left =
-          make_relative_size(@relative_padding_left, w) || @padding_left
+          relative_padding_left&.resolve(w) || @padding_left
         @padding_right =
-          make_relative_size(@relative_padding_right, w) || @padding_right
+          relative_padding_right&.resolve(w) || @padding_right
       end
 
       def adjust_size(canvas, x, y, w, h)
@@ -177,7 +185,7 @@ module Rabbit
         adjust_margin(base_w, base_h)
         adjust_padding(base_w, base_h)
         base_h = base_h - @padding_top - @padding_bottom
-        if @as_large_as_possible
+        if as_large_as_possible?
           iw = base_w - x
           ih = base_h - y
           if iw.to_f / original_width > ih.to_f / original_height
@@ -186,26 +194,68 @@ module Rabbit
             ih = nil
           end
         else
-          nw = make_normalized_size(@normalized_width)
-          nh = make_normalized_size(@normalized_height)
-          rw = make_relative_size(@relative_width, base_w)
-          rh = make_relative_size(@relative_height, base_h)
-          iw = nw || rw
-          ih = nh || rh
+          iw = relative_width&.resolve(base_w)
+          ih = relative_height&.resolve(base_h)
         end
         resize(iw, ih)
       end
 
-      def make_normalized_size(size)
-        size && screen_size(size)
+      def draw_properties(canvas, base_x, base_y, base_w, base_h)
+        properties.draws.each do |type, *args|
+          case type
+          when "line"
+            if args.last.is_a?(Hash)
+              params = args.pop
+            else
+              params = nil
+            end
+            points = args.each_slice(2).collect do |x, y|
+              x = (x * width_without_padding) + base_x
+              y = (y * height_without_padding) + base_y
+              [x, y]
+            end
+            params = normalize_params(params)
+            color = params.delete(:color) || "black"
+            canvas.draw_lines(points, color, params)
+          when "rectangle"
+            filled, x, y, w, h, params = args
+            x = (x * width_without_padding) + base_x
+            y = (y * height_without_padding) + base_y
+            w = (w * width_without_padding)
+            h = (h * height_without_padding)
+            params = normalize_params(params)
+            color = params.delete(:color) || "black"
+            canvas.draw_rectangle(filled, x, y, w, h, color, params)
+          when "text"
+            text, x, y, params = args
+            params = normalize_params(params)
+            layout = canvas.make_layout(markup_text(text, params))
+            x = (x * width_without_padding) + base_x
+            y = (y * height_without_padding) + base_y
+            color = params.delete(:color) || "black"
+            canvas.draw_layout(layout, x, y, color, params)
+          end
+        end
       end
 
-      def make_relative_size(size, parent_size)
-        size && parent_size && ((size / 100.0) * parent_size).ceil
+      def normalize_params(params)
+        return {} if params.nil?
+        normalized_params = {}
+        params.each do |key, value|
+          normalized_params[key.to_sym] = value
+        end
+        normalized_params
       end
 
-      def true_value?(value)
-        value == true or value == "true"
+      def markup_text(text, props)
+        props.each do |name, value|
+          formatter_name = Utils.to_class_name(name.to_s)
+          next unless Format.const_defined?(formatter_name)
+          formatter = Format.const_get(formatter_name).new(value)
+          next unless formatter.text_formatter?
+          text = formatter.format(text)
+        end
+        text
       end
     end
   end