write_xlsx 1.00.0 → 1.01.0

data/lib/write_xlsx/sheets.rb

@@ -230,10 +230,20 @@ def check_valid_sheetname(name)
         raise 'Invalid character []:*?/\\ in worksheet name: ' + name
       end
 
+      # Check that sheetname doesn't start or end with an apostrophe.
+      if name =~ /^'/ || name =~ /'$/
+        raise "Worksheet name #{name} cannot start or end with an "
+      end
+
+      # Check that sheetname isn't a reserved word.
+      if name =~ /history/i
+        raise "Worksheet name cannot be Excel reserved word 'History'"
+      end
+
       # Check that the worksheet name doesn't already exist since this is a fatal
       # error in Excel 97. The check must also exclude case insensitive matches.
       unless is_sheetname_uniq?(name)
-        raise "Worksheet name '#{name}', with case ignored, is already used."
+        raise "apostropheWorksheet name '#{name}', with case ignored, is already used."
       end
     end
 

data/lib/write_xlsx/sparkline.rb

@@ -9,7 +9,7 @@ module Writexlsx
   # Used in conjunction with WriteXLSX.
   #
   # Copyright 2000-2012, John McNamara, jmcnamara@cpan.org
-  # Converted to ruby by Hideo NAKAMURA, cxn03651@msj.biglobe.ne.jp
+  # Converted to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
   #
   class Sparkline
     include Writexlsx::Utility

data/lib/write_xlsx/utility.rb

@@ -785,14 +785,14 @@ def params_to_font(params)
     #
     # Write the <c:txPr> element.
     #
-    def write_tx_pr(horiz, font) # :nodoc:
+    def write_tx_pr(is_y_axis, font) # :nodoc:
       rotation = nil
       if font && font[:_rotation]
         rotation = font[:_rotation]
       end
       @writer.tag_elements('c:txPr') do
         # Write the a:bodyPr element.
-        write_a_body_pr(rotation, horiz)
+        write_a_body_pr(rotation, is_y_axis)
         # Write the a:lstStyle element.
         write_a_lst_style
         # Write the a:p element.
@@ -803,11 +803,23 @@ def write_tx_pr(horiz, font) # :nodoc:
     #
     # Write the <a:bodyPr> element.
     #
-    def write_a_body_pr(rot, horiz = nil) # :nodoc:
-      rot = -5400000 if !rot && ptrue?(horiz)
+    def write_a_body_pr(rot, is_y_axis = nil) # :nodoc:
+      rot = -5400000 if !rot && ptrue?(is_y_axis)
       attributes = []
-      attributes << ['rot',  rot]   if rot
-      attributes << ['vert', 'horz'] if ptrue?(horiz)
+      if rot
+        if rot == 16_200_000
+          # 270 deg/stacked angle.
+          attributes << ['rot',  0]
+          attributes << ['vert', 'wordArtVert']
+        elsif rot == 16_260_000
+          # 271 deg/stacked angle.
+          attributes << ['rot',  0]
+          attributes << ['vert', 'eaVert']
+        else
+          attributes << ['rot',  rot]
+          attributes << ['vert', 'horz']
+        end
+      end
 
       @writer.empty_tag('a:bodyPr', attributes)
     end

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "1.00.0"
+WriteXLSX_VERSION = "1.01.0"

data/lib/write_xlsx/workbook.rb

@@ -1924,7 +1924,7 @@ def prepare_drawings #:nodoc:
         shape_count = sheet.shapes.size
         header_image_count = sheet.header_images.size
         footer_image_count = sheet.footer_images.size
-        has_drawing = false
+        has_drawings = false
 
         # Check that some image or drawing needs to be processed.
         next if chart_count + image_count + shape_count + header_image_count + footer_image_count == 0
@@ -1932,7 +1932,7 @@ def prepare_drawings #:nodoc:
         # Don't increase the drawing_id header/footer images.
         if chart_count + image_count + shape_count > 0
           drawing_id += 1
