rmagick 2.16.0 → 3.0.0

data/lib/rvg/pathdata.rb

@@ -12,12 +12,10 @@ module Magick
       private
 
       def add_points(req, *coords)
-        if coords
-          if coords.length % req != 0
-            fail ArgumentError, "wrong number of coordinates specified. A multiple of #{req} required, #{req+coords.length} given."
-          end
-          coords.each {|c| @path << ('%g' % c)}
-        end
+        return unless coords
+        raise ArgumentError, "wrong number of coordinates specified. A multiple of #{req} required, #{req + coords.length} given." if coords.length % req != 0
+
+        coords.each { |c| @path << format('%g', c) }
       end
 
       public
@@ -32,7 +30,7 @@ module Magick
         @path
       end
 
-      def deep_copy(h = nil)  #:nodoc:
+      def deep_copy(_h = nil) #:nodoc:
         @path.dup
       end
 
@@ -40,14 +38,14 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def moveto(abs, x, y, *coords)
-        @path << sprintf('%s%g,%g ', (abs ? 'M' : 'm'), x, y)
+        @path << format('%s%g,%g ', (abs ? 'M' : 'm'), x, y)
         # "subsequent pairs are treated as implicit lineto commands"
         add_points(2, *coords)
       end
 
       # Add a <tt>closepath</tt> command. The <tt>abs</tt> argument
       # is ignored.
-      def closepath(abs = true)
+      def closepath(_abs = true)
         @path << 'Z' # ignore `abs'
       end
 
@@ -56,7 +54,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def lineto(abs, x, y, *coords)
-        @path << sprintf('%s%g,%g ', (abs ? 'L' : 'l'), x, y)
+        @path << format('%s%g,%g ', (abs ? 'L' : 'l'), x, y)
         # "a number of coordinate pairs may be specified to draw a polyline"
         add_points(2, *coords)
       end
@@ -65,14 +63,14 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def hlineto(abs, x)
-        @path << sprintf('%s%g ', (abs ? 'H' : 'h'), x)
+        @path << format('%s%g ', (abs ? 'H' : 'h'), x)
       end
 
       # Add a <tt>vertical lineto</tt> command. If <tt>abs</tt> is
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def vlineto(abs, y)
-        @path << sprintf('%s%g ', (abs ? 'V' : 'v'), y)
+        @path << format('%s%g ', (abs ? 'V' : 'v'), y)
       end
 
       # Add a <tt>curveto</tt> (<em>cubic Bezier</em>) command.
@@ -80,7 +78,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def curveto(abs, x1, y1, x2, y2, x, y, *coords)
-        @path << sprintf('%s%g,%g %g,%g %g,%g ', (abs ? 'C' : 'c'), x1, y1, x2, y2, x, y)
+        @path << format('%s%g,%g %g,%g %g,%g ', (abs ? 'C' : 'c'), x1, y1, x2, y2, x, y)
         # "multiple sets of coordinates may be specified to draw a polybezier"
         add_points(6, *coords)
       end
@@ -90,7 +88,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def smooth_curveto(abs, x2, y2, x, y, *coords)
-        @path << sprintf('%s%g,%g %g,%g ', (abs ? 'S' : 's'), x2, y2, x, y)
+        @path << format('%s%g,%g %g,%g ', (abs ? 'S' : 's'), x2, y2, x, y)
         # "multiple sets of coordinates may be specified to draw a polybezier"
         add_points(4, *coords)
       end
@@ -100,7 +98,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def quadratic_curveto(abs, x1, y1, x, y, *coords)
-        @path << sprintf('%s%g,%g %g,%g ', (abs ? 'Q' : 'q'), x1, y1, x, y)
+        @path << format('%s%g,%g %g,%g ', (abs ? 'Q' : 'q'), x1, y1, x, y)
         add_points(4, *coords)
       end
 
