xlsxwriter 0.0.2 → 0.0.3

data/ext/xlsxwriter/worksheet.h

@@ -8,67 +8,14 @@ struct worksheet {
   lxw_worksheet *worksheet;
 };
 
-VALUE worksheet_alloc(VALUE klass);
-VALUE worksheet_init(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_release(VALUE self);
-void worksheet_free(void *);
-
-VALUE worksheet_write_string_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_number_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_formula_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_array_formula_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_datetime_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_url_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_boolean_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_blank_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_write_formula_num_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_set_row_(VALUE self, VALUE row, VALUE opts);
-VALUE worksheet_set_column_(VALUE self, VALUE col_from, VALUE col_to, VALUE opts);
-VALUE worksheet_insert_image_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_insert_chart_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_merge_range_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_autofilter_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_activate_(VALUE self);
-VALUE worksheet_select_(VALUE self);
-VALUE worksheet_hide_(VALUE self);
-VALUE worksheet_set_first_sheet_(VALUE self);
-VALUE worksheet_freeze_panes_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_split_panes_(VALUE self, VALUE vertical, VALUE horizontal);
-VALUE worksheet_set_selection_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_set_landscape_(VALUE self);
-VALUE worksheet_set_portrait_(VALUE self);
-VALUE worksheet_set_page_view_(VALUE self);
-VALUE worksheet_set_paper_(VALUE self, VALUE paper_type);
-VALUE worksheet_set_margins_(VALUE self, VALUE left, VALUE right, VALUE top, VALUE bottom);
-VALUE worksheet_set_header_(VALUE self, VALUE val, VALUE opts);
-VALUE worksheet_set_footer_(VALUE self, VALUE val, VALUE opts);
-VALUE worksheet_set_h_pagebreaks_(VALUE self, VALUE val);
-VALUE worksheet_set_v_pagebreaks_(VALUE self, VALUE val);
-VALUE worksheet_print_across_(VALUE self);
-VALUE worksheet_set_zoom_(VALUE self, VALUE val);
-VALUE worksheet_gridlines_(VALUE self, VALUE value);
-VALUE worksheet_center_horizontally_(VALUE self);
-VALUE worksheet_center_vertically_(VALUE self);
-VALUE worksheet_print_row_col_headers_(VALUE self);
-VALUE worksheet_repeat_rows_(VALUE self, VALUE row_from, VALUE row_to);
-VALUE worksheet_repeat_columns_(VALUE self, VALUE col_from, VALUE col_to);
-VALUE worksheet_print_area_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_fit_to_pages_(VALUE self, VALUE width, VALUE height);
-VALUE worksheet_set_start_page_(VALUE self, VALUE start_page);
-VALUE worksheet_set_print_scale_(VALUE self, VALUE scale);
-VALUE worksheet_right_to_left_(VALUE self);
-VALUE worksheet_hide_zero_(VALUE self);
-VALUE worksheet_set_tab_color_(VALUE self, VALUE color);
-VALUE worksheet_protect_(int argc, VALUE *argv, VALUE self);
-VALUE worksheet_set_default_row_(VALUE self, VALUE height, VALUE hide_unused_rows);
-
-VALUE worksheet_get_vertical_dpi_(VALUE self);
-VALUE worksheet_set_vertical_dpi_(VALUE self, VALUE val);
-
-
 lxw_col_t value_to_col(VALUE value);
 int extract_cell(int argc, VALUE *argv, lxw_row_t *row, lxw_col_t *col);
 int extract_range(int argc, VALUE *argv, lxw_row_t *row1, lxw_col_t *col1,
                                          lxw_row_t *row2, lxw_col_t *col2);
+lxw_image_options val_to_lxw_image_options(VALUE opts, char *with_options);
+
+void init_xlsxwriter_worksheet();
+
+extern VALUE cWorksheet;
 
 #endif /// __WORKSHEET__

data/ext/xlsxwriter/xlsxwriter.c

@@ -1,239 +1,38 @@
 #include <ruby.h>
 #include "xlsxwriter.h"
 #include "chart.h"
+#include "format.h"
 #include "workbook.h"
 #include "workbook_properties.h"
 #include "worksheet.h"
 
 VALUE mXlsxWriter;
-VALUE cWorkbook;
-VALUE cWorksheet;
-VALUE mXlsxFormat;
-VALUE cWorkbookProperties;
-VALUE cChart;
-VALUE cChartSeries;
-VALUE cChartAxis;
 
+/*  Document-module: XlsxWriter
+ *
+ *  XlsxWriter is a ruby interface to libxlsxwriter.
+ *
+ *  It provides a couple of useful shorthands (like being able to pass cells and
+ *  ranges as both numbers, cell strings and range strings.
+ *
+ *  It also has column authowidth functionality partially taken from Axlsx gem
+ *  enable by default.
+ *
+ *  Simple example of using the XlsxWriter to generate an xlsx file containing
+ *  'Hello' string in the first rows of column 'A':
+ *
+ *     XlsxWriter::Workbook.open('/tmp/text.xlsx') do |wb|
+ *       ws.add_worksheet do |ws|
+ *         10.times { |i| ws.add_row ['Hello!'] }
+ *       end
+ *     end
+ */
 void Init_xlsxwriter() {
-  mXlsxWriter  = rb_define_module("XlsxWriter");
-  mXlsxFormat  = rb_define_module_under(mXlsxWriter, "Format");
-  cWorkbook    = rb_define_class_under(mXlsxWriter,  "Workbook",   rb_cObject);
-  cWorksheet   = rb_define_class_under(mXlsxWriter,  "Worksheet",  rb_cObject);
-  cWorkbookProperties
-               = rb_define_class_under(cWorkbook,    "Properties", rb_cObject);
-  cChart       = rb_define_class_under(cWorkbook,    "Chart",      rb_cObject);
-  cChartSeries = rb_define_class_under(cChart,       "Series",     rb_cObject);
-  cChartAxis   = rb_define_class_under(cChart,       "Axis",       rb_cObject);
+  mXlsxWriter = rb_define_module("XlsxWriter");
 
-  rb_define_alloc_func(cWorkbook, workbook_alloc);
-  rb_define_singleton_method(cWorkbook, "new", workbook_new_, -1);
-  rb_define_alias(rb_singleton_class(cWorkbook), "open", "new");
-  rb_define_method(cWorkbook, "initialize", workbook_init, -1);
-  rb_define_method(cWorkbook, "close", workbook_release, 0);
-  rb_define_method(cWorkbook, "add_worksheet", workbook_add_worksheet_, -1);
-  rb_define_method(cWorkbook, "add_format", workbook_add_format_, 2);
-  rb_define_method(cWorkbook, "add_chart", workbook_add_chart_, 1);
-  rb_define_method(cWorkbook, "set_default_xf_indices", workbook_set_default_xf_indices_, 0);
-  rb_define_method(cWorkbook, "properties", workbook_properties_, 0);
-  rb_define_method(cWorkbook, "define_name", workbook_define_name_, 2);
-  rb_define_method(cWorkbook, "validate_worksheet_name", workbook_validate_worksheet_name_, 1);
-
-  rb_define_attr(cWorkbook, "font_sizes", 1, 0);
-
-
-  rb_define_alloc_func(cWorksheet, worksheet_alloc);
-  rb_define_method(cWorksheet, "initialize", worksheet_init, -1);
-  rb_define_method(cWorksheet, "free", worksheet_release, 0);
-  rb_define_method(cWorksheet, "write_string", worksheet_write_string_, -1);
-  rb_define_method(cWorksheet, "write_number", worksheet_write_number_, -1);
-  rb_define_method(cWorksheet, "write_formula", worksheet_write_formula_, -1);
-  rb_define_method(cWorksheet, "write_array_formula", worksheet_write_array_formula_, -1);
-  rb_define_method(cWorksheet, "write_datetime", worksheet_write_datetime_, -1);
-  rb_define_method(cWorksheet, "write_url", worksheet_write_url_, -1);
-  rb_define_method(cWorksheet, "write_boolean", worksheet_write_boolean_, -1);
-  rb_define_method(cWorksheet, "write_blank", worksheet_write_blank_, -1);
-  rb_define_method(cWorksheet, "write_formula_num", worksheet_write_formula_num_, -1);
-  rb_define_method(cWorksheet, "set_row", worksheet_set_row_, 2);
-  rb_define_method(cWorksheet, "set_column", worksheet_set_column_, 3);
-  rb_define_method(cWorksheet, "insert_image", worksheet_insert_image_, -1);
-  rb_define_method(cWorksheet, "insert_chart", worksheet_insert_chart_, -1);
-  rb_define_method(cWorksheet, "merge_range", worksheet_merge_range_, -1);
-  rb_define_method(cWorksheet, "autofilter", worksheet_autofilter_, -1);
-  rb_define_method(cWorksheet, "activate", worksheet_activate_, 0);
-  rb_define_method(cWorksheet, "select", worksheet_select_, 0);
-  rb_define_method(cWorksheet, "hide", worksheet_hide_, 0);
-  rb_define_method(cWorksheet, "set_first_sheet", worksheet_set_first_sheet_, 0);
-  rb_define_method(cWorksheet, "freeze_panes", worksheet_freeze_panes_, -1);
-  rb_define_method(cWorksheet, "split_panes", worksheet_split_panes_, 2);
-  rb_define_method(cWorksheet, "set_selection", worksheet_set_selection_, -1);
-  rb_define_method(cWorksheet, "set_landscape", worksheet_set_landscape_, 0);
-  rb_define_method(cWorksheet, "set_portrait", worksheet_set_portrait_, 0);
-  rb_define_method(cWorksheet, "set_page_view", worksheet_set_page_view_, 0);
-  rb_define_method(cWorksheet, "paper=", worksheet_set_paper_, 1);
-  rb_define_method(cWorksheet, "set_margins", worksheet_set_margins_, 4);
-  rb_define_method(cWorksheet, "set_header", worksheet_set_header_, 1);
-  rb_define_method(cWorksheet, "set_footer", worksheet_set_footer_, 1);
-  rb_define_method(cWorksheet, "h_pagebreaks=", worksheet_set_h_pagebreaks_, 1);
-  rb_define_method(cWorksheet, "v_pagebreaks=", worksheet_set_v_pagebreaks_, 1);
-  rb_define_method(cWorksheet, "print_across", worksheet_print_across_, 0);
-  rb_define_method(cWorksheet, "zoom=", worksheet_set_zoom_, 1);
-  rb_define_method(cWorksheet, "gridlines=", worksheet_gridlines_, 1);
-  rb_define_method(cWorksheet, "center_horizontally", worksheet_center_horizontally_, 0);
-  rb_define_method(cWorksheet, "center_vertically", worksheet_center_vertically_, 0);
-  rb_define_method(cWorksheet, "print_row_col_headers", worksheet_print_row_col_headers_, 0);
-  rb_define_method(cWorksheet, "repeat_rows", worksheet_repeat_rows_, 2);
-  rb_define_method(cWorksheet, "repeat_columns", worksheet_repeat_columns_, 2);
-  rb_define_method(cWorksheet, "print_area", worksheet_print_area_, -1);
-  rb_define_method(cWorksheet, "fit_to_pages", worksheet_fit_to_pages_, 2);
-  rb_define_method(cWorksheet, "start_page=", worksheet_set_start_page_, 1);
-  rb_define_method(cWorksheet, "print_scale=", worksheet_set_print_scale_, 1);
-  rb_define_method(cWorksheet, "right_to_left", worksheet_right_to_left_, 0);
-  rb_define_method(cWorksheet, "hide_zero", worksheet_hide_zero_, 0);
-  rb_define_method(cWorksheet, "tab_color=", worksheet_set_tab_color_, 1);
-  rb_define_method(cWorksheet, "protect", worksheet_protect_, -1);
-  rb_define_method(cWorksheet, "set_default_row", worksheet_set_default_row_, 2);
-
-  rb_define_method(cWorksheet, "vertical_dpi", worksheet_get_vertical_dpi_, 0);
-  rb_define_method(cWorksheet, "vertical_dpi=", worksheet_set_vertical_dpi_, 1);
-
-  rb_define_method(cWorkbookProperties, "initialize", workbook_properties_init_, 1);
-  rb_define_method(cWorkbookProperties, "[]=", workbook_properties_set_, 2);
-#define DEF_PROP_HANDLER(prop) rb_define_method(cWorkbookProperties, #prop "=", workbook_properties_set_dir_, 1);
-  DEF_PROP_HANDLER(title);
-  DEF_PROP_HANDLER(subject);
-  DEF_PROP_HANDLER(author);
-  DEF_PROP_HANDLER(manager);
-  DEF_PROP_HANDLER(company);
-  DEF_PROP_HANDLER(category);
-  DEF_PROP_HANDLER(keywords);
-  DEF_PROP_HANDLER(comments);
-  DEF_PROP_HANDLER(status);
-  DEF_PROP_HANDLER(hyperlink_base);
-#undef DEF_PROP_HANDLER
-
-
-  rb_define_alloc_func(cChart, chart_alloc);
-  rb_define_method(cChart, "initialize", chart_init, 2);
-  rb_define_method(cChart, "add_series", chart_add_series_, -1);
-
-  rb_define_method(cChart, "axis_id_1",  chart_get_axis_id_1_, 0);
-  rb_define_method(cChart, "axis_id_1=", chart_set_axis_id_1_, 1);
-  rb_define_method(cChart, "axis_id_2",  chart_get_axis_id_2_, 0);
-  rb_define_method(cChart, "axis_id_2=", chart_set_axis_id_2_, 1);
-
-  rb_define_alloc_func(cChartSeries, chart_series_alloc);
-  rb_define_method(cChartSeries, "initialize", chart_series_init, -1);
-
-
-#define MAP_LXW_FMT_CONST(name) rb_define_const(mXlsxFormat, #name, INT2NUM(LXW_##name))
-  MAP_LXW_FMT_CONST(COLOR_BLACK);
-  MAP_LXW_FMT_CONST(COLOR_BLUE);
-  MAP_LXW_FMT_CONST(COLOR_BROWN);
-  MAP_LXW_FMT_CONST(COLOR_CYAN);
-  MAP_LXW_FMT_CONST(COLOR_GRAY);
-  MAP_LXW_FMT_CONST(COLOR_GREEN);
-  MAP_LXW_FMT_CONST(COLOR_LIME);
-  MAP_LXW_FMT_CONST(COLOR_MAGENTA);
-  MAP_LXW_FMT_CONST(COLOR_NAVY);
-  MAP_LXW_FMT_CONST(COLOR_ORANGE);
-  MAP_LXW_FMT_CONST(COLOR_PINK);
-  MAP_LXW_FMT_CONST(COLOR_PURPLE);
-  MAP_LXW_FMT_CONST(COLOR_RED);
-  MAP_LXW_FMT_CONST(COLOR_SILVER);
-  MAP_LXW_FMT_CONST(COLOR_WHITE);
-  MAP_LXW_FMT_CONST(COLOR_YELLOW);
-
-  MAP_LXW_FMT_CONST(UNDERLINE_SINGLE);
-  MAP_LXW_FMT_CONST(UNDERLINE_DOUBLE);
-  MAP_LXW_FMT_CONST(UNDERLINE_SINGLE_ACCOUNTING);
-  MAP_LXW_FMT_CONST(UNDERLINE_DOUBLE_ACCOUNTING);
-
-  MAP_LXW_FMT_CONST(FONT_SUPERSCRIPT);
-  MAP_LXW_FMT_CONST(FONT_SUBSCRIPT);
-
-  MAP_LXW_FMT_CONST(ALIGN_LEFT);
-  MAP_LXW_FMT_CONST(ALIGN_CENTER);
-  MAP_LXW_FMT_CONST(ALIGN_RIGHT);
-  MAP_LXW_FMT_CONST(ALIGN_FILL);
-  MAP_LXW_FMT_CONST(ALIGN_JUSTIFY);
-  MAP_LXW_FMT_CONST(ALIGN_CENTER_ACROSS);
-  MAP_LXW_FMT_CONST(ALIGN_DISTRIBUTED);
-
-  MAP_LXW_FMT_CONST(ALIGN_VERTICAL_TOP);
-  MAP_LXW_FMT_CONST(ALIGN_VERTICAL_BOTTOM);
-  MAP_LXW_FMT_CONST(ALIGN_VERTICAL_CENTER);
-  MAP_LXW_FMT_CONST(ALIGN_VERTICAL_JUSTIFY);
-  MAP_LXW_FMT_CONST(ALIGN_VERTICAL_DISTRIBUTED);
-
-  MAP_LXW_FMT_CONST(PATTERN_SOLID);
-  MAP_LXW_FMT_CONST(PATTERN_MEDIUM_GRAY);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_GRAY);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_GRAY);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_HORIZONTAL);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_VERTICAL);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_DOWN);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_UP);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_GRID);
-  MAP_LXW_FMT_CONST(PATTERN_DARK_TRELLIS);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_HORIZONTAL);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_VERTICAL);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_DOWN);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_UP);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_GRID);
-  MAP_LXW_FMT_CONST(PATTERN_LIGHT_TRELLIS);
-  MAP_LXW_FMT_CONST(PATTERN_GRAY_125);
-  MAP_LXW_FMT_CONST(PATTERN_GRAY_0625);
-
-  MAP_LXW_FMT_CONST(BORDER_THIN);
-  MAP_LXW_FMT_CONST(BORDER_MEDIUM);
-  MAP_LXW_FMT_CONST(BORDER_DASHED);
-  MAP_LXW_FMT_CONST(BORDER_DOTTED);
-  MAP_LXW_FMT_CONST(BORDER_THICK);
-  MAP_LXW_FMT_CONST(BORDER_DOUBLE);
-  MAP_LXW_FMT_CONST(BORDER_HAIR);
-  MAP_LXW_FMT_CONST(BORDER_MEDIUM_DASHED);
-  MAP_LXW_FMT_CONST(BORDER_DASH_DOT);
-  MAP_LXW_FMT_CONST(BORDER_MEDIUM_DASH_DOT);
-  MAP_LXW_FMT_CONST(BORDER_DASH_DOT_DOT);
-  MAP_LXW_FMT_CONST(BORDER_MEDIUM_DASH_DOT_DOT);
-  MAP_LXW_FMT_CONST(BORDER_SLANT_DASH_DOT);
-
-  MAP_LXW_FMT_CONST(DIAGONAL_BORDER_UP);
-  MAP_LXW_FMT_CONST(DIAGONAL_BORDER_DOWN);
-  MAP_LXW_FMT_CONST(DIAGONAL_BORDER_UP_DOWN);
-#undef MAP_LXW_FMT_CONST
-
-#define MAP_LXW_WH_CONST(name, val_name) rb_define_const(cWorksheet, #name, INT2NUM(LXW_##val_name))
-  MAP_LXW_WH_CONST(DEF_COL_WIDTH, DEF_COL_WIDTH);
-  MAP_LXW_WH_CONST(DEF_ROW_HEIGHT, DEF_ROW_HEIGHT);
-
-  MAP_LXW_WH_CONST(GRIDLINES_HIDE_ALL, HIDE_ALL_GRIDLINES);
-  MAP_LXW_WH_CONST(GRIDLINES_SHOW_SCREEN, SHOW_SCREEN_GRIDLINES);
-  MAP_LXW_WH_CONST(GRIDLINES_SHOW_PRINT, SHOW_PRINT_GRIDLINES);
-  MAP_LXW_WH_CONST(GRIDLINES_SHOW_ALL, SHOW_ALL_GRIDLINES);
-#undef MAP_LXW_WH_CONST
-
-#define MAP_CHART_CONST(name) rb_define_const(cChart, #name, INT2NUM(LXW_CHART_##name))
-  MAP_CHART_CONST(NONE);
-  MAP_CHART_CONST(AREA);
-  MAP_CHART_CONST(AREA_STACKED);
-  MAP_CHART_CONST(AREA_STACKED_PERCENT);
-  MAP_CHART_CONST(BAR);
-  MAP_CHART_CONST(BAR_STACKED);
-  MAP_CHART_CONST(BAR_STACKED_PERCENT);
-  MAP_CHART_CONST(COLUMN);
-  MAP_CHART_CONST(COLUMN_STACKED);
-  MAP_CHART_CONST(COLUMN_STACKED_PERCENT);
-  MAP_CHART_CONST(DOUGHNUT);
-  MAP_CHART_CONST(LINE);
-  MAP_CHART_CONST(PIE);
-  MAP_CHART_CONST(SCATTER);
-  MAP_CHART_CONST(SCATTER_STRAIGHT);
-  MAP_CHART_CONST(SCATTER_STRAIGHT_WITH_MARKERS);
-  MAP_CHART_CONST(SCATTER_SMOOTH);
-  MAP_CHART_CONST(SCATTER_SMOOTH_WITH_MARKERS);
-  MAP_CHART_CONST(RADAR);
-  MAP_CHART_CONST(RADAR_WITH_MARKERS);
-  MAP_CHART_CONST(RADAR_FILLED);
-#undef MAP_CHART_CONST
+  init_xlsxwriter_workbook();
+  init_xlsxwriter_workbook_properties();
+  init_xlsxwriter_format();
+  init_xlsxwriter_worksheet();
+  init_xlsxwriter_chart();
 }