-          has_drawing = true
+          has_drawings = true
         end
 
         # Prepare the worksheet charts.
@@ -1981,9 +1981,9 @@ def prepare_drawings #:nodoc:
                                      name, type, position, x_dpi, y_dpi)
         end
 
-        if has_drawing
-          drawing = sheet.drawing
-          @drawings << drawing
+        if has_drawings
+          drawings = sheet.drawings
+          @drawings << drawings
         end
       end
 

data/lib/write_xlsx/worksheet.rb

@@ -285,7 +285,7 @@ class Worksheet
     PADDING         = 5                       # :nodoc:
 
     attr_reader :index # :nodoc:
-    attr_reader :charts, :images, :tables, :shapes, :drawing # :nodoc:
+    attr_reader :charts, :images, :tables, :shapes, :drawings # :nodoc:
     attr_reader :header_images, :footer_images # :nodoc:
     attr_reader :vml_drawing_links # :nodoc:
     attr_reader :vml_data_id # :nodoc:
@@ -365,6 +365,7 @@ def initialize(workbook, index, name) #:nodoc:
       @original_row_height    = 15
       @default_row_height     = 15
       @default_row_pixels     = 20
+      @default_col_width      = 8.43
       @default_col_pixels     = 64
       @default_row_rezoed     = 0
 
@@ -768,10 +769,10 @@ def set_column(*args)
 
       # Store the col sizes for use when calculating image vertices taking
       # hidden columns into account. Also store the column formats.
-      width = 0 if ptrue?(hidden)         # Set width to zero if hidden
+      width = @default_col_width unless width
 
       (firstcol .. lastcol).each do |col|
-        @col_sizes[col]   = width
+        @col_sizes[col]   = [width, hidden]
         @col_formats[col] = format if format
       end
     end
@@ -2169,7 +2170,7 @@ def write_comment(*args)
       @has_vml = true
 
       # Process the properties of the cell comment.
-      @comments.add(Package::Comment.new(@workbook, self, row, col, string, options))
+      @comments.add(@workbook, self, row, col, string, options)
     end
 
     #
@@ -2781,7 +2782,7 @@ def write_url(*args)
       store_hyperlink(row, col, hyperlink)
 
       if hyperlinks_count > 65_530
-        raise "URL '#{url}' added but number of URLS is over Excel's limit of 65,530 URLS per worksheet."
+        raise "URL '#{url}' added but URL exceeds Excel's limit of 65,530 URLs per worksheet."
       end
 
       # Add the default URL format.
@@ -2990,13 +2991,25 @@ def write_date_time(*args)
     #
     def insert_chart(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, chart, x_offset, y_offset, x_scale, y_scale = row_col_notation(args)
+      row, col, chart, *options = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, chart].include?(nil)
 
+      if options.first.class == Hash
+        params = options.first
+        x_offset = params[:x_offset]
+        y_offset = params[:y_offset]
+        x_scale  = params[:x_scale]
+        y_scale  = params[:y_scale]
+        anchor   = params[:object_position]
+
+      else
+        x_offset, y_offset, x_scale, y_scale, anchor = options
+      end
       x_offset ||= 0
       y_offset ||= 0
       x_scale  ||= 1
       y_scale  ||= 1
+      anchor   ||= 1
 
       raise "Not a Chart object in insert_chart()" unless chart.is_a?(Chart) || chart.is_a?(Chartsheet)
       raise "Not a embedded style Chart object in insert_chart()" if chart.respond_to?(:embedded) && chart.embedded == 0
@@ -3014,61 +3027,36 @@ def insert_chart(*args)
       x_offset = chart.x_offset if ptrue?(chart.x_offset)
       y_offset = chart.y_offset if ptrue?(chart.y_offset)
 
-      @charts << [row, col, chart, x_offset, y_offset, x_scale, y_scale]
+      @charts << [row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor]
     end
 
     #
     # :call-seq:
