write_xlsx 1.07.0 → 1.09.0

data/lib/write_xlsx/package/shared_strings.rb

@@ -63,9 +63,9 @@ module Writexlsx
 
         attributes =
           [
-           ['xmlns',       schema + '/spreadsheetml/2006/main'],
-           ['count',       total_count],
-           ['uniqueCount', unique_count]
+            ['xmlns',       schema + '/spreadsheetml/2006/main'],
+            ['count',       total_count],
+            ['uniqueCount', unique_count]
           ]
 
         @writer.tag_elements('sst', attributes) { yield }
@@ -94,9 +94,9 @@ module Writexlsx
 
         # Convert control character to the _xHHHH_ escape.
         string = string.gsub(
-                             /([\x00-\x08\x0B-\x1F])/,
-                             sprintf("_x%04X_", $1.ord)
-                             ) if string =~ /([\x00-\x08\x0B-\x1F])/
+          /([\x00-\x08\x0B-\x1F])/,
+          sprintf("_x%04X_", $1.ord)
+        ) if string =~ /([\x00-\x08\x0B-\x1F])/
 
         # Convert character to \xC2\xxx or \xC3\xxx
         if string.bytesize == 1 && 0x80 <= string.ord && string.ord <= 0xFF

data/lib/write_xlsx/package/styles.rb

@@ -56,11 +56,11 @@ module Writexlsx
       # based on the default or user defined values in the Workbook palette.
       #
       def palette_color(index)
-      if index.to_s =~ /^#([0-9A-F]{6})$/i
-        "FF#{$1.upcase}"
-      else
-        "FF#{super(index)}"
-      end
+        if index.to_s =~ /^#([0-9A-F]{6})$/i
+          "FF#{$1.upcase}"
+        else
+          "FF#{super(index)}"
+        end
       end
 
       #
@@ -253,11 +253,22 @@ module Writexlsx
       # Write the <fill> element.
       #
       def write_fill(format, dxf_format = nil)
-        @writer.tag_elements('fill' ) do
-          write_fill_base(format, dxf_format)
+        # Special handling for pattern only case.
+        if pattern_only_case?(format, dxf_format)
+          write_default_fill(PATTERNS[format.pattern])
+        else
+          @writer.tag_elements('fill' ) do
+            write_fill_base(format, dxf_format)
+          end
         end
       end
 
+      def pattern_only_case?(format, dxf_format)
+        bg_color, fg_color = bg_and_fg_color(format, dxf_format)
+
+        !ptrue?(fg_color) && !ptrue?(bg_color) && ptrue?(format.pattern)
+      end
+
       def write_fill_base(format, dxf_format)
         # The "none" pattern is handled differently for dxf formats.
         if dxf_format && format.pattern <= 1
@@ -281,7 +292,9 @@ module Writexlsx
         if bg_color && bg_color != 0
           @writer.empty_tag('bgColor', [ ['rgb', palette_color(bg_color)] ])
         else
-          @writer.empty_tag('bgColor', [ ['indexed', 64] ]) if !dxf_format
+          if !dxf_format && format.pattern <= 1
+            @writer.empty_tag('bgColor', [ ['indexed', 64] ])
+          end
         end
       end
 
@@ -513,9 +526,9 @@ module Writexlsx
       #
       def write_cell_style(name, xf_id, builtin_id)
         attributes = [
-            ['name',      name],
-            ['xfId',      xf_id],
-            ['builtinId', builtin_id]
+          ['name',      name],
+          ['xfId',      xf_id],
+          ['builtinId', builtin_id]
         ]
 
         @writer.empty_tag('cellStyle', attributes)
@@ -557,9 +570,9 @@ module Writexlsx
       #
       def write_table_styles
         attributes = [
-            ['count',             0],
-            ['defaultTableStyle', 'TableStyleMedium9'],
-            ['defaultPivotStyle', 'PivotStyleLight16']
+          ['count',             0],
+          ['defaultTableStyle', 'TableStyleMedium9'],
+          ['defaultPivotStyle', 'PivotStyleLight16']
         ]
 
         @writer.empty_tag('tableStyles', attributes)

data/lib/write_xlsx/package/table.rb

@@ -117,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.
@@ -181,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.
@@ -189,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
 
@@ -200,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
 
@@ -323,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]
@@ -370,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]

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

@@ -37,8 +37,8 @@ module Writexlsx
           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

data/lib/write_xlsx/shape.rb

@@ -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.
@@ -297,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