xlsxwriter 0.0.4 → 0.0.5

data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/xmlwriter.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * xmlwriter - A libxlsxwriter library for creating Excel XLSX
  *             XML files.
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "common.h"
+#include "utility.h"
 
 #define LXW_MAX_ATTRIBUTE_LENGTH 256
 #define LXW_ATTR_32              32

data/ext/xlsxwriter/libxlsxwriter/src/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter library.
 #
-# Copyright 2014-2017, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2018, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.
@@ -38,6 +38,16 @@ TMPFILEPLUS_OBJ = $(TMPFILEPLUS_DIR)/tmpfileplus.o
 TMPFILEPLUS_SO  = $(TMPFILEPLUS_DIR)/tmpfileplus.so
 endif
 
+# Set flag for big endian architecture.
+ifdef USE_BIG_ENDIAN
+CFLAGS += -DLXW_BIG_ENDIAN
+endif
+
+# Use a user-defined double number formatting function.
+ifdef USE_DOUBLE_FUNCTION
+CFLAGS += -DUSE_DOUBLE_FUNCTION
+endif
+
 # Flags passed to compiler.
 CFLAGS   += -g -O3 -Wall -Wextra -pedantic -ansi
 

data/ext/xlsxwriter/libxlsxwriter/src/app.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/chart.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -311,9 +311,17 @@ _chart_convert_font_args(lxw_chart_font *user_font)
     font = calloc(1, sizeof(struct lxw_chart_font));
     RETURN_ON_MEM_ERROR(font, NULL);
 
-    memcpy(font, user_font, sizeof(lxw_chart_font));
-
+    /* Copy the user supplied properties. */
     font->name = lxw_strdup(user_font->name);
+    font->size = user_font->size;
+    font->bold = user_font->bold;
+    font->italic = user_font->italic;
+    font->underline = user_font->underline;
+    font->rotation = user_font->rotation;
+    font->color = user_font->color;
+    font->pitch_family = user_font->pitch_family;
+    font->charset = user_font->charset;
+    font->baseline = user_font->baseline;
 
     /* Convert font size units. */
     if (font->size > 0.0)
@@ -345,7 +353,12 @@ _chart_convert_line_args(lxw_chart_line *user_line)
     line = calloc(1, sizeof(struct lxw_chart_line));
     RETURN_ON_MEM_ERROR(line, NULL);
 
-    memcpy(line, user_line, sizeof(lxw_chart_line));
+    /* Copy the user supplied properties. */
+    line->color = user_line->color;
+    line->none = user_line->none;
+    line->width = user_line->width;
+    line->dash_type = user_line->dash_type;
+    line->transparency = user_line->transparency;
 
     if (line->color) {
         line->color = lxw_format_check_color(line->color);
@@ -372,7 +385,10 @@ _chart_convert_fill_args(lxw_chart_fill *user_fill)
     fill = calloc(1, sizeof(struct lxw_chart_fill));
     RETURN_ON_MEM_ERROR(fill, NULL);
 
-    memcpy(fill, user_fill, sizeof(lxw_chart_fill));
+    /* Copy the user supplied properties. */
+    fill->color = user_fill->color;
+    fill->none = user_fill->none;
+    fill->transparency = user_fill->transparency;
 
     if (fill->color) {
         fill->color = lxw_format_check_color(fill->color);
@@ -409,7 +425,10 @@ _chart_convert_pattern_args(lxw_chart_pattern *user_pattern)
     pattern = calloc(1, sizeof(struct lxw_chart_pattern));
     RETURN_ON_MEM_ERROR(pattern, NULL);
 
-    memcpy(pattern, user_pattern, sizeof(lxw_chart_pattern));
+    /* Copy the user supplied properties. */
+    pattern->fg_color = user_pattern->fg_color;
+    pattern->bg_color = user_pattern->bg_color;
+    pattern->type = user_pattern->type;
 
     pattern->fg_color = lxw_format_check_color(pattern->fg_color);
     pattern->has_fg_color = LXW_TRUE;
@@ -424,8 +443,6 @@ _chart_convert_pattern_args(lxw_chart_pattern *user_pattern)
         pattern->has_bg_color = LXW_TRUE;
     }
 
-    pattern->type = user_pattern->type;
-
     return pattern;
 }
 