-    #   insert_image(row, column, filename, x=0, y=0, x_scale=1, y_scale=1)
-    #
-    # Partially supported. Currently only works for 96 dpi images.
-    #
-    # This method can be used to insert a image into a worksheet. The image
-    # can be in PNG, JPEG or BMP format. The x, y, x_scale and y_scale
-    # parameters are optional.
-    #
-    #     worksheet1.insert_image('A1', 'ruby.bmp')
-    #     worksheet2.insert_image('A1', '../images/ruby.bmp')
-    #     worksheet3.insert_image('A1', '.c:\images\ruby.bmp')
-    #
-    # The parameters +x+ and +y+ can be used to specify an offset from the top
-    # left hand corner of the cell specified by +row+ and +column+. The offset
-    # values are in pixels.
-    #
-    #     worksheet1.insert_image('A1', 'ruby.bmp', 32, 10)
-    #
-    # The offsets can be greater than the width or height of the underlying
-    # cell. This can be occasionally useful if you wish to align two or more
-    # images relative to the same cell.
-    #
-    # The parameters +x_scale+ and +y_scale+ can be used to scale the inserted
-    # image horizontally and vertically:
-    #
-    #     # Scale the inserted image: width x 2.0, height x 0.8
-    #     worksheet.insert_image('A1', 'perl.bmp', 0, 0, 2, 0.8)
-    #
-    # Note: you must call set_row() or set_column() before insert_image()
-    # if you wish to change the default dimensions of any of the rows or
-    # columns that the image occupies. The height of a row can also change
-    # if you use a font that is larger than the default. This in turn will
-    # affect the scaling of your image. To avoid this you should explicitly
-    # set the height of the row using set_row() if it contains a font size
-    # that will change the row height.
-    #
-    # BMP images must be 24 bit, true colour, bitmaps. In general it is
-    # best to avoid BMP images since they aren't compressed.
+    #   insert_image(row, column, filename, options)
     #
     def insert_image(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row, col, image, x_offset, y_offset, x_scale, y_scale = row_col_notation(args)
+      row, col, image, *options = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, image].include?(nil)
 
+      if options.first.class == Hash
+        # Newer hash bashed options
+        params = options.first
+        x_offset = params[:x_offset]
+        y_offset = params[:y_offset]
+        x_scale  = params[:x_scale]
+        y_scale  = params[:y_scale]
+        anchor   = params[:object_position]
+      else
+        x_offset, y_offset, x_scale, y_scale, anchor = options
+      end
       x_offset ||= 0
       y_offset ||= 0
       x_scale  ||= 1
       y_scale  ||= 1
+      anchor   ||= 2
 
-      @images << [row, col, image, x_offset, y_offset, x_scale, y_scale]
+      @images << [row, col, image, x_offset, y_offset, x_scale, y_scale, anchor]
     end
 
     #
@@ -3306,10 +3294,8 @@ def set_row(*args)
       # Store the row change to allow optimisations.
       @row_size_changed = true
 
-      height = 0 if ptrue?(hidden)
-
       # Store the row sizes for use when calculating image vertices.
-      @row_sizes[row] = height
+      @row_sizes[row] = [height, hidden]
     end
 
     #
@@ -5724,7 +5710,7 @@ def set_external_comment_links(comment_id) # :nodoc:
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       drawing_type = 1
 
-      row, col, chart, x_offset, y_offset, x_scale, y_scale  = @charts[index]
+      row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor  = @charts[index]
       chart.id = chart_id - 1
       x_scale ||= 0
       y_scale ||= 0
@@ -5736,22 +5722,21 @@ def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       width  = (0.5 + (width  * x_scale)).to_i
       height = (0.5 + (height * y_scale)).to_i
 
-      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height)
+      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height, anchor)
 
       # Set the chart name for the embedded object if it has been specified.
       name = chart.name
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      if !drawing?
-        drawing = Drawing.new
-        drawing.add_drawing_object(drawing_type, dimensions, 0, 0, name)
-        drawing.embedded = 1
-
-        @drawing = drawing
+      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor)
+      if !drawings?
+        @drawings = Drawings.new
+        @drawings.add_drawing_object(drawing)
+        @drawings.embedded = 1
 
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml" ]
       else