data/lib/xlsxwriter/version.rb

@@ -1,3 +1,4 @@
 module XlsxWriter
-  VERSION='0.0.2'.freeze
+  # :nodoc:
+  VERSION='0.0.3'.freeze
 end

data/lib/xlsxwriter/worksheet.rb

@@ -1,8 +1,16 @@
 class XlsxWriter::Worksheet
+  # Last row number written with #add_row
   attr_reader :current_row
 
+  # Thiner characters list used for column width logic mimicing axlsx behaviour
   THIN_CHARS = '^.acfijklrstxzFIJL()-'.freeze
 
+  # Write a +row+. If no +types+ passed XlsxWriter tries to deduce them automatically.
+  #
+  # Both +types+ and +style+ may be an array as well as a symbol.
+  # In the latter case they are applied to all cells in the +row+.
+  #
+  # +height+ is a Numeric that specifies the row height.
   def add_row(row, style: nil, height: nil, types: nil)
     row_idx = @current_row ||= 0
     @current_row += 1
@@ -58,15 +66,19 @@ class XlsxWriter::Worksheet
     end
   end
 
-  def update_col_auto_width(idx, val, format)
-    font_scale = (@workbook.font_sizes[format] || 11) / 10.0
-    width = (val.count(THIN_CHARS) + 3) * font_scale
-    @col_auto_widths[idx] = [@col_auto_widths[idx], width].compact.max
-  end
-
+  # Apply cols automatic widths calculated by #add_row.
   def apply_auto_widths
     @col_auto_widths.each_with_index do |width, idx|
       set_column(idx, idx, width: width) if width
     end
   end