@@ -1137,7 +1154,7 @@ _chart_write_v_num(lxw_chart *self, double number)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", number);
+    lxw_sprintf_dbl(data, number);
 
     lxw_xml_data_element(self->file, "c:v", data, NULL);
 }
@@ -4565,6 +4582,10 @@ _chart_write_pie_plot_area(lxw_chart *self)
     /* Write subclass chart type elements for primary and secondary axes. */
     self->write_chart_type(self);
 
+    /* Write the c:spPr element for the plotarea formatting. */
+    _chart_write_sp_pr(self, self->plotarea_line, self->plotarea_fill,
+                       self->plotarea_pattern);
+
     lxw_xml_end_tag(self->file, "c:plotArea");
 }
 
@@ -5559,6 +5580,24 @@ chart_series_set_trendline_line(lxw_chart_series *series,
     series->trendline_line = _chart_convert_line_args(line);
 }
 
+/*
+ * Set the X or Y error bars from a chart series.
+ */
+lxw_series_error_bars *
+chart_series_get_error_bars(lxw_chart_series *series,
+                            lxw_chart_error_bar_axis axis_type)
+{
+    if (!series)
+        return NULL;
+
+    if (axis_type == LXW_CHART_ERROR_BAR_AXIS_X)
+        return series->x_error_bars;
+    else if (axis_type == LXW_CHART_ERROR_BAR_AXIS_Y)
+        return series->y_error_bars;
+    else
+        return NULL;
+}
+
 /*
  * Set the error bars and type for a chart series.
  */
@@ -5623,6 +5662,23 @@ chart_series_set_error_bars_line(lxw_series_error_bars *error_bars,
     error_bars->line = _chart_convert_line_args(line);
 }
 
+/*
+ * Get an axis pointer from a chart.
+ */
+lxw_chart_axis *
+chart_axis_get(lxw_chart *self, lxw_chart_axis_type axis_type)
+{
+    if (!self)
+        return NULL;
+
+    if (axis_type == LXW_CHART_AXIS_TYPE_X)
+        return self->x_axis;
+    else if (axis_type == LXW_CHART_AXIS_TYPE_Y)
+        return self->y_axis;
+    else
+        return NULL;
+}
+
 /*
  * Set an axis caption.
  */
@@ -5639,7 +5695,7 @@ chart_axis_set_name(lxw_chart_axis *axis, const char *name)
 }
 
 /*
- * Set an axis caption, with a range instead or a formula..
+ * Set an axis caption, with a range instead or a formula.
  */
 void
 chart_axis_set_name_range(lxw_chart_axis *axis, const char *sheetname,

data/ext/xlsxwriter/libxlsxwriter/src/content_types.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/core.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/custom.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -81,7 +81,7 @@ _chart_write_vt_r_8(lxw_custom *self, double value)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", value);
+    lxw_sprintf_dbl(data, value);
 
     lxw_xml_data_element(self->file, "vt:r8", data, NULL);
 }

data/ext/xlsxwriter/libxlsxwriter/src/drawing.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/format.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/hash_table.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/packager.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -62,7 +62,7 @@ _open_zipfile_win32(const char *filename)
     }
 
     /* Use the native Win32 file handling functions with minizip. */
-    fill_win32_filefunc64(&filefunc);
+    fill_win32_filefunc64W(&filefunc);
 
     return zipOpen2_64(wide_filename, 0, NULL, &filefunc);
 }
@@ -226,9 +226,9 @@ _write_image_files(lxw_packager *self)
             }
 
             err = _add_file_to_zip(self, image_stream, filename);
-            RETURN_ON_ERROR(err);
-
             fclose(image_stream);
+
+            RETURN_ON_ERROR(err);
         }
     }
 

data/ext/xlsxwriter/libxlsxwriter/src/relationships.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/shared_strings.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/styles.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/theme.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 

data/ext/xlsxwriter/libxlsxwriter/src/utility.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -527,3 +527,29 @@ lxw_tmpfile(char *tmpdir)
     return tmpfile();
 #endif
 }
+
+/*
+ * Sample function to handle sprintf of doubles for locale portable code. This
+ * is usually handled by a lxw_sprintf_dbl() macro but it can be replaced with
+ * a function of the same name.
+ *
+ * The code below is a simplified example that changes numbers like 123,45 to
+ * 123.45. End-users can replace this with something more rigorous if
+ * required.
+ */
+#ifdef USE_DOUBLE_FUNCTION
+int
+lxw_sprintf_dbl(char *data, double number)
+{
+    char *tmp;
+
+    lxw_snprintf(data, LXW_ATTR_32, "%.16g", number);
+
+    /* Replace comma with decimal point. */
+    tmp = strchr(data, ',');
+    if (tmp)
+        *tmp = '.';
+
+    return 0;
+}
+#endif

data/ext/xlsxwriter/libxlsxwriter/src/workbook.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -404,7 +404,6 @@ _prepare_num_formats(lxw_workbook *self)
     lxw_hash_element *used_format_element;
     uint16_t index = 0xA4;
     uint16_t num_format_count = 0;
-    char *num_format;
     uint16_t *num_format_index;
 
     LXW_FOREACH_ORDERED(used_format_element, self->used_xf_formats) {
@@ -415,12 +414,14 @@ _prepare_num_formats(lxw_workbook *self)
             continue;
 
         /* Check if there is a user defined number format string. */
-        num_format = format->num_format;
+        if (*format->num_format) {
+            char num_format[LXW_FORMAT_FIELD_LEN] = { 0 };
+            lxw_snprintf(num_format, LXW_FORMAT_FIELD_LEN, "%s",
+                         format->num_format);
 
-        if (*num_format) {
             /* Look up the num_format in the hash table. */
             hash_element = lxw_hash_key_exists(num_formats, num_format,
-                                               strlen(num_format));
+                                               LXW_FORMAT_FIELD_LEN);
 
             if (hash_element) {
                 /* Num_Format has already been used. */
@@ -432,7 +433,8 @@ _prepare_num_formats(lxw_workbook *self)
                 *num_format_index = index;
                 format->num_format_index = index;
                 lxw_insert_hash_element(num_formats, num_format,
-                                        num_format_index, strlen(num_format));
+                                        num_format_index,
+                                        LXW_FORMAT_FIELD_LEN);
                 index++;
                 num_format_count++;
             }

data/ext/xlsxwriter/libxlsxwriter/src/worksheet.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -194,6 +194,9 @@ lxw_worksheet_new(lxw_worksheet_init_data *init_data)
     worksheet->zoom_scale_normal = LXW_TRUE;
     worksheet->show_zeros = LXW_TRUE;
     worksheet->outline_on = LXW_TRUE;
+    worksheet->outline_style = LXW_TRUE;
+    worksheet->outline_below = LXW_TRUE;
+    worksheet->outline_right = LXW_FALSE;
     worksheet->tab_color = LXW_COLOR_UNSET;
 
     if (init_data) {
@@ -1464,6 +1467,12 @@ _worksheet_write_sheet_format_pr(lxw_worksheet *self)
     if (self->default_row_zeroed)
         LXW_PUSH_ATTRIBUTES_STR("zeroHeight", "1");
 
+    if (self->outline_row_level)
+        LXW_PUSH_ATTRIBUTES_INT("outlineLevelRow", self->outline_row_level);
+
+    if (self->outline_col_level)
+        LXW_PUSH_ATTRIBUTES_INT("outlineLevelCol", self->outline_col_level);
+
     lxw_xml_empty_tag(self->file, "sheetFormatPr", &attributes);
 
     LXW_FREE_ATTRIBUTES();
@@ -1700,6 +1709,9 @@ _write_row(lxw_worksheet *self, lxw_row *row, char *spans)
     if (height != LXW_DEF_ROW_HEIGHT)
         LXW_PUSH_ATTRIBUTES_STR("customHeight", "1");
 
+    if (row->level)
+        LXW_PUSH_ATTRIBUTES_INT("outlineLevel", row->level);
+
     if (row->collapsed)
         LXW_PUSH_ATTRIBUTES_STR("collapsed", "1");
 
@@ -2275,8 +2287,7 @@ _process_jpeg(lxw_image_options *image_options)
     if (fseek_err)
         goto file_error;
 
-    /* Search through the image data to read the height and width in the */
-    /* 0xFFC0/C2 element. Also read the DPI in the 0xFFE0 element. */
+    /* Search through the image data and read the JPEG markers. */
     while (!feof(stream)) {
 
         /* Read the JPEG marker and length fields for the sub-section. */
@@ -2293,7 +2304,10 @@ _process_jpeg(lxw_image_options *image_options)
         /* The offset for next fseek() is the field length + type length. */
         offset = length - 2;
 
-        if (marker == 0xFFC0 || marker == 0xFFC2) {
+        /* Read the height and width in the 0xFFCn elements (except C4, C8 */
+        /* and CC which aren't SOF markers). */
+        if ((marker & 0xFFF0) == 0xFFC0 && marker != 0xFFC4
+            && marker != 0xFFC8 && marker != 0xFFCC) {
             /* Skip 1 byte to height and width. */
             fseek_err = fseek(stream, 1, SEEK_CUR);
             if (fseek_err)
@@ -2311,6 +2325,7 @@ _process_jpeg(lxw_image_options *image_options)
             offset -= 9;
         }
 
+        /* Read the DPI in the 0xFFE0 element. */
         if (marker == 0xFFE0) {
             uint16_t x_density = 0;
             uint16_t y_density = 0;
@@ -2406,6 +2421,9 @@ _process_bmp(lxw_image_options *image_options)
     if (width == 0)
         goto file_error;
 
+    height = LXW_UINT32_HOST(height);
+    width = LXW_UINT32_HOST(width);
+
     /* Set the image metadata. */
     image_options->image_type = LXW_IMAGE_BMP;
     image_options->width = width;
@@ -2477,6 +2495,18 @@ STATIC void
 _write_number_cell(lxw_worksheet *self, char *range,
                    int32_t style_index, lxw_cell *cell)
 {
+#ifdef USE_DOUBLE_FUNCTION
+    char data[LXW_ATTR_32];
+
+    lxw_sprintf_dbl(data, cell->u.number);
+
+    if (style_index)
+        fprintf(self->file,
+                "<c r=\"%s\" s=\"%d\"><v>%s</v></c>",
+                range, style_index, data);
+    else
+        fprintf(self->file, "<c r=\"%s\"><v>%s</v></c>", range, data);
+#else
     if (style_index)
         fprintf(self->file,
                 "<c r=\"%s\" s=\"%d\"><v>%.16g</v></c>",
@@ -2484,6 +2514,8 @@ _write_number_cell(lxw_worksheet *self, char *range,
     else
         fprintf(self->file,
                 "<c r=\"%s\"><v>%.16g</v></c>", range, cell->u.number);
+
+#endif
 }
 
 /*
@@ -2494,6 +2526,7 @@ STATIC void
 _write_string_cell(lxw_worksheet *self, char *range,
                    int32_t style_index, lxw_cell *cell)
 {
+
     if (style_index)
         fprintf(self->file,
                 "<c r=\"%s\" s=\"%d\" t=\"s\"><v>%d</v></c>",
@@ -2551,8 +2584,7 @@ _write_formula_num_cell(lxw_worksheet *self, lxw_cell *cell)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", cell->formula_result);
-
+    lxw_sprintf_dbl(data, cell->formula_result);
     lxw_xml_data_element(self->file, "f", cell->u.string, NULL);
     lxw_xml_data_element(self->file, "v", data, NULL);
 }
@@ -2571,7 +2603,7 @@ _write_array_formula_num_cell(lxw_worksheet *self, lxw_cell *cell)
     LXW_PUSH_ATTRIBUTES_STR("t", "array");
     LXW_PUSH_ATTRIBUTES_STR("ref", cell->user_data1);
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", cell->formula_result);
+    lxw_sprintf_dbl(data, cell->formula_result);
 
     lxw_xml_data_element(self->file, "f", cell->u.string, &attributes);
     lxw_xml_data_element(self->file, "v", data, NULL);
@@ -2607,8 +2639,10 @@ _write_boolean_cell(lxw_worksheet *self, lxw_cell *cell)
 STATIC void
 _calculate_spans(struct lxw_row *row, char *span, int32_t *block_num)
 {
-    lxw_col_t span_col_min = RB_MIN(lxw_table_cells, row->cells)->col_num;
-    lxw_col_t span_col_max = RB_MAX(lxw_table_cells, row->cells)->col_num;
+    lxw_cell *cell_min = RB_MIN(lxw_table_cells, row->cells);
+    lxw_cell *cell_max = RB_MAX(lxw_table_cells, row->cells);
+    lxw_col_t span_col_min = cell_min->col_num;
+    lxw_col_t span_col_max = cell_max->col_num;
     lxw_col_t col_min;
     lxw_col_t col_max;
     *block_num = row->row_num / 16;
@@ -2618,8 +2652,10 @@ _calculate_spans(struct lxw_row *row, char *span, int32_t *block_num)
     while (row && (int32_t) (row->row_num / 16) == *block_num) {
 
         if (!RB_EMPTY(row->cells)) {
-            col_min = RB_MIN(lxw_table_cells, row->cells)->col_num;
-            col_max = RB_MAX(lxw_table_cells, row->cells)->col_num;
+            cell_min = RB_MIN(lxw_table_cells, row->cells);
+            cell_max = RB_MAX(lxw_table_cells, row->cells);
+            col_min = cell_min->col_num;
+            col_max = cell_max->col_num;
 
             if (col_min < span_col_min)
                 span_col_min = col_min;
@@ -3014,6 +3050,37 @@ _worksheet_write_tab_color(lxw_worksheet *self)
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <outlinePr> element.
+ */
+STATIC void
+_worksheet_write_outline_pr(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    if (!self->outline_changed)
+        return;
+
+    LXW_INIT_ATTRIBUTES();
+
+    if (self->outline_style)
+        LXW_PUSH_ATTRIBUTES_STR("applyStyles", "1");
+
+    if (!self->outline_below)
+        LXW_PUSH_ATTRIBUTES_STR("summaryBelow", "0");
+
+    if (!self->outline_right)
+        LXW_PUSH_ATTRIBUTES_STR("summaryRight", "0");
+
+    if (!self->outline_on)
+        LXW_PUSH_ATTRIBUTES_STR("showOutlineSymbols", "0");
+
+    lxw_xml_empty_tag(self->file, "outlinePr", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <sheetPr> element for Sheet level properties.
  */
@@ -3042,7 +3109,7 @@ _worksheet_write_sheet_pr(lxw_worksheet *self)
         || self->outline_changed) {
         lxw_xml_start_tag(self->file, "sheetPr", &attributes);
         _worksheet_write_tab_color(self);
-        /* _worksheet_write_outline_pr(self); */
+        _worksheet_write_outline_pr(self);
         _worksheet_write_page_set_up_pr(self);
         lxw_xml_end_tag(self->file, "sheetPr");
     }
@@ -3412,7 +3479,7 @@ _worksheet_write_formula1_num(lxw_worksheet *self, double number)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", number);
+    lxw_sprintf_dbl(data, number);
 
     lxw_xml_data_element(self->file, "formula1", data, NULL);
 }
@@ -3434,7 +3501,7 @@ _worksheet_write_formula2_num(lxw_worksheet *self, double number)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", number);
+    lxw_sprintf_dbl(data, number);
 
     lxw_xml_data_element(self->file, "formula2", data, NULL);
 }
@@ -4323,6 +4390,14 @@ worksheet_set_column_opt(lxw_worksheet *self,
     copied_options = calloc(1, sizeof(lxw_col_options));
     RETURN_ON_MEM_ERROR(copied_options, LXW_ERROR_MEMORY_MALLOC_FAILED);
 
+    /* Ensure the level is <= 7). */
+    if (level > 7)
+        level = 7;
+
+    if (level > self->outline_col_level)
+        self->outline_col_level = level;
+
+    /* Set the column properties. */
     copied_options->firstcol = firstcol;
     copied_options->lastcol = lastcol;
     copied_options->width = width;
@@ -4395,6 +4470,14 @@ worksheet_set_row_opt(lxw_worksheet *self,
         height = self->default_row_height;
     }
 
+    /* Ensure the level is <= 7). */
+    if (level > 7)
+        level = 7;
+
+    if (level > self->outline_row_level)
+        self->outline_row_level = level;
+
+    /* Store the row properties. */
     row = _get_row(self, row_num);
 
     row->height = height;
@@ -4780,7 +4863,7 @@ worksheet_set_header_opt(lxw_worksheet *self, const char *string,
                          lxw_header_footer_options *options)
 {
     if (options) {
-        if (options->margin > 0)
+        if (options->margin >= 0.0)
             self->margin_header = options->margin;
     }
 
@@ -4804,7 +4887,7 @@ worksheet_set_footer_opt(lxw_worksheet *self, const char *string,
                          lxw_header_footer_options *options)
 {
     if (options) {
-        if (options->margin > 0)
+        if (options->margin >= 0.0)
             self->margin_footer = options->margin;
     }
 
@@ -5132,11 +5215,23 @@ worksheet_protect(lxw_worksheet *self, const char *password,
     struct lxw_protection *protect = &self->protection;
 
     /* Copy any user parameters to the internal structure. */
-    if (options)
-        memcpy(protect, options, sizeof(lxw_protection));
-
-    /* Zero the hash storage in case of copied initialization data. */
-    protect->hash[0] = '\0';
+    if (options) {
+        protect->no_select_locked_cells = options->no_select_locked_cells;
+        protect->no_select_unlocked_cells = options->no_select_unlocked_cells;
+        protect->format_cells = options->format_cells;
+        protect->format_columns = options->format_columns;
+        protect->format_rows = options->format_rows;
+        protect->insert_columns = options->insert_columns;
+        protect->insert_rows = options->insert_rows;
+        protect->insert_hyperlinks = options->insert_hyperlinks;
+        protect->delete_columns = options->delete_columns;
+        protect->delete_rows = options->delete_rows;
+        protect->sort = options->sort;
+        protect->autofilter = options->autofilter;
+        protect->pivot_tables = options->pivot_tables;
+        protect->scenarios = options->scenarios;
+        protect->objects = options->objects;
+    }
 
     if (password) {
         uint16_t hash = _hash_password(password);
@@ -5146,6 +5241,23 @@ worksheet_protect(lxw_worksheet *self, const char *password,
     protect->is_configured = LXW_TRUE;
 }
 
+/*
+ * Set the worksheet properties for outlines and grouping.
+ */
+void
+worksheet_outline_settings(lxw_worksheet *self,
+                           uint8_t visible,
+                           uint8_t symbols_below,
+                           uint8_t symbols_right, uint8_t auto_style)
+{
+    self->outline_on = visible;
+    self->outline_below = symbols_below;
+    self->outline_right = symbols_right;
+    self->outline_style = auto_style;
+
+    self->outline_changed = LXW_TRUE;
+}
+
 /*
  * Set the default row properties
  */
@@ -5212,9 +5324,10 @@ worksheet_insert_image_opt(lxw_worksheet *self,
     }
 
     if (user_options) {
-        memcpy(options, user_options, sizeof(lxw_image_options));
-        options->url = lxw_strdup(user_options->url);
-        options->tip = lxw_strdup(user_options->tip);
+        options->x_offset = user_options->x_offset;
+        options->y_offset = user_options->y_offset;
+        options->x_scale = user_options->x_scale;
+        options->y_scale = user_options->y_scale;
     }
 
     /* Copy other options or set defaults. */
@@ -5299,8 +5412,12 @@ worksheet_insert_chart_opt(lxw_worksheet *self,
     options = calloc(1, sizeof(lxw_image_options));
     RETURN_ON_MEM_ERROR(options, LXW_ERROR_MEMORY_MALLOC_FAILED);
 
-    if (user_options)
-        memcpy(options, user_options, sizeof(lxw_image_options));
+    if (user_options) {
+        options->x_offset = user_options->x_offset;
+        options->y_offset = user_options->y_offset;
+        options->x_scale = user_options->x_scale;
+        options->y_scale = user_options->y_scale;
+    }
 
     /* Copy other options or set defaults. */
     options->row = row_num;