-        @drawing.add_drawing_object(drawing_type, dimensions, 0, 0, name)
+        @drawings.add_drawing_object(drawing)
       end
       @drawing_links << ['/chart', "../charts/chart#{chart_id}.xml"]
     end
@@ -5822,6 +5807,10 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     # The values of col_start and row_start are passed in from the calling
     # function. The values of col_end and row_end are calculated by subtracting
     # the width and height of the object from the width and height of the
+    # The anchor/object position defines how images are scaled for hidden rows and
+    # columns. For option 1 "Move and size with cells" the size of the hidden
+    # row/column is subtracted from the image.
+    #
     # underlying cells.
     #
     #    col_start    # Col containing upper left corner of object.
@@ -5834,7 +5823,7 @@ def get_range_data(row_start, col_start, row_end, col_end) # :nodoc:
     #    y2           # Distance to bottom of object.
     #    width        # Width of object frame.
     #    height       # Height of object frame.
-    def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
+    def position_object_pixels(col_start, row_start, x1, y1, width, height, anchor = nil) #:nodoc:
       # Adjust start column for negative offsets.
       while x1 < 0 && col_start > 0
         x1 += size_col(col_start - 1)
@@ -5853,7 +5842,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
 
       # Calculate the absolute x offset of the top-left vertex.
       if @col_size_changed
-        x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col)}
+        x_abs = (0 .. col_start-1).inject(0) {|sum, col| sum += size_col(col, anchor)}
       else
         # Optimisation for when the column widths haven't changed.
         x_abs = @default_col_pixels * col_start
@@ -5863,7 +5852,7 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       # Calculate the absolute y offset of the top-left vertex.
       # Store the column change to allow optimisations.
       if @row_size_changed
-        y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row)}
+        y_abs = (0 .. row_start-1).inject(0) {|sum, row| sum += size_row(row, anchor)}
       else
         # Optimisation for when the row heights haven't changed.
         y_abs = @default_row_pixels * row_start
@@ -5872,12 +5861,18 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
 
       # Adjust start column for offsets that are greater than the col width.
       if size_col(col_start) > 0
-        x1, col_start = adjust_column_offset(x1, col_start)
+        while x1 >= size_col(col_start)
+          x1 -= size_col(col_start)
+          col_start += 1
+        end
       end
 
       # Adjust start row for offsets that are greater than the row height.
       if size_row(row_start) > 0
-        y1, row_start = adjust_row_offset(y1, row_start)
+        while y1 >= size_row(row_start)
+          y1 -= size_row(row_start)
+          row_start += 1
+        end
       end
 
       # Initialise end cell to the same as the start cell.
@@ -5888,10 +5883,16 @@ def position_object_pixels(col_start, row_start, x1, y1, width, height) #:nodoc:
       height += y1 if size_row(row_start) > 0
 
       # Subtract the underlying cell widths to find the end cell of the object.
-      width, col_end = adjust_column_offset(width, col_end)
+      while width >= size_col(col_end, anchor)
+        width -= size_col(col_end, anchor)
+        col_end += 1
+      end
 
       # Subtract the underlying cell heights to find the end cell of the object.
-      height, row_end = adjust_row_offset(height, row_end)
+      while height >= size_row(row_end, anchor)
+        height -= size_row(row_end, anchor)
+        row_end += 1
+      end
 
       # The end vertices are whatever is left from the width and height.
       x2 = width
@@ -6351,32 +6352,16 @@ def sort_pagebreaks(*args) #:nodoc:
       end
     end
 
-    def adjust_column_offset(x, column)
-      while x >= size_col(column)
-        x -= size_col(column)
-        column += 1
-      end
-      [x, column]
-    end
-
-    def adjust_row_offset(y, row)
-      while y >= size_row(row)
-        y -= size_row(row)
-        row += 1
-      end
-      [y, row]
-    end
-
     #
     # Calculate the vertices that define the position of a graphical object within
     # the worksheet in EMUs.
     #
     # The vertices are expressed as English Metric Units (EMUs). There are 12,700
-    # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per pixel.
+    # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per el.
     #
-    def position_object_emus(col_start, row_start, x1, y1, width, height, x_dpi = 96, y_dpi = 96) #:nodoc:
+    def position_object_emus(col_start, row_start, x1, y1, width, height, anchor = nil) #:nodoc:
       col_start, row_start, x1, y1, col_end, row_end, x2, y2, x_abs, y_abs =
-        position_object_pixels(col_start, row_start, x1, y1, width, height)
+        position_object_pixels(col_start, row_start, x1, y1, width, height, anchor)
 
       # Convert the pixel values to EMUs. See above.
       x1    = (0.5 + 9_525 * x1).to_i
@@ -6392,15 +6377,16 @@ def position_object_emus(col_start, row_start, x1, y1, width, height, x_dpi = 96
     #
     # Convert the width of a cell from user's units to pixels. Excel rounds the
     # column width to the nearest pixel. If the width hasn't been set by the user
-    # we use the default value. If the column is hidden it has a value of zero.
+    # we use the default value. A hidden column is treated as having a width of
+    # zero unless it has the special "object_position" of 4 (size with cells).
     #
-    def size_col(col) #:nodoc:
+    def size_col(col, anchor = 0) #:nodoc:
       # Look up the cell value to see if it has been changed.
       if @col_sizes[col]
-        width = @col_sizes[col]
+        width, hidden = @col_sizes[col]
 
         # Convert to pixels.
-        if width == 0
+        if hidden == 1 && anchor != 4
           pixels = 0
         elsif width < 1
           pixels = (width * (MAX_DIGIT_WIDTH + PADDING) + 0.5).to_i
@@ -6415,15 +6401,16 @@ def size_col(col) #:nodoc:
 
     #
     # Convert the height of a cell from user's units to pixels. If the height
-    # hasn't been set by the user we use the default value. If the row is hidden
-    # it has a value of zero.
+    # hasn't been set by the user we use the default value. A hidden row is
+    # treated as having a height of zero unless it has the special
+    # "object_position" of 4 (size with cells).
     #
-    def size_row(row) #:nodoc:
+    def size_row(row, anchor = 0) #:nodoc:
       # Look up the cell value to see if it has been changed
       if @row_sizes[row]
-        height = @row_sizes[row]
+        height, hidden = @row_sizes[row]
 
-        if height == 0
+        if hidden == 1 && anchor != 4
           pixels = 0
         else
           pixels = (4 / 3.0 * height).to_i
@@ -6441,9 +6428,8 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       x_dpi ||= 96
       y_dpi ||= 96
       drawing_type = 2
-      drawing
 
-      row, col, image, x_offset, y_offset, x_scale, y_scale = @images[index]
+      row, col, image, x_offset, y_offset, x_scale, y_scale, anchor = @images[index]
 
       width  *= x_scale
       height *= y_scale
@@ -6451,24 +6437,25 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       width  *= 96.0 / x_dpi
       height *= 96.0 / y_dpi
 
-      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height)
+      dimensions = position_object_emus(col, row, x_offset, y_offset, width, height, anchor)
 
       # Convert from pixels to emus.
       width  = (0.5 + (width  * 9_525)).to_i
       height = (0.5 + (height * 9_525)).to_i
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      if !drawing?
-        drawing = Drawing.new
-        drawing.embedded = 1
+      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor)
+      if !drawings?
+        drawings = Drawings.new
+        drawings.embedded = 1
 
-        @drawing = drawing
+        @drawings = drawings
 
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
       else
-        drawing = @drawing
+        drawings = @drawings
       end
-      drawing.add_drawing_object(drawing_type, dimensions, width, height, name)
+      drawings.add_drawing_object(drawing)
 
       @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"]
     end
@@ -6523,16 +6510,16 @@ def prepare_header_image(image_id, width, height, name, image_type, position, x_
     #
     def insert_shape(*args)
       # Check for a cell reference in A1 notation and substitute row and column.
-      row_start, column_start, shape, x_offset, y_offset, x_scale, y_scale =
+      row_start, column_start, shape, x_offset, y_offset, x_scale, y_scale, anchor =
         row_col_notation(args)
       if [row_start, column_start, shape].include?(nil)
         raise "Insufficient arguments in insert_shape()"
       end
 
       shape.set_position(
-                           row_start, column_start, x_offset, y_offset,
-                           x_scale, y_scale
-                           )
+        row_start, column_start, x_offset, y_offset,
+        x_scale, y_scale, anchor
+      )
       # Assign a shape ID.
       while true
         id = shape.id || 0
@@ -6576,9 +6563,9 @@ def prepare_shape(index, drawing_id)
       shape = @shapes[index]
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      unless drawing?
-        @drawing = Drawing.new
-        @drawing.embedded = 1
+      unless drawings?
+        @drawings = Drawings.new
+        @drawings.embedded = 1
         @external_drawing_links << ['/drawing', "../drawings/drawing#{drawing_id}.xml"]
         @has_shapes = true
       end
@@ -6588,13 +6575,14 @@ def prepare_shape(index, drawing_id)
       shape.calc_position_emus(self)
 
       drawing_type = 3
-      drawing.add_drawing_object(drawing_type, shape.dimensions, shape.name, shape)
+      drawing = Drawing.new(drawing_type, shape.dimensions, shape.width_emu, shape.height_emu, shape.name, shape, shape.anchor)
+      drawings.add_drawing_object(drawing)
     end
     public :prepare_shape
 
     #
     # This method handles the parameters passed to insert_button as well as
-    # calculating the comment object position and vertices.
+    # calculating the button object position and vertices.
     #
     def button_params(row, col, params)
       button = Writexlsx::Package::Button.new
@@ -6623,7 +6611,7 @@ def button_params(row, col, params)
       params[:x_offset] = 0 if !params[:x_offset]
       params[:y_offset] = 0 if !params[:y_offset]
 
-      # Scale the size of the comment box if required.
+      # Scale the size of the button box if required.
       if params[:x_scale]
         params[:width] = params[:width] * params[:x_scale]
       end
@@ -6638,15 +6626,15 @@ def button_params(row, col, params)
       params[:start_row] = row
       params[:start_col] = col
 
-      # Calculate the positions of comment object.
+      # Calculate the positions of button object.
       vertices = position_object_pixels(
-                                        params[:start_col],
-                                        params[:start_row],
-                                        params[:x_offset],
-                                        params[:y_offset],
-                                        params[:width],
-                                        params[:height]
-                                        )
+        params[:start_col],
+        params[:start_row],
+        params[:x_offset],
+        params[:y_offset],
+        params[:width],
+        params[:height]
+      )
 
       # Add the width and height for VML.
       vertices << [params[:width], params[:height]]
@@ -6886,7 +6874,7 @@ def col_info_attributes(args)
       custom_width = false if width.nil? && hidden == 0
       custom_width = false if width == 8.43
 
-      width = hidden == 0 ? 8.43 : 0 unless width
+      width = hidden == 0 ? @default_col_width : 0 unless width
 
       # Convert column width from user units to character width.
       if width && width < 1
@@ -7496,7 +7484,7 @@ def write_sheet_protection #:nodoc:
     # Write the <drawing> elements.
     #
     def write_drawings #:nodoc:
-      increment_rel_id_and_write_r_id('drawing') if drawing?
+      increment_rel_id_and_write_r_id('drawing') if drawings?
     end
 
     #
@@ -7974,8 +7962,8 @@ def autofilter_ref? #:nodoc:
       !!@autofilter_ref
     end
 
-    def drawing? #:nodoc:
-      !!@drawing
+    def drawings? #:nodoc:
+      !!@drawings
     end
 
     def remove_white_space(margin) #:nodoc: