write_xlsx 0.85.9 → 1.09.2

data/lib/write_xlsx/package/table.rb

@@ -10,7 +10,7 @@ module Writexlsx
 
       class ColumnData
         attr_reader :id
-        attr_accessor :name, :format, :formula
+        attr_accessor :name, :format, :formula, :name_format
         attr_accessor :total_string, :total_function
 
         def initialize(id, param = {})
@@ -20,6 +20,7 @@ module Writexlsx
           @total_function = ''
           @formula        = ''
           @format         = nil
+          @name_format    = nil
           @user_data      = param[id-1] if param
         end
       end
@@ -31,8 +32,9 @@ module Writexlsx
         @writer  = Package::XMLWriterSimple.new
 
         @row1, @row2, @col1, @col2, @param = handle_args(*args)
-        @columns = []
+        @columns     = []
         @col_formats = []
+        @seen_name   = {}
 
         # Set the data range rows (without the header and footer).
         @first_data_row = @row1
@@ -93,10 +95,20 @@ module Writexlsx
             if user_data[:header] && !user_data[:header].empty?
               col_data.name = user_data[:header]
             end
+
+            # Excel requires unique case insensitive header names.
+            if @seen_name[col_data.name.downcase]
+              raise "add_table() contains duplicate name: '#{col_data.name}'"
+            else
+              @seen_name[col_data.name.downcase] = true
+            end
+            # Get the header format if defined.
+            col_data.name_format = user_data[:header_format]
+
             # Handle the column formula.
             handle_the_column_formula(
-                                      col_data, col_num, user_data[:formula], user_data[:format]
-                                      )
+              col_data, col_num, user_data[:formula], user_data[:format]
+            )
 
             # Handle the function for the total row.
             if user_data[:total_function]
@@ -105,8 +117,8 @@ module Writexlsx
               )
             elsif user_data[:total_string]
               total_label_only(
-                               @row2, col_num, col_data, user_data[:total_string], user_data[:format]
-                               )
+                @row2, col_num, col_data, user_data[:total_string], user_data[:format]
+              )
             end
 
             # Get the dxf format index.
@@ -123,7 +135,9 @@ module Writexlsx
 
       def write_the_column_headers_to_the_worksheet(col_num, col_data)
         if @param[:header_row] != 0
-          @worksheet.write_string(@row1, col_num, col_data.name)
+          @worksheet.write_string(
+            @row1, col_num, col_data.name, col_data.name_format
+          )
         end
       end
 
@@ -167,7 +181,7 @@ module Writexlsx
         row1, row2 = row2, row1 if row1 > row2
         col1, col2 = col2, col1 if col1 > col2
 
-      # The final hash contains the validation parameters.
+        # The final hash contains the validation parameters.
         param ||= {}
 
         # Turn on Excel's defaults.
@@ -175,6 +189,14 @@ module Writexlsx
         param[:header_row]  ||= 1
         param[:autofilter]  ||= 1
 
+        # Check that there are enough rows.
+        num_rows = row2 - row1
+        num_rows -= 1 if ptrue?(param[:header_row])
+
+        if num_rows < 0
+          raise "Must have at least one data row in in add_table()"
+        end
+
         # If the header row if off the default is to turn autofilter off.
         param[:autofilter] = 0 if param[:header_row] == 0
 
@@ -186,17 +208,17 @@ module Writexlsx
       # List of valid input parameters.
       def valid_table_parameter
         [
-         :autofilter,
-         :banded_columns,
-         :banded_rows,
-         :columns,
-         :data,
-         :first_column,
-         :header_row,
-         :last_column,
-         :name,
-         :style,
-         :total_row
+          :autofilter,
+          :banded_columns,
+          :banded_rows,
+          :columns,
+          :data,
+          :first_column,
+          :header_row,
+          :last_column,
+          :name,
+          :style,
+          :total_row
         ]
       end
 
@@ -226,6 +248,11 @@ module Writexlsx
       # Convert a table total function to a worksheet formula.
       #
       def table_function_to_formula(function, col_name)