@@ -109,7 +107,7 @@ module Magick
       # <tt>true</tt> the coordinates are absolute, otherwise
       # the coordinates are relative.
       def smooth_quadratic_curveto(abs, x, y, *coords)
-        @path << sprintf('%s%g,%g ', (abs ? 'T' : 't'), x, y)
+        @path << format('%s%g,%g ', (abs ? 'T' : 't'), x, y)
         add_points(2, *coords)
       end
 
@@ -119,7 +117,7 @@ module Magick
       # the coordinates are relative.
 
       def arc(abs, rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
-        @path << sprintf('%s%g,%g %g %d %d %g,%g ', (abs ? 'A' : 'a'), rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
+        @path << format('%s%g,%g %g %d %d %g,%g ', (abs ? 'A' : 'a'), rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, x, y)
       end
     end # class PathData
   end # class RVG

data/lib/rvg/rvg.rb

@@ -60,7 +60,7 @@ module Magick
     # else, combine it with the background_fill_opacity.
     def bgfill
       if @background_fill.nil?
-        color = Magick::Pixel.new(0,0,0,Magick::TransparentOpacity)
+        color = Magick::Pixel.new(0, 0, 0, Magick::TransparentOpacity)
       else
         color = @background_fill
         color.opacity = (1.0 - @background_fill_opacity) * Magick::TransparentOpacity
@@ -72,28 +72,28 @@ module Magick
       if @background_pattern
         canvas = Magick::Image.new(@width, @height, @background_pattern)
       elsif @background_image
-        if @width != @background_image.columns || @height != @background_image.rows
-          canvas = case @background_position
-            when :scaled
-              @background_image.resize(@width, @height)
-            when :tiled
-              Magick::Image.new(@width, @height, Magick::TextureFill.new(@background_image))
-            when :fit
-              width = @width
-              height = @height
-              bgcolor = bgfill
-              @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
-                bg_image = @background_image.resize(new_cols, new_rows)
-                if bg_image.columns != width || bg_image.rows != height
-                  bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
-                  bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
-                end
-                bg_image
-              end
-          end
-        else
-          canvas = @background_image.copy
-        end
+        canvas = if @width != @background_image.columns || @height != @background_image.rows
+                   case @background_position
+                   when :scaled
+                     @background_image.resize(@width, @height)
+                   when :tiled
+                     Magick::Image.new(@width, @height, Magick::TextureFill.new(@background_image))
+                   when :fit
+                     width = @width
+                     height = @height
+                     bgcolor = bgfill
+                     @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
+                       bg_image = @background_image.resize(new_cols, new_rows)
+                       if bg_image.columns != width || bg_image.rows != height
+                         bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
+                         bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
+                       end
+                       bg_image
+                     end
+                   end
+                 else
+                   @background_image.copy
+                 end
       else
         bgcolor = bgfill
         canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
@@ -110,7 +110,7 @@ module Magick
         indent = 0
         primitives.each do |cmd|
           indent -= 1 if cmd['pop ']
-          print(('   '*indent), cmd, "\n")
+          print(('   ' * indent), cmd, "\n")
           indent += 1 if cmd['push ']
         end
       end
@@ -118,7 +118,7 @@ module Magick
 
     public
 
-    WORD_SEP = / /     # Regexp to separate words
+    WORD_SEP = / / # Regexp to separate words
 
     # The background image specified by background_image=
     attr_reader :background_image
@@ -139,9 +139,8 @@ module Magick
     # Sets an image to use as the canvas background. See background_position= for layout options.
     def background_image=(bg_image)
       warn 'background_image= has no effect in nested RVG objects' if @nested
-      if bg_image && !bg_image.is_a?(Magick::Image)
-        fail ArgumentError, "background image must be an Image (got #{bg_image.class})"
-      end
+      raise ArgumentError, "background image must be an Image (got #{bg_image.class})" if bg_image && !bg_image.is_a?(Magick::Image)
+
       @background_image = bg_image
     end
 
@@ -162,9 +161,8 @@ module Magick
     def background_position=(pos)
       warn 'background_position= has no effect in nested RVG objects' if @nested
       bg_pos = pos.to_s.downcase
-      unless ['scaled', 'tiled', 'fit'].include?(bg_pos)
-        fail ArgumentError, "background position must be `scaled', `tiled', or `fit' (#{pos} given)"
-      end
+      raise ArgumentError, "background position must be `scaled', `tiled', or `fit' (#{pos} given)" unless %w[scaled tiled fit].include?(bg_pos)
+
       @background_position = bg_pos.to_sym
     end
 
@@ -179,7 +177,7 @@ module Magick
           raise ArgumentError, "unknown color `#{color}'"
         rescue TypeError
           raise TypeError, "cannot convert #{color.class} into Pixel"
-        rescue
+        rescue StandardError
           raise ArgumentError, "argument must be a color name or a Pixel (got #{color.class})"
         end
       else
@@ -219,7 +217,7 @@ module Magick
       @content = Content.new
       @canvas = nil
       @background_fill = nil
-      @background_fill_opacity = 1.0  # applies only if background_fill= is used
+      @background_fill_opacity = 1.0 # applies only if background_fill= is used
       @background_position = :scaled
       @background_pattern, @background_image, @desc, @title, @metadata = nil
       @x = 0.0
@@ -231,8 +229,9 @@ module Magick
     # Construct a canvas or reuse an existing canvas.
     # Execute drawing commands. Return the canvas.
     def draw
-      fail StandardError, 'draw not permitted in nested RVG objects' if @nested
-      @canvas ||= new_canvas    # allow drawing over existing canvas
+      raise StandardError, 'draw not permitted in nested RVG objects' if @nested
+
+      @canvas ||= new_canvas # allow drawing over existing canvas
       gc = Utility::GraphicContext.new
       add_outermost_primitives(gc)
       pp(self) if ENV['debug_rvg']
@@ -243,14 +242,14 @@ module Magick
 
     # Accept #use arguments. Use (x,y) to generate an additional translate.
     # Override @width and @height if new values are supplied.
-    def ref(x, y, rw, rh)   #:nodoc:
+    def ref(x, y, rw, rh) #:nodoc:
       translate(x, y) if x != 0 || y != 0
       @width = rw if rw
       @height = rh if rh
     end
 
     # Used by Magick::Embellishable.rvg to set non-0 x- and y-coordinates
-    def corner(x, y)        #:nodoc:
+    def corner(x, y) #:nodoc:
       @nested = true
       @x = Float(x)
       @y = Float(y)
@@ -258,7 +257,7 @@ module Magick
     end
 
     # Primitives for the outermost RVG object
-    def add_outermost_primitives(gc)    #:nodoc:
+    def add_outermost_primitives(gc) #:nodoc:
       add_transform_primitives(gc)
       gc.push
       add_viewbox_primitives(@width, @height, gc)
@@ -269,12 +268,10 @@ module Magick
     end
 
     # Primitives for nested RVG objects
-    def add_primitives(gc)  #:nodoc:
-      if @width.nil? || @height.nil?
-        fail ArgumentError, 'RVG width or height undefined'
-      elsif @width == 0 || @height == 0
-        return self
-      end
+    def add_primitives(gc) #:nodoc:
+      raise ArgumentError, 'RVG width or height undefined' if @width.nil? || @height.nil?
+      return self if @width.zero? || @height.zero?
+
       gc.push
       add_outermost_primitives(gc)
       gc.pop

data/lib/rvg/stretchable.rb

@@ -12,25 +12,23 @@ module Magick
       # [+align+] a combination of 'xMin', 'xMid', or 'xMax', followed by
       #           'YMin', 'YMid', or 'YMax'
       # [+meet_or_slice+] one of 'meet' or 'slice'
-      def preserve_aspect_ratio(align, meet_or_slice='meet')
+      def preserve_aspect_ratio(align, meet_or_slice = 'meet')
         @align = align.to_s
         if @align != 'none'
           m = /\A(xMin|xMid|xMax)(YMin|YMid|YMax)\z/.match(@align)
-          fail(ArgumentError, "unknown alignment specifier: #{@align}") unless m
+          raise(ArgumentError, "unknown alignment specifier: #{@align}") unless m
         end
 
         if meet_or_slice
           meet_or_slice = meet_or_slice.to_s.downcase
-          if meet_or_slice == 'meet' || meet_or_slice == 'slice'
-            @meet_or_slice = meet_or_slice
-          else
-            fail(ArgumentError, "specifier must be `meet' or `slice' (got #{meet_or_slice})")
-          end
+          raise(ArgumentError, "specifier must be `meet' or `slice' (got #{meet_or_slice})") unless %w[meet slice].include?(meet_or_slice)
+
+          @meet_or_slice = meet_or_slice
         end
         yield(self) if block_given?
         self
       end
-    end     # module PreserveAspectRatio
+    end # module PreserveAspectRatio
 
     # The methods in this module describe the user-coordinate space.
     # RVG and Pattern objects are stretchable.
@@ -42,12 +40,8 @@ module Magick
         sx = 1.0
         sy = 1.0
 
-        if @vbx_width
-          sx = width / @vbx_width
-        end
-        if @vbx_height
-          sy = height / @vbx_height
-        end
+        sx = width / @vbx_width if @vbx_width
+        sy = height / @vbx_height if @vbx_height
 
         [sx, sy]
       end
@@ -58,19 +52,19 @@ module Magick
              when /\AxMin/
                0
              when NilClass, /\AxMid/
-               (width - @vbx_width*sx) / 2.0
+               (width - @vbx_width * sx) / 2.0
              when /\AxMax/
-               width - @vbx_width*sx
-        end
+               width - @vbx_width * sx
+             end
 
         ty = case @align
              when /YMin\z/
                0
              when NilClass, /YMid\z/
-               (height - @vbx_height*sy) / 2.0
+               (height - @vbx_height * sy) / 2.0
              when /YMax\z/
-               height - @vbx_height*sy
-        end
+               height - @vbx_height * sy
+             end
         [tx, ty]
       end
 
@@ -120,7 +114,7 @@ module Magick
         gc.translate(-@vbx_x, -@vbx_y) if @vbx_x.abs != 0.0 || @vbx_y.abs != 0
       end
 
-      def initialize(*args, &block)
+      def initialize(*_args)
         super()
         @vbx_x, @vbx_y, @vbx_width, @vbx_height = nil
         @meet_or_slice = 'meet'
@@ -143,17 +137,17 @@ module Magick
         rescue ArgumentError
           raise ArgumentError, "arguments must be convertable to float (got #{x.class}, #{y.class}, #{width.class}, #{height.class})"
         end
-        fail(ArgumentError, "viewbox width must be > 0 (#{width} given)") unless width >= 0
-        fail(ArgumentError, "viewbox height must be > 0 (#{height} given)") unless height >= 0
+        raise(ArgumentError, "viewbox width must be > 0 (#{width} given)") unless width >= 0
+        raise(ArgumentError, "viewbox height must be > 0 (#{height} given)") unless height >= 0
 
         # return the user-coordinate space attributes if defined
         class << self
           unless defined? @redefined
-          @redefined = true
-          define_method(:x) { @vbx_x }
-          define_method(:y) { @vbx_y }
-          define_method(:width) { @vbx_width}
-          define_method(:height) { @vbx_height }
+            @redefined = true
+            define_method(:x) { @vbx_x }
+            define_method(:y) { @vbx_y }
+            define_method(:width) { @vbx_width }
+            define_method(:height) { @vbx_height }
           end
         end
 

data/lib/rvg/stylable.rb

@@ -5,13 +5,13 @@
 module Magick
   class RVG
     #:stopdoc:
-    STYLES = [:clip_path, :clip_rule, :fill, :fill_opacity, :fill_rule, :font,
-          :font_family, :font_size, :font_stretch, :font_style, :font_weight,
-          :opacity, :stroke, :stroke_dasharray, :stroke_dashoffset, :stroke_linecap,
-          :stroke_linejoin, :stroke_miterlimit, :stroke_opacity, :stroke_width,
-          :text_anchor, :text_decoration,
-          :glyph_orientation_vertical, :glyph_orientation_horizontal,
-          :letter_spacing, :word_spacing, :baseline_shift, :writing_mode]
+    STYLES = %i[clip_path clip_rule fill fill_opacity fill_rule font
+                font_family font_size font_stretch font_style font_weight
+                opacity stroke stroke_dasharray stroke_dashoffset stroke_linecap
+                stroke_linejoin stroke_miterlimit stroke_opacity stroke_width
+                text_anchor text_decoration
+                glyph_orientation_vertical glyph_orientation_horizontal
+                letter_spacing word_spacing baseline_shift writing_mode]
 
     Styles = Struct.new(*STYLES)
 
@@ -40,12 +40,12 @@ module Magick
       end
 
       # The "usual" deep_copy method doesn't copy a Struct correctly.
-      def deep_copy(h=nil)
+      def deep_copy(_h = nil)
         copy = Styles.new
         each_pair { |style, value| copy[style] = value }
         copy
       end
-    end     # class Styles
+    end # class Styles
 
     #:startdoc:
 
@@ -111,6 +111,6 @@ module Magick
         yield(self) if block_given?
         self
       end
-    end     # module Stylable
+    end # module Stylable
   end # class RVG
 end # module Magick

data/lib/rvg/text.rb

@@ -4,169 +4,168 @@
 #++
 # Text-related classes
 module Magick
-    class RVG
-        # Base class for Tspan, Tref and Text.
-        class TextBase
-            include Stylable
-            include Duplicatable
-
-          private
-
-            def initialize(text, &block)    #:nodoc:
-                super()
-                @text = text.to_s if text
-                @dx = @dy = 0
-                @rotation = 0
-                @tspans = Content.new
-                yield(self) if block_given?
-            end
-
-          public
-
-            # Create a new text chunk. Each chunk can have its own initial position and styles.
-            # If <tt>x</tt> and <tt>y</tt> are omitted the text starts at the current text
-            # position.
-            def tspan(text, x=nil, y=nil)
-                tspan = Tspan.new(text, x, y)
-                tspan.parent = self
-                @tspans << tspan
-                tspan
-            end
-
-            # Add <tt>x</tt> and <tt>y</tt> to the current text position.
-            def d(x, y=0)
-                @dx, @dy = Magick::RVG.convert_to_float(x, y)
-                yield(self) if block_given?
-                self
-            end
-
-            # Rotate the text about the current text position.
-            def rotate(degrees)
-                @rotation = Magick::RVG.convert_to_float(degrees)[0]
-                yield(self) if block_given?
-                self
-            end
-
-            # We do our own transformations.
-            def add_primitives(gc)  #:nodoc:
-                if @text || @tspans.length > 0
-                    gc.push
-                    x = cx + @dx
-                    y = cy + @dy
-                    if @rotation != 0
-                        gc.translate(x, y)
-                        gc.rotate(@rotation)
-                        gc.translate(-x, -y)
-                    end
-                    add_style_primitives(gc)
-                    if @text
-                        x2, y2 = gc.text(x, y, @text)
-                        self.cx = x + x2
-                        self.cy = y + y2
-                    end
-                    @tspans.each do |tspan|
-                        tspan.add_primitives(gc)
-                    end
-                    gc.pop
-                end
-            end
-        end     # class TextBase
-
-        # Tspan and Tref shared methods - read/update @cx, @cy in parent Text object.
-        module TextLink     #:nodoc:
-            def add_primitives(gc)
-                @parent.cx = @x if @x
-                @parent.cy = @y if @y
-                super
-            end
-
-            def cx
-                @parent.cx
-            end
-
-            def cy
-                @parent.cy
-            end
-
-            def cx=(x)
-                @parent.cx = x
-            end
-
-            def cy=(y)
-                @parent.cy = y
-            end
-        end     # module TextLink
-
-        class Tref < TextBase  #:nodoc:
-            include TextLink
-
-            def initialize(obj, x, y, parent)
-                @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
-                super(nil)
-                @tspans << obj
-                @parent = parent
-            end
-        end     # class Tref
-
-        class Tspan < TextBase  #:nodoc:
-            include TextLink
-
-            attr_accessor :parent
-
-            # Define a text segment starting at (<tt>x</tt>, <tt>y</tt>).
-            # If <tt>x</tt> and <tt>y</tt> are omitted the segment starts
-            # at the current text position.
-            #
-            # Tspan objects can contain Tspan objects.
-            def initialize(text=nil, x=nil, y=nil, &block)
-                @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
-                super(text, &block)
-            end
-        end     # class Tspan
-
-        class Text < TextBase
-            attr_accessor :cx, :cy  #:nodoc:
-
-            # Define a text string starting at [<tt>x</tt>, <tt>y</tt>].
-            # Use the RVG::TextConstructors#text method to create Text objects in a container.
-            #
-            #  container.text(100, 100, "Simple text").styles(:font=>'Arial')
-            #
-            # Text objects can contain Tspan objects.
-            #
-            #  container.text(100, 100).styles(:font=>'Arial') do |t|
-            #     t.tspan("Red text").styles(:fill=>'red')
-            #     t.tspan("Blue text").styles(:fill=>'blue')
-            #  end
-            def initialize(x=0, y=0, text=nil, &block)
-                @cx, @cy = Magick::RVG.convert_to_float(x, y)
-                super(text, &block)
-            end
-
-            # Reference a Tspan object. <tt>x</tt> and <tt>y</tt> are just
-            # like <tt>x</tt> and <tt>y</tt> in RVG::TextBase#tspan
-            def tref(obj, x=nil, y=nil)
-                unless obj.is_a?(Tspan)
-                    fail ArgumentError, "wrong argument type #{obj.class} (expected Tspan)"
-                end
-                obj = obj.deep_copy
-                obj.parent = self
-                tref = Tref.new(obj, x, y, self)
-                @tspans << tref
-                tref
-            end
-        end     # class Text
-
-        # Methods that construct text objects within a container
-        module TextConstructors
-            # Draw a text string at (<tt>x</tt>,<tt>y</tt>). The string can
-            # be omitted. Optionally, define text chunks within the associated
-            # block.
-            def text(x=0, y=0, text=nil, &block)
-                t = Text.new(x, y, text, &block)
-                @content << t
-                t
-            end
-        end     # module TextConstructors
-    end # class RVG
+  class RVG
+    # Base class for Tspan, Tref and Text.
+    class TextBase
+      include Stylable
+      include Duplicatable
+
+      private
+
+      def initialize(text) #:nodoc:
+        super()
+        @text = text.to_s if text
+        @dx = @dy = 0
+        @rotation = 0
+        @tspans = Content.new
+        yield(self) if block_given?
+      end
+
+      public
+
+      # Create a new text chunk. Each chunk can have its own initial position and styles.
+      # If <tt>x</tt> and <tt>y</tt> are omitted the text starts at the current text
+      # position.
+      def tspan(text, x = nil, y = nil)
+        tspan = Tspan.new(text, x, y)
+        tspan.parent = self
+        @tspans << tspan
+        tspan
+      end
+
+      # Add <tt>x</tt> and <tt>y</tt> to the current text position.
+      def d(x, y = 0)
+        @dx, @dy = Magick::RVG.convert_to_float(x, y)
+        yield(self) if block_given?
+        self
+      end
+
+      # Rotate the text about the current text position.
+      def rotate(degrees)
+        @rotation = Magick::RVG.convert_to_float(degrees)[0]
+        yield(self) if block_given?
+        self
+      end
+
+      # We do our own transformations.
+      def add_primitives(gc) #:nodoc:
+        return if !@text && @tspans.empty?
+
+        gc.push
+        x = cx + @dx
+        y = cy + @dy
+        if @rotation != 0
+          gc.translate(x, y)
+          gc.rotate(@rotation)
+          gc.translate(-x, -y)
+        end
+        add_style_primitives(gc)
+        if @text
+          x2, y2 = gc.text(x, y, @text)
+          self.cx = x + x2
+          self.cy = y + y2
+        end
+        @tspans.each do |tspan|
+          tspan.add_primitives(gc)
+        end
+        gc.pop
+      end
+    end # class TextBase
+
+    # Tspan and Tref shared methods - read/update @cx, @cy in parent Text object.
+    module TextLink #:nodoc:
+      def add_primitives(gc)
+        @parent.cx = @x if @x
+        @parent.cy = @y if @y
+        super
+      end
+
+      def cx
+        @parent.cx
+      end
+
+      def cy
+        @parent.cy
+      end
+
+      def cx=(x)
+        @parent.cx = x
+      end
+
+      def cy=(y)
+        @parent.cy = y
+      end
+    end # module TextLink
+
+    class Tref < TextBase #:nodoc:
+      include TextLink
+
+      def initialize(obj, x, y, parent)
+        @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
+        super(nil)
+        @tspans << obj
+        @parent = parent
+      end
+    end # class Tref
+
+    class Tspan < TextBase #:nodoc:
+      include TextLink
+
+      attr_accessor :parent
+
+      # Define a text segment starting at (<tt>x</tt>, <tt>y</tt>).
+      # If <tt>x</tt> and <tt>y</tt> are omitted the segment starts
+      # at the current text position.
+      #
+      # Tspan objects can contain Tspan objects.
+      def initialize(text = nil, x = nil, y = nil, &block)
+        @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
+        super(text, &block)
+      end
+    end # class Tspan
+
+    class Text < TextBase
+      attr_accessor :cx, :cy #:nodoc:
+
+      # Define a text string starting at [<tt>x</tt>, <tt>y</tt>].
+      # Use the RVG::TextConstructors#text method to create Text objects in a container.
+      #
+      #  container.text(100, 100, "Simple text").styles(:font=>'Arial')
+      #
+      # Text objects can contain Tspan objects.
+      #
+      #  container.text(100, 100).styles(:font=>'Arial') do |t|
+      #     t.tspan("Red text").styles(:fill=>'red')
+      #     t.tspan("Blue text").styles(:fill=>'blue')
+      #  end
+      def initialize(x = 0, y = 0, text = nil, &block)
+        @cx, @cy = Magick::RVG.convert_to_float(x, y)
+        super(text, &block)
+      end
+
+      # Reference a Tspan object. <tt>x</tt> and <tt>y</tt> are just
+      # like <tt>x</tt> and <tt>y</tt> in RVG::TextBase#tspan
+      def tref(obj, x = nil, y = nil)
+        raise ArgumentError, "wrong argument type #{obj.class} (expected Tspan)" unless obj.is_a?(Tspan)
+
+        obj = obj.deep_copy
+        obj.parent = self
+        tref = Tref.new(obj, x, y, self)
+        @tspans << tref
+        tref
+      end
+    end # class Text
+
+    # Methods that construct text objects within a container
+    module TextConstructors
+      # Draw a text string at (<tt>x</tt>,<tt>y</tt>). The string can
+      # be omitted. Optionally, define text chunks within the associated
+      # block.
+      def text(x = 0, y = 0, text = nil, &block)
+        t = Text.new(x, y, text, &block)
+        @content << t
+        t
+      end
+    end # module TextConstructors
+  end # class RVG
 end # module Magick