+
+  private
+
+  # Updates the col auto width value to fit the string.
+  def update_col_auto_width(idx, val, format)
+    font_scale = (@workbook.font_sizes[format] || 11) / 10.0
+    width = (val.count(THIN_CHARS) + 3) * font_scale
+    @col_auto_widths[idx] = [@col_auto_widths[idx], width].compact.max
+  end
 end

data/test/test-chart-axis.rb

@@ -0,0 +1,102 @@
+require_relative './xlsx-func-testcase'
+
+class TestChartAxis < XlsxWriterTestCase
+  DATA = [
+    [1,  2,  3],
+    [2,  4,  6],
+    [3,  6,  9],
+    [4,  8, 12],
+    [5, 10, 15]
+  ]
+
+  test 'chart_axis01' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::BAR) do |chart|
+        chart.axis_id_1 = 58_955_648
+        chart.axis_id_2 = 68_446_848
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+
+        chart.x_axis.name = 'XXX'
+        chart.y_axis.name = 'YYY'
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
+
+  test 'chart_axis06' do |wb|
+    wb.add_worksheet do |ws|
+      [ [2, 60], [4, 30], [6, 10] ].each { |row| ws.add_row row }
+      wb.add_chart(XlsxWriter::Workbook::Chart::PIE) do |chart|
+        chart.add_series '=Sheet1!$A$1:$A$3', '=Sheet1!$B$1:$B$3'
+        chart.title = 'Title'
+        chart.x_axis.name = 'XXX'
+        chart.y_axis.name = 'YYY'
+        ws.insert_chart('E9', chart)
+      end
+    end
+  end
+
+  test 'chart_axis26' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::LINE) do |chart|
+        chart.axis_id_1 = 73_048_448
+        chart.axis_id_2 = 73_049_984
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+
+        chart.x_axis.set_num_font rotation: 45, baseline: -1
+
+        ws.insert_chart('E9', chart)
+      end
+    end
+  end
+
+  test 'chart_axis35' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::COLUMN) do |chart|
+        chart.axis_id_1 = 63_008_128
+        chart.axis_id_2 = 62_522_496
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+
+        chart.y_axis.set_line none: true
+
+        ws.insert_chart('E9', chart)
+      end
+    end
+  end
+
+  test 'chart_axis38' do |wb|
+    wb.add_worksheet do |ws|
+      DATA.each { |row| ws.add_row row }
+
+      wb.add_chart(XlsxWriter::Workbook::Chart::COLUMN) do |chart|
+        chart.axis_id_1 = 45_642_496
+        chart.axis_id_2 = 45_644_416
+
+        chart.add_series '=Sheet1!$A$1:$A$5'
+        chart.add_series '=Sheet1!$B$1:$B$5'
+        chart.add_series '=Sheet1!$C$1:$C$5'
+
+        chart.y_axis.set_line color: XlsxWriter::Format::COLOR_YELLOW
+        chart.y_axis.set_fill color: XlsxWriter::Format::COLOR_RED
+
+        ws.insert_chart 'E9', chart
+      end
+    end
+  end
+end