+        col_name = col_name.gsub(/'/, "''").
+                     gsub(/#/, "'#").
+                     gsub(/\[/, "'[").
+                     gsub(/\]/, "']")
+
         subtotals = {
           :average   => 101,
           :countNums => 102,
@@ -268,7 +295,26 @@ module Writexlsx
       end
 
       def set_the_table_name
-        @name = @param[:name] if @param[:name]
+        if @param[:name]
+          name = @param[:name]
+
+          # Raise if the name contains invalid chars as defined by Excel help.
+          if name !~ /^[\w\\][\w\\.]*$/ || name =~ /^\d/
+            raise "Invalid character in name '#{name} used in add_table()"
+          end
+
+          # Raise if the name looks like a cell name.
+          if name =~ /^[a-zA-Z][a-zA-Z]?[a-dA-D]?[0-9]+$/
+            ralse "Invalid name '#{name}' looks like a cell name in add_table()"
+          end
+
+          # Raise if the name looks like a R1C1.
+          if name =~ /^[rcRC]$/ || name =~ /^[rcRC]\d+[rcRC]\d+$/
+            raise "Invalid name '#{name}' like a RC cell ref in add_table()"
+          end
+
+          @name = @param[:name]
+        end
       end
 
       def set_the_table_and_autofilter_ranges
@@ -285,12 +331,12 @@ module Writexlsx
         xmlns            = "#{schema}spreadsheetml/2006/main"
 
         attributes = [
-                      ['xmlns',       xmlns],
-                      ['id',          id],
-                      ['name',        @name],
-                      ['displayName', @name],
-                      ['ref',         @range]
-                     ]
+          ['xmlns',       xmlns],
+          ['id',          id],
+          ['name',        @name],
+          ['displayName', @name],
+          ['ref',         @range]
+        ]
 
         unless ptrue?(@header_row_count)
           attributes << ['headerRowCount', 0]
@@ -332,9 +378,9 @@ module Writexlsx
       #
       def write_table_column(col_data)
         attributes = [
-                      ['id',   col_data.id],
-                      ['name', col_data.name]
-                     ]
+          ['id',   col_data.id],
+          ['name', col_data.name]
+        ]
 
         if ptrue?(col_data.total_string)
           attributes << [:totalsRowLabel, col_data.total_string]
@@ -360,13 +406,14 @@ module Writexlsx
       # Write the <tableStyleInfo> element.
       #
       def write_table_style_info
-        attributes = [
-                      ['name',              @style],
-                      ['showFirstColumn',   @show_first_col],
-                      ['showLastColumn',    @show_last_col],
-                      ['showRowStripes',    @show_row_stripes],
-                      ['showColumnStripes', @show_col_stripes]
-                     ]
+        attributes = []
+        if @style && @style != '' && @style != 'None'
+          attributes << ['name', @style]
+        end
+        attributes << ['showFirstColumn',   @show_first_col]
+        attributes << ['showLastColumn',    @show_last_col]
+        attributes << ['showRowStripes',    @show_row_stripes]
+        attributes << ['showColumnStripes', @show_col_stripes]
 
         @writer.empty_tag('tableStyleInfo', attributes)
       end

data/lib/write_xlsx/package/theme.rb

@@ -36,7 +36,7 @@ module Writexlsx
       #
       def write_theme_file
         theme  =
-%Q{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+          %Q{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>}
         @writer.write(theme)
       end

data/lib/write_xlsx/package/vml.rb

@@ -17,9 +17,9 @@ module Writexlsx
       end
 
       def assemble_xml_file(
-                            data_id, vml_shape_id, comments_data,
-                            buttons_data, header_images_data = []
-                            )
+            data_id, vml_shape_id, comments_data,
+            buttons_data, header_images_data = []
+          )
         return unless @writer
 
         write_xml_namespace do
@@ -29,16 +29,16 @@ module Writexlsx
           z_index = 1
           unless buttons_data.empty?
             vml_shape_id, z_index =
-              write_shape_type_and_shape(
-                                         buttons_data,
-                                         vml_shape_id, z_index) do
+                          write_shape_type_and_shape(
+                            buttons_data,
+                            vml_shape_id, z_index) do
               write_button_shapetype
             end
           end
           unless comments_data.empty?
             write_shape_type_and_shape(
-                                       comments_data,
-                                       vml_shape_id, z_index) do
+              comments_data,
+              vml_shape_id, z_index) do
               write_comment_shapetype
             end
           end
