write_xlsx 0.65.0 → 0.65.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30c458c96dc291036baa7b64c8099b044c10e18c
-  data.tar.gz: 589e734bee933c9ab1f0904f59ce69f101251159
+  metadata.gz: 2625f80bf9b7f0ba2835f94cd5dd5699a86d1cba
+  data.tar.gz: a33f1666db5bd2bad62b7f0e97bb9422f03337fd
 SHA512:
-  metadata.gz: 1865380215d25cfa2e16af387be17263669fb62bea666e75f10f1f2719450120eed303aaea7f457ac60514af0d323c8552409bfacdae573ae19b4349cb42c5f7
-  data.tar.gz: 645cd41d3b387e77448b97494ccd87f2f39a29a49b21202f699b99a776845ef0d159044283556ae57ef0d2b0ff5fcc6a35ab4390a6da205ef8c557d1b46db368
+  metadata.gz: f8fb864b91fffd56d02dab919dea687a9a66dd22ed2c2b2a5240e72e830ae835781aa59a873ceb76391d1b8a4624fee72c4be9a5cbf7c4eb95773fd756b11e98
+  data.tar.gz: 2913180a8541b9c17293e2d3bc1e4bae00d8b3964726b6c2a30cb7c51b7b52963b8f64d11f7ce4318a70438d740b7932b30944813c368a89947c3ef3c66a38e9

data/README.rdoc

@@ -75,6 +75,11 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-03-23 v0.65.1
+   Bug fix for non-integer image scaling.
+   Bug fix in Worksheet#set_first_sheet
+   Bug fix in Worksheet#start_page=()
+
 2013-03-23 v0.65.0
    Added options to format series Gap/Overlap for Bar/Column charts.
 

data/lib/write_xlsx/chart.rb

@@ -83,7 +83,7 @@ def attributes
   # Creates a Bar style (transposed histogram) chart. See Writexlsx::Chart::Bar.
   #
   # ===column
-  # Creates a column style (histogram) chart. See Writexlsx::Chart::Column.
+  # Creates a Column style (histogram) chart. See Writexlsx::Chart::Column.
   #
   # ===line
   # Creates a Line style chart. See Writexlsx::Chart::Line.

data/lib/write_xlsx/format.rb

@@ -378,7 +378,7 @@ def inspect
     # Returns a unique hash key for the Format object.
     #
     def get_format_key
-      [get_font_key, get_border_key, get_fill_key, @num_format, get_alignment_key].join(':')
+      [get_font_key, get_border_key, get_fill_key, get_alignment_key, @num_format, @locked, @hidden].join(':')
     end
 
     #
@@ -735,20 +735,37 @@ def [](attr)
       self.instance_variable_get("@#{attr}")
     end
 
-    def write_font(writer, worksheet) #:nodoc:
-      writer.tag_elements('rPr') do
-        writer.empty_tag('b')       if bold?
-        writer.empty_tag('i')       if italic?
-        writer.empty_tag('strike')  if strikeout?
-        writer.empty_tag('outline') if outline?
-        writer.empty_tag('shadow')  if shadow?
+    def write_font(writer, worksheet, dxf_format = nil) #:nodoc:
+      writer.tag_elements('font') do
+        # The condense and extend elements are mainly used in dxf formats.
+        write_condense(writer) if ptrue?(@font_condense)
+        write_extend(writer)   if ptrue?(@font_extend)
 
-        # Handle the underline variants.
-        write_underline(writer, underline) if underline?
+        write_font_shapes(writer)
 
-        write_vert_align(writer, 'superscript') if font_script == 1
-        write_vert_align(writer, 'subscript')   if font_script == 2
+        writer.empty_tag('sz', ['val', size]) unless dxf_format
 
+        if ptrue?(theme)
+          write_color(writer, 'theme', theme)
+        elsif ptrue?(@color_indexed)
+          write_color(writer, 'indexed', @color_indexed)
+        elsif ptrue?(@color)
+          color = worksheet.get_palette_color(@color)
+          write_color(writer, 'rgb', color)
+        elsif !ptrue?(dxf_format)
+          write_color(writer, 'theme', 1)
+        end
+
+        unless ptrue?(dxf_format)
+          writer.empty_tag('name',   ['val', @font])
+          write_font_family_scheme(writer)
+        end
+      end
+    end
+
+    def write_font_rpr(writer, worksheet) #:nodoc:
+      writer.tag_elements('rPr') do
+        write_font_shapes(writer)
         writer.empty_tag('sz', ['val', size])
 
         if ptrue?(theme)
@@ -760,12 +777,57 @@ def write_font(writer, worksheet) #:nodoc:
           write_color(writer, 'theme', 1)
         end
 
-        writer.empty_tag('rFont',  ['val', font])
-        writer.empty_tag('family', ['val', font_family])
+        writer.empty_tag('rFont',  ['val', @font])
+        write_font_family_scheme(writer)
+      end
+    end
+
+    private
 
-        if font == 'Calibri' && hyperlink == 0
-          writer.empty_tag('scheme', ['val', font_scheme])
-        end
+    def write_font_shapes(writer)
+      writer.empty_tag('b')       if bold?
+      writer.empty_tag('i')       if italic?
+      writer.empty_tag('strike')  if strikeout?
+      writer.empty_tag('outline') if outline?
+      writer.empty_tag('shadow')  if shadow?
+
+      # Handle the underline variants.
+      write_underline(writer, underline) if underline?
+
+      write_vert_align(writer, 'superscript') if font_script == 1
+      write_vert_align(writer, 'subscript')   if font_script == 2
+    end
+
+    def write_font_family_scheme(writer)
+      writer.empty_tag('family', ['val', @font_family])
+
+      if @font == 'Calibri' && !ptrue?(@hyperlink)
+        writer.empty_tag('scheme', ['val', @font_scheme])
+      end
+    end
+
+    #
+    # Write the underline font element.
+    #
+    def write_underline(writer, underline)
+      writer.empty_tag('u', write_underline_attributes(underline))
+    end
+
+    #
+    # Write the underline font element.
+    #
+    def write_underline_attributes(underline)
+      val = 'val'
+      # Handle the underline variants.
+      case underline
+      when 2
+        [val, 'double']
+      when 33
+        [val, 'singleAccounting']
+      when 34
+        [val, 'doubleAccounting']
+      else
+        []
       end
     end
 
@@ -775,5 +837,19 @@ def write_font(writer, worksheet) #:nodoc:
     def write_vert_align(writer, val) #:nodoc:
       writer.empty_tag('vertAlign', ['val', val])
     end
+
+    #
+    # Write the <condense> element.
+    #
+    def write_condense(writer)
+      writer.empty_tag('condense', ['val', 0])
+    end
+
+    #
+    # Write the <extend> element.
+    #
+    def write_extend(writer)
+      writer.empty_tag('extend', ['val', 0])
+    end
   end
 end

data/lib/write_xlsx/package/comments.rb

@@ -419,11 +419,7 @@ def write_sz
       # Write the <color> element.
       #
       def write_color
-        indexed = 81
-
-        attributes = ['indexed', indexed]
-
-        @writer.empty_tag('color', attributes)
+        @writer.empty_tag('color', ['indexed', 81])
       end
 
       #

data/lib/write_xlsx/package/styles.rb

@@ -172,67 +172,11 @@ def write_num_fmt(num_fmt_id, format_code)
       def write_fonts
         write_format_elements('fonts', @font_count) do
           @xf_formats.each do |format|
-            write_font(format) if format.has_font?
+            format.write_font(@writer, self) if format.has_font?
           end
         end
       end
 
-      #
-      # Write the <font> element.
-      #
-      def write_font(format, dxf_format = nil)
-        @writer.tag_elements('font') do
-          # The condense and extend elements are mainly used in dxf formats.
-          write_condense unless format.font_condense == 0
-          write_extend   unless format.font_extend   == 0
-
-          @writer.empty_tag('b')       if format.bold?
-          @writer.empty_tag('i')       if format.italic?
-          @writer.empty_tag('strike')  if format.strikeout?
-          @writer.empty_tag('outline') if format.outline?
-          @writer.empty_tag('shadow')  if format.shadow?
-
-          # Handle the underline variants.
-          write_underline( format.underline ) if format.underline?
-
-          write_vert_align('superscript') if format.font_script == 1
-          write_vert_align('subscript')   if format.font_script == 2
-
-          @writer.empty_tag('sz', ['val', format.size]) if !dxf_format
-
-          theme = format.theme
-          if theme != 0
-            write_color('theme', theme)
-          elsif format.color_indexed != 0
-            write_color('indexed', format.color_indexed)
-          elsif format.color != 0
-            color = get_palette_color(format.color)
-            write_color('rgb', color)
-          elsif !dxf_format
-            write_color('theme', 1)
-          end
-
-          if !dxf_format
-            @writer.empty_tag('name',   ['val', format.font])
-            @writer.empty_tag('family', ['val', format.font_family])
-
-            if format.font == 'Calibri' && format.hyperlink == 0
-              @writer.empty_tag('scheme', ['val', format.font_scheme])
-            end
-          end
-        end
-      end
-
-      #
-      # _write_underline()
-      #
-      # Write the underline font element.
-      #
-      def write_underline(underline)
-        attributes = underline_attributes(underline)
-        @writer.empty_tag('u', attributes)
-      end
-
       #
       # Write the <color> element.
       #
@@ -580,7 +524,7 @@ def write_dxfs
             # Write the font elements for format objects that have them.
             @dxf_formats.each do |format|
               @writer.tag_elements('dxf') do
-                write_font(format, 1) if format.has_dxf_font?
+                format.write_font(@writer, self, 1) if format.has_dxf_font?
 
                 if format.num_format_index != 0
                   write_num_fmt(format.num_format_index, format.num_format)

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.65.0"
+  VERSION = "0.65.1"
 end

data/lib/write_xlsx/workbook.rb

@@ -1130,7 +1130,7 @@ def write_workbook_view #:nodoc:
         attributes << 'tabRatio' << @tab_ratio
       end
       if @firstsheet > 0
-        attributes << 'firstSheet' << @firstsheet
+        attributes << 'firstSheet' << @firstsheet + 1
       end
       if @activesheet > 0
         attributes << 'activeTab' << @activesheet

data/lib/write_xlsx/worksheet.rb

@@ -78,10 +78,10 @@ module Writexlsx
   # * set_landscape
   # * set_portrait
   # * set_page_view
-  # * set_paper
+  # * {paper=}[#method-i-paper-3D]
   # * center_horizontally
   # * center_vertically
-  # * set_margins
+  # * {margins=}[#method-i-margin-3D]
   # * set_header
   # * set_footer
   # * repeat_rows
@@ -91,8 +91,8 @@ module Writexlsx
   # * print_area
   # * print_across
   # * fit_to_pages
-  # * set_start_page
-  # * set_print_scale
+  # * {start_page=}[#method-i-start_page-3D]
+  # * {print_scale=}[#method-i-print_scale-3D]
   # * set_h_pagebreaks
   # * set_v_pagebreaks
   #
@@ -515,7 +515,7 @@ def hidden? # :nodoc:
     #
     def set_first_sheet
       @hidden = false
-      @workbook.firstsheet = self
+      @workbook.firstsheet = @index
     end
 
     #
@@ -1589,20 +1589,22 @@ def print_across(across = true)
     end
 
     #
-    # Not implememt yet.
-    #--
-    # The set_start_page() method is used to set the number of the
+    # The start_page=() method is used to set the number of the
     # starting page when the worksheet is printed out.
     # The default value is 1.
     #
     #     worksheet.set_start_page(2)
-    #++
     #
-    def set_start_page(page_start)
-      @page_start   = page_start
+    def start_page=(page_start)
+      @page_setup.page_start = page_start
       @custom_start = 1
     end
 
+    def set_start_page(page_start)
+      put_deprecate_message("#{self}.set_start_page")
+      self::start_page = page_start
+    end
+
     #
     # :call-seq:
     #  write(row, column [ , token [ , format ] ])
@@ -5822,7 +5824,7 @@ def xml_str_of_rich_string(fragments)
         if token.respond_to?(:xf_index)
           # Write the font run.
           writer.start_tag('r')
-          token.write_font(writer, self)
+          token.write_font_rpr(writer, self)
         else
           # Write the string fragment part, with whitespace handling.
           attributes = []
@@ -6055,12 +6057,12 @@ def position_object_emus(col_start, row_start, x1, y1, width, height, is_drawing
         position_object_pixels(col_start, row_start, x1, y1, width, height, is_drawing)
 
       # Convert the pixel values to EMUs. See above.
-      x1    *= 9_525
-      y1    *= 9_525
-      x2    *= 9_525
-      y2    *= 9_525
-      x_abs *= 9_525
-      y_abs *= 9_525
+      x1    = (0.5 + 9_525 * x1).to_i
+      y1    = (0.5 + 9_525 * y1).to_i
+      x2    = (0.5 + 9_525 * x2).to_i
+      y2    = (0.5 + 9_525 * y2).to_i
+      x_abs = (0.5 + 9_525 * x_abs).to_i
+      y_abs = (0.5 + 9_525 * y_abs).to_i
 
       [col_start, row_start, x1, y1, col_end, row_end, x2, y2, x_abs, y_abs]
     end

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -3,6 +3,8 @@
 module Writexlsx
   class Worksheet
     class PageSetup # :nodoc:
+      include Writexlsx::Utility
+
       attr_accessor :margin_left, :margin_right, :margin_top, :margin_bottom  # :nodoc:
       attr_accessor :margin_header, :margin_footer                            # :nodoc:
       attr_accessor :repeat_rows, :repeat_cols, :print_area                   # :nodoc:
@@ -11,6 +13,7 @@ class PageSetup # :nodoc:
       attr_writer :across                                                   # :nodoc:
       attr_accessor :orientation, :print_options_changed  # :nodoc:
       attr_accessor :header, :footer, :header_footer_changed
+      attr_writer :page_start
 
       def initialize # :nodoc:
         @margin_left = 0.7
@@ -80,6 +83,7 @@ def hide_gridlines(option)
       #     fitToHeight="2"
       #     pageOrder="overThenDown"
       #     orientation="portrait"
+      #     useFirstPageNumber="1"
       #     blackAndWhite="1"
       #     draft="1"
       #     horizontalDpi="200"
@@ -102,6 +106,7 @@ def write_page_setup(writer) #:nodoc:
         else
           attributes << 'landscape'
         end
+        attributes << 'useFirstPageNumber' << @page_start if ptrue?(@page_start)
 
         writer.empty_tag('pageSetup', attributes)
       end

data/test/regression/test_date_examples01.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDateExamples01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_date_examples01
+    @xlsx = 'date_examples01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_column('A:A', 30)
+
+    number = 41333.5
+
+    worksheet.write('A1', number)              #   413333.5
+
+    format2 = workbook.add_format(:num_format => 'dd/mm/yy')
+    worksheet.write('A2', number, format2)    #   28/02/13
+
+    format3 = workbook.add_format(:num_format => 'mm/dd/yy')
+    worksheet.write('A3', number, format3)    #   02/28/13
+
+    format4 = workbook.add_format(:num_format => 'd\\-m\\-yyyy')
+    worksheet.write('A4', number, format4)    #   28-2-2013
+
+    format5 = workbook.add_format(:num_format => 'dd/mm/yy\\ hh:mm')
+    worksheet.write('A5', number, format5)    #   28/02/13 12:00
+
+    format6 = workbook.add_format(:num_format => 'd\\ mmm\\ yyyy')
+    worksheet.write('A6', number, format6)    #   28 Feb 2013
+
+    format7 = workbook.add_format(:num_format => 'mmm\\ d\\ yyyy\\ hh:mm\\ AM/PM')
+    worksheet.write('A7', number, format7)    #   Feb 28 2013 12:00 PM
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 ['xl/calcChain.xml', '\[Content_Types\].xml', 'xl/_rels/workbook.xml.rels'],
+                 {}
+                 )
+  end
+end