@@ -84,9 +84,9 @@ module Writexlsx
       def xml_attributes
         schema  = 'urn:schemas-microsoft-com:'
         [
-         ['xmlns:v', "#{schema}vml"],
-         ['xmlns:o', "#{schema}office:office"],
-         ['xmlns:x', "#{schema}office:excel"]
+          ['xmlns:v', "#{schema}vml"],
+          ['xmlns:o', "#{schema}office:office"],
+          ['xmlns:x', "#{schema}office:excel"]
         ]
       end
 
@@ -95,8 +95,8 @@ module Writexlsx
       #
       def write_shapelayout(data_id)
         attributes = [
-                      ['v:ext', 'edit']
-                     ]
+          ['v:ext', 'edit']
+        ]
 
         @writer.tag_elements('o:shapelayout', attributes) do
           # Write the o:idmap element.
@@ -121,10 +121,10 @@ module Writexlsx
       #
       def write_comment_shapetype
         attributes = [
-            ['id',        '_x0000_t202'],
-            ['coordsize', '21600,21600'],
-            ['o:spt',     202],
-            ['path',      'm,l,21600r21600,l21600,xe']
+          ['id',        '_x0000_t202'],
+          ['coordsize', '21600,21600'],
+          ['o:spt',     202],
+          ['path',      'm,l,21600r21600,l21600,xe']
         ]
 
         @writer.tag_elements('v:shapetype', attributes) do
@@ -140,11 +140,11 @@ module Writexlsx
       #
       def write_button_shapetype
         attributes = [
-                      ['id',        '_x0000_t201'],
-                      ['coordsize', '21600,21600'],
-                      ['o:spt',     201],
-                      ['path',      'm,l,21600r21600,l21600,xe']
-                     ]
+          ['id',        '_x0000_t201'],
+          ['coordsize', '21600,21600'],
+          ['o:spt',     201],
+          ['path',      'm,l,21600r21600,l21600,xe']
+        ]
 
         @writer.tag_elements('v:shapetype', attributes) do
           # Write the v:stroke element.
@@ -169,14 +169,14 @@ module Writexlsx
         stroked          = 'f'
 
         attributes = [
-                      ['id',               id],
-                      ['coordsize',        coordsize],
-                      ['o:spt',            spt],
-                      ['o:preferrelative', o_preferrelative],
-                      ['path',             path],
-                      ['filled',           filled],
-                      ['stroked',          stroked]
-                     ]
+          ['id',               id],
+          ['coordsize',        coordsize],
+          ['o:spt',            spt],
+          ['o:preferrelative', o_preferrelative],
+          ['path',             path],
+          ['filled',           filled],
+          ['stroked',          stroked]
+        ]
 
         @writer.tag_elements('v:shapetype', attributes) do
           # Write the v:stroke element.
@@ -198,12 +198,12 @@ module Writexlsx
       #
       def write_button_path
         attributes = [
-                      ['shadowok',      'f'],
-                      ['o:extrusionok', 'f'],
-                      ['strokeok',      'f'],
-                      ['fillok',        'f'],
-                      ['o:connecttype', 'rect']
-                     ]
+          ['shadowok',      'f'],
+          ['o:extrusionok', 'f'],
+          ['strokeok',      'f'],
+          ['fillok',        'f'],
+          ['o:connecttype', 'rect']
+        ]
         @writer.empty_tag('v:path', attributes)
       end
 
@@ -216,10 +216,10 @@ module Writexlsx
         connecttype     = 'rect'
 
         attributes = [
-                      ['o:extrusionok',   extrusionok],
-                      ['gradientshapeok', gradientshapeok],
-                      ['o:connecttype',   connecttype]
-                     ]
+          ['o:extrusionok',   extrusionok],
+          ['gradientshapeok', gradientshapeok],
+          ['o:connecttype',   connecttype]
+        ]
 
         @writer.empty_tag('v:path', attributes)
       end
@@ -229,9 +229,9 @@ module Writexlsx
       #
       def write_shapetype_lock
         attributes = [
-                      ['v:ext',     'edit'],
-                      ['shapetype', 't']
-                     ]
+          ['v:ext',     'edit'],
+          ['shapetype', 't']
+        ]
         @writer.empty_tag('o:lock', attributes)
       end
 
@@ -240,9 +240,9 @@ module Writexlsx
       #
       def write_rotation_lock
         attributes = [
-                      ['v:ext',    'edit'],
-                      ['rotation', 't']
-                     ]
+          ['v:ext',    'edit'],
+          ['rotation', 't']
+        ]
         @writer.empty_tag('o:lock', attributes)
       end
 
@@ -254,9 +254,9 @@ module Writexlsx
         aspectratio = 't'
 
         attributes = [
-                      ['v:ext',       ext],
-                      ['aspectratio', aspectratio]
-                     ]
+          ['v:ext',       ext],
+          ['aspectratio', aspectratio]
+        ]
 
         @writer.empty_tag('o:lock', attributes)
       end
@@ -277,6 +277,7 @@ module Writexlsx
         position = image_data[3]
         x_dpi    = image_data[4]
         y_dpi    = image_data[5]
+        ref_id   = image_data[6]
 
         # Scale the height/width by the resolution, relative to 72dpi.
         width  = width  * 72.0 / x_dpi
@@ -294,20 +295,20 @@ module Writexlsx
         end
 
         style = [
-                 "position:absolute", "margin-left:0", "margin-top:0",
-                 "width:#{width}pt", "height:#{height}pt",
-                 "z-index:#{index}"
-                ].join(';')
+          "position:absolute", "margin-left:0", "margin-top:0",
+          "width:#{width}pt", "height:#{height}pt",
+          "z-index:#{index}"
+        ].join(';')
         attributes = [
-                      ['id',     position],
-                      ['o:spid', "_x0000_s#{id}"],
-                      ['type',   type],
-                      ['style',  style]
-                     ]
+          ['id',     position],
+          ['o:spid', "_x0000_s#{id}"],
+          ['type',   type],
+          ['style',  style]
+        ]
 
         @writer.tag_elements('v:shape', attributes) do
           # Write the v:imagedata element.
-          write_imagedata(index, name)
+          write_imagedata(ref_id, name)
 
           # Write the o:lock element.
           write_rotation_lock
@@ -319,9 +320,9 @@ module Writexlsx
       #
       def write_imagedata(index, o_title)
         attributes = [
-                      ['o:relid', "rId#{index}"],
-                      ['o:title', o_title]
-                     ]
+          ['o:relid', "rId#{index}"],
+          ['o:title', o_title]
+        ]
 
         @writer.empty_tag('v:imagedata', attributes)
       end

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -118,13 +118,14 @@ module Writexlsx
       end
 
       def escape_attributes(str = '')
-        return str if !(str.to_s =~ /["&<>]/)
+        return str if !(str.to_s =~ /["&<>\n]/)
 
         str.
           gsub(/&/, "&amp;").
           gsub(/"/, "&quot;").
           gsub(/</, "&lt;").
-          gsub(/>/, "&gt;")
+          gsub(/>/, "&gt;").
+          gsub(/\n/, "&#xA;")
       end
 
       def escape_data(str = '')

data/lib/write_xlsx/shape.rb

@@ -8,14 +8,14 @@ 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 Shape
     include Writexlsx::Utility
 
     attr_reader :edit_as, :type, :drawing
     attr_reader :tx_box, :fill, :line, :format
-    attr_reader :align, :valign
+    attr_reader :align, :valign, :anchor
     attr_accessor :name, :connect, :type, :id, :start, :end, :rotation
     attr_accessor :flip_h, :flip_v, :adjustments, :palette, :text, :stencil
     attr_accessor :row_start, :row_end, :column_start, :column_end
@@ -154,15 +154,17 @@ module Writexlsx
     # EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per pixel.
     #
     def calc_position_emus(worksheet)
-      c_start, r_start, xx1, yy1, c_end, r_end, xx2, yy2, x_abslt, y_abslt =
-        worksheet.position_object_pixels(
-                               @column_start,
-                               @row_start,
-                               @x_offset,
-                               @y_offset,
-                               @width  * @scale_x,
-                               @height * @scale_y
-                               )
+      c_start, r_start,
+      xx1, yy1, c_end, r_end,
+      xx2, yy2, x_abslt, y_abslt =
+                         worksheet.position_object_pixels(
+                           @column_start,
+                           @row_start,
+                           @x_offset,
+                           @y_offset,
+                           @width  * @scale_x,
+                           @height * @scale_y
+                         )
 
       # Now that x2/y2 have been calculated with a potentially negative
       # width/height we use the absolute value and convert to EMUs.
@@ -183,11 +185,12 @@ module Writexlsx
       @y_abs = (y_abslt * 9_525).to_i
     end
 
-    def set_position(row_start, column_start, x_offset, y_offset, x_scale, y_scale)
+    def set_position(row_start, column_start, x_offset, y_offset, x_scale, y_scale, anchor)
       @row_start    = row_start
       @column_start = column_start
       @x_offset     = x_offset || 0
       @y_offset     = y_offset || 0
+      @anchor       = anchor   || 1
 
       # Override shape scale if supplied as an argument. Otherwise, use the
       # existing shape scale factors.
@@ -296,12 +299,12 @@ module Writexlsx
 
     def dimensions
       [
-       @column_start, @row_start,
-       @x1,           @y1,
-       @column_end,   @row_end,
-       @x2,           @y2,
-       @x_abs,        @y_abs,
-       @width_emu,    @height_emu
+        @column_start, @row_start,
+        @x1,           @y1,
+        @column_end,   @row_end,
+        @x2,           @y2,
+        @x_abs,        @y_abs,
+        @width_emu,    @height_emu
       ]
     end
   end

data/lib/write_xlsx/sheets.rb

@@ -67,18 +67,18 @@ module Writexlsx
           vml = Package::Vml.new
           vml.set_xml_writer("#{dir}/vmlDrawing#{index}.vml")
           vml.assemble_xml_file(
-                                sheet.vml_data_id, sheet.vml_shape_id,
-                                sheet.sorted_comments, sheet.buttons_data
-                                )
+            sheet.vml_data_id, sheet.vml_shape_id,
+            sheet.sorted_comments, sheet.buttons_data
+          )
           index += 1
         end
         if sheet.has_header_vml?
           vml = Package::Vml.new
           vml.set_xml_writer("#{dir}/vmlDrawing#{index}.vml")
           vml.assemble_xml_file(
-                                sheet.vml_header_id, sheet.vml_header_id * 1024,
-                                [], [], sheet.header_images_data
-                                )
+            sheet.vml_header_id, sheet.vml_header_id * 1024,
+            [], [], sheet.header_images_data
+          )
           write_vml_drawing_rels_files(package_dir, sheet, index)
           index += 1
         end
@@ -106,16 +106,12 @@ module Writexlsx
     end
 
     def write_chartsheet_rels_files(package_dir)
-      write_sheet_rels_files_base(chartsheets, "#{package_dir}/xl/chartsheets/_rels",
-                            'sheet')
+      write_sheet_rels_files_base(
+        chartsheets, "#{package_dir}/xl/chartsheets/_rels", 'sheet'
+      )
     end
 
     def write_drawing_rels_files(package_dir)
-      # write_rels_files_base(
-      #                       self.reject { |sheet| sheet.drawing_links[0].empty? },
-      #                       "#{package_dir}/xl/drawings/_rels",
-
-      #                       )
       dir = "#{package_dir}/xl/drawings/_rels"
 
       index = 0
@@ -159,8 +155,9 @@ module Writexlsx
     end
 
     def write_worksheet_rels_files(package_dir)
-      write_sheet_rels_files_base(worksheets, "#{package_dir}/xl/worksheets/_rels",
-                            'sheet')
+      write_sheet_rels_files_base(
+        worksheets, "#{package_dir}/xl/worksheets/_rels", 'sheet'
+      )
     end
 
     def write_sheet_rels_files_base(sheets, dir, body)
@@ -230,10 +227,15 @@ module Writexlsx
         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 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