fast_excel 0.2.2 → 0.4.0

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -26,7 +26,7 @@
  * Create a new relationships object.
  */
 lxw_relationships *
-lxw_relationships_new()
+lxw_relationships_new(void)
 {
     lxw_relationships *rels = calloc(1, sizeof(lxw_relationships));
     GOTO_LABEL_ON_MEM_ERROR(rels, mem_error);

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -34,7 +34,7 @@ LXW_RB_GENERATE_ELEMENT(sst_rb_tree, sst_element, sst_tree_pointers,
  * Create a new SST SharedString object.
  */
 lxw_sst *
-lxw_sst_new()
+lxw_sst_new(void)
 {
     /* Create the new shared string table. */
     lxw_sst *sst = calloc(1, sizeof(lxw_sst));
@@ -161,6 +161,15 @@ _write_si(lxw_sst *self, char *string)
         free(string);
 }
 
+/*
+ * Write the <si> element for rich strings.
+ */
+STATIC void
+_write_rich_si(lxw_sst *self, char *string)
+{
+    lxw_xml_rich_si_element(self->file, string);
+}
+
 /*
  * Write the <sst> element.
  */
@@ -198,7 +207,11 @@ _write_sst_strings(lxw_sst *self)
 
     STAILQ_FOREACH(sst_element, self->order_list, sst_order_pointers) {
         /* Write the si element. */
-        _write_si(self, sst_element->string);
+        if (sst_element->is_rich_string)
+            _write_rich_si(self, sst_element->string);
+        else
+            _write_si(self, sst_element->string);
+
     }
 }
 
@@ -230,7 +243,7 @@ lxw_sst_assemble_xml_file(lxw_sst *self)
  * Add to or find a string in the SST SharedString table and return it's index.
  */
 struct sst_element *
-lxw_get_sst_index(lxw_sst *sst, const char *string)
+lxw_get_sst_index(lxw_sst *sst, const char *string, uint8_t is_rich_string)
 {
     struct sst_element *element;
     struct sst_element *existing_element;
@@ -243,6 +256,7 @@ lxw_get_sst_index(lxw_sst *sst, const char *string)
     /* Create potential new element with the string and its index. */
     element->index = sst->unique_count;
     element->string = lxw_strdup(string);
+    element->is_rich_string = is_rich_string;
 
     /* Try to insert it and see whether we already have that string. */
     existing_element = RB_INSERT(sst_rb_tree, sst->rb_tree, element);

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -14,6 +14,8 @@
 /*
  * Forward declarations.
  */
+STATIC void _write_font(lxw_styles *self, lxw_format *format,
+                        uint8_t is_rich_string);
 
 /*****************************************************************************
  *
@@ -25,7 +27,7 @@
  * Create a new styles object.
  */
 lxw_styles *
-lxw_styles_new()
+lxw_styles_new(void)
 {
     lxw_styles *styles = calloc(1, sizeof(lxw_styles));
     GOTO_LABEL_ON_MEM_ERROR(styles, mem_error);
@@ -66,6 +68,34 @@ lxw_styles_free(lxw_styles *styles)
     free(styles);
 }
 
+/*
+ * Write the <t> element for rich strings.
+ */
+void
+lxw_styles_write_string_fragment(lxw_styles *self, char *string)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+
+    /* Add attribute to preserve leading or trailing whitespace. */
+    if (isspace((unsigned char) string[0])
+        || isspace((unsigned char) string[strlen(string) - 1]))
+        LXW_PUSH_ATTRIBUTES_STR("xml:space", "preserve");
+
+    lxw_xml_data_element(self->file, "t", string, &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
+void
+lxw_styles_write_rich_font(lxw_styles *self, lxw_format *format)
+{
+
+    _write_font(self, format, LXW_TRUE);
+}
+
 /*****************************************************************************
  *
  * XML functions.
@@ -125,6 +155,7 @@ _write_num_fmts(lxw_styles *self)
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
     lxw_format *format;
+    uint16_t last_format_index = 0;
 
     if (!self->num_format_count)
         return;
@@ -141,7 +172,13 @@ _write_num_fmts(lxw_styles *self)
         if (format->num_format_index < 164)
             continue;
 
+        /* Ignore duplicates which have an already used index. */
+        if (format->num_format_index <= last_format_index)
+            continue;
+
         _write_num_fmt(self, format->num_format_index, format->num_format);
+
+        last_format_index = format->num_format_index;
     }
 
     lxw_xml_end_tag(self->file, "numFmts");
@@ -153,13 +190,13 @@ _write_num_fmts(lxw_styles *self)
  * Write the <sz> element.
  */
 STATIC void
-_write_font_size(lxw_styles *self, uint16_t font_size)
+_write_font_size(lxw_styles *self, double font_size)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
 
     LXW_INIT_ATTRIBUTES();
-    LXW_PUSH_ATTRIBUTES_INT("val", font_size);
+    LXW_PUSH_ATTRIBUTES_DBL("val", font_size);
 
     lxw_xml_empty_tag(self->file, "sz", &attributes);
 
@@ -207,7 +244,8 @@ _write_font_color_rgb(lxw_styles *self, int32_t rgb)
  * Write the <name> element.
  */
 STATIC void
-_write_font_name(lxw_styles *self, const char *font_name)
+_write_font_name(lxw_styles *self, const char *font_name,
+                 uint8_t is_rich_string)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
@@ -219,7 +257,10 @@ _write_font_name(lxw_styles *self, const char *font_name)
     else
         LXW_PUSH_ATTRIBUTES_STR("val", LXW_DEFAULT_FONT_NAME);
 
-    lxw_xml_empty_tag(self->file, "name", &attributes);
+    if (is_rich_string)
+        lxw_xml_empty_tag(self->file, "rFont", &attributes);
+    else
+        lxw_xml_empty_tag(self->file, "name", &attributes);
 
     LXW_FREE_ATTRIBUTES();
 }
@@ -309,9 +350,12 @@ _write_vert_align(lxw_styles *self, const char *align)
  * Write the <font> element.
  */
 STATIC void
-_write_font(lxw_styles *self, lxw_format *format)
+_write_font(lxw_styles *self, lxw_format *format, uint8_t is_rich_string)
 {
-    lxw_xml_start_tag(self->file, "font", NULL);
+    if (is_rich_string)
+        lxw_xml_start_tag(self->file, "rPr", NULL);
+    else
+        lxw_xml_start_tag(self->file, "font", NULL);
 
     if (format->bold)
         lxw_xml_empty_tag(self->file, "b", NULL);
@@ -337,7 +381,7 @@ _write_font(lxw_styles *self, lxw_format *format)
     if (format->font_script == LXW_FONT_SUBSCRIPT)
         _write_vert_align(self, "subscript");
 
-    if (format->font_size)
+    if (format->font_size > 0.0)
         _write_font_size(self, format->font_size);
 
     if (format->theme)
@@ -347,7 +391,7 @@ _write_font(lxw_styles *self, lxw_format *format)
     else
         _write_font_color_theme(self, LXW_DEFAULT_FONT_THEME);
 
-    _write_font_name(self, format->font_name);
+    _write_font_name(self, format->font_name, is_rich_string);
     _write_font_family(self, format->font_family);
 
     /* Only write the scheme element for the default font type if it
@@ -358,7 +402,10 @@ _write_font(lxw_styles *self, lxw_format *format)
         _write_font_scheme(self, format->font_scheme);
     }
 
-    lxw_xml_end_tag(self->file, "font");
+    if (is_rich_string)
+        lxw_xml_end_tag(self->file, "rPr");
+    else
+        lxw_xml_end_tag(self->file, "font");
 }
 
 /*
@@ -378,7 +425,7 @@ _write_fonts(lxw_styles *self)
 
     STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
         if (format->has_font)
-            _write_font(self, format);
+            _write_font(self, format, LXW_FALSE);
     }
 
     lxw_xml_end_tag(self->file, "fonts");

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -289,7 +289,7 @@ const char *theme_strs[] = {
  * Create a new theme object.
  */
 lxw_theme *
-lxw_theme_new()
+lxw_theme_new(void)
 {
     lxw_theme *theme = calloc(1, sizeof(lxw_theme));
     GOTO_LABEL_ON_MEM_ERROR(theme, mem_error);

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include "xlsxwriter/utility.h"
+#include "xlsxwriter.h"
 #include "xlsxwriter/third_party/tmpfileplus.h"
 
 char *error_strings[LXW_MAX_ERRNO + 1] = {
@@ -20,14 +20,21 @@ char *error_strings[LXW_MAX_ERRNO + 1] = {
     "Memory error, failed to malloc() required memory.",
     "Error creating output xlsx file. Usually a permissions error.",
     "Error encountered when creating a tmpfile during file assembly.",
-    "Zlib error with a file operation while creating xlsx file.",
-    "Zlib error when adding sub file to xlsx file.",
-    "Zlib error when closing xlsx file.",
+    "Error reading a tmpfile.",
+    "Zip generic error ZIP_ERRNO while creating the xlsx file.",
+    "Zip error ZIP_PARAMERROR while creating the xlsx file.",
+    "Zip error ZIP_BADZIPFILE (use_zip64 option may be required).",
+    "Zip error ZIP_INTERNALERROR while creating the xlsx file.",
+    "File error or unknown zip error when adding sub file to xlsx file.",
+    "Unknown zip error when closing xlsx file.",
     "NULL function parameter ignored.",
     "Function parameter validation error.",
     "Worksheet name exceeds Excel's limit of 31 characters.",
-    "Worksheet name contains invalid Excel character: '[]:*?/\\'",
+    "Worksheet name cannot contain invalid characters: '[ ] : * ? / \\'",
+    "Worksheet name cannot start or end with an apostrophe.",
     "Worksheet name is already in use.",
+    "Worksheet name 'History' is reserved by Excel.",
+    "Parameter exceeds Excel's limit of 32 characters.",
     "Parameter exceeds Excel's limit of 128 characters.",
     "Parameter exceeds Excel's limit of 255 characters.",
     "String exceeds Excel's limit of 32,767 characters.",
@@ -419,6 +426,19 @@ lxw_strdup(const char *str)
     return copy;
 }
 
+/* Simple function to strdup() a formula string without the leading "=". */
+char *
+lxw_strdup_formula(const char *formula)
+{
+    if (!formula)
+        return NULL;
+
+    if (formula[0] == '=')
+        return lxw_strdup(formula + 1);
+    else
+        return lxw_strdup(formula);
+}
+
 /* Simple strlen that counts UTF-8 characters. Assumes well formed UTF-8. */
 size_t
 lxw_utf8_strlen(const char *str)
@@ -513,3 +533,70 @@ 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
+
+/*
+ * Retrieve runtime library version
+ */
+const char *
+lxw_version(void)
+{
+    return LXW_VERSION;
+}
+
+/*
+ * Hash a worksheet password. Based on the algorithm provided by Daniel Rentz
+ * of OpenOffice.
+ */
+uint16_t
+lxw_hash_password(const char *password)
+{
+    size_t count;
+    uint8_t i;
+    uint16_t hash = 0x0000;
+
+    count = strlen(password);
+
+    for (i = 0; i < count; i++) {
+        uint32_t low_15;
+        uint32_t high_15;
+        uint32_t letter = password[i] << (i + 1);
+
+        low_15 = letter & 0x7fff;
+        high_15 = letter & (0x7fff << 15);
+        high_15 = high_15 >> 15;
+        letter = low_15 | high_15;
+
+        hash ^= letter;
+    }
+
+    hash ^= count;
+    hash ^= 0xCE4B;
+
+    return hash;
+}

data/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-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -13,10 +13,15 @@
 #include "xlsxwriter/packager.h"
 #include "xlsxwriter/hash_table.h"
 
-STATIC int _name_cmp(lxw_worksheet_name *name1, lxw_worksheet_name *name2);
+STATIC int _worksheet_name_cmp(lxw_worksheet_name *name1,
+                               lxw_worksheet_name *name2);
+STATIC int _chartsheet_name_cmp(lxw_chartsheet_name *name1,
+                                lxw_chartsheet_name *name2);
 #ifndef __clang_analyzer__
-LXW_RB_GENERATE_NAMES(lxw_worksheet_names, lxw_worksheet_name, tree_pointers,
-                      _name_cmp);
+LXW_RB_GENERATE_WORKSHEET_NAMES(lxw_worksheet_names, lxw_worksheet_name,
+                                tree_pointers, _worksheet_name_cmp);
+LXW_RB_GENERATE_CHARTSHEET_NAMES(lxw_chartsheet_names, lxw_chartsheet_name,
+                                 tree_pointers, _chartsheet_name_cmp);
 #endif
 
 /*
@@ -30,12 +35,18 @@ LXW_RB_GENERATE_NAMES(lxw_worksheet_names, lxw_worksheet_name, tree_pointers,
  ****************************************************************************/
 
 /*
- * Comparator for the worksheet names structure red/black tree.
+ * Comparators for the sheet names structure red/black tree.
  */
 STATIC int
-_name_cmp(lxw_worksheet_name *name1, lxw_worksheet_name *name2)
+_worksheet_name_cmp(lxw_worksheet_name *name1, lxw_worksheet_name *name2)
 {
-    return strcmp(name1->name, name2->name);
+    return lxw_strcasecmp(name1->name, name2->name);
+}
+
+STATIC int
+_chartsheet_name_cmp(lxw_chartsheet_name *name1, lxw_chartsheet_name *name2)
+{
+    return lxw_strcasecmp(name1->name, name2->name);
 }
 
 /*
@@ -81,9 +92,11 @@ _free_custom_doc_property(lxw_custom_property *custom_property)
 void
 lxw_workbook_free(lxw_workbook *workbook)
 {
-    lxw_worksheet *worksheet;
+    lxw_sheet *sheet;
     struct lxw_worksheet_name *worksheet_name;
-    struct lxw_worksheet_name *next_name;
+    struct lxw_worksheet_name *next_worksheet_name;
+    struct lxw_chartsheet_name *chartsheet_name;
+    struct lxw_chartsheet_name *next_chartsheet_name;
     lxw_chart *chart;
     lxw_format *format;
     lxw_defined_name *defined_name;
@@ -97,17 +110,26 @@ lxw_workbook_free(lxw_workbook *workbook)
 
     free(workbook->filename);
 
-    /* Free the worksheets in the workbook. */
-    if (workbook->worksheets) {
-        while (!STAILQ_EMPTY(workbook->worksheets)) {
-            worksheet = STAILQ_FIRST(workbook->worksheets);
-            STAILQ_REMOVE_HEAD(workbook->worksheets, list_pointers);
-            lxw_worksheet_free(worksheet);
-        }
-        free(workbook->worksheets);
+    /* Free the sheets in the workbook. */
+    if (workbook->sheets) {
+        while (!STAILQ_EMPTY(workbook->sheets)) {
+            sheet = STAILQ_FIRST(workbook->sheets);
+
+            if (sheet->is_chartsheet)
+                lxw_chartsheet_free(sheet->u.chartsheet);
+            else
+                lxw_worksheet_free(sheet->u.worksheet);
 
+            STAILQ_REMOVE_HEAD(workbook->sheets, list_pointers);
+            free(sheet);
+        }
+        free(workbook->sheets);
     }
 
+    /* Free the sheet lists. The worksheet objects are freed above. */
+    free(workbook->worksheets);
+    free(workbook->chartsheets);
+
     /* Free the charts in the workbook. */
     if (workbook->charts) {
         while (!STAILQ_EMPTY(workbook->charts)) {
@@ -153,22 +175,41 @@ lxw_workbook_free(lxw_workbook *workbook)
     if (workbook->worksheet_names) {
         for (worksheet_name =
              RB_MIN(lxw_worksheet_names, workbook->worksheet_names);
-             worksheet_name; worksheet_name = next_name) {
+             worksheet_name; worksheet_name = next_worksheet_name) {
 
-            next_name = RB_NEXT(lxw_worksheet_names,
-                                workbook->worksheet_name, worksheet_name);
-            RB_REMOVE(lxw_worksheet_names,
-                      workbook->worksheet_names, worksheet_name);
+            next_worksheet_name = RB_NEXT(lxw_worksheet_names,
+                                          workbook->worksheet_name,
+                                          worksheet_name);
+            RB_REMOVE(lxw_worksheet_names, workbook->worksheet_names,
+                      worksheet_name);
             free(worksheet_name);
         }
 
         free(workbook->worksheet_names);
     }
 
+    if (workbook->chartsheet_names) {
+        for (chartsheet_name =
+             RB_MIN(lxw_chartsheet_names, workbook->chartsheet_names);
+             chartsheet_name; chartsheet_name = next_chartsheet_name) {
+
+            next_chartsheet_name = RB_NEXT(lxw_chartsheet_names,
+                                           workbook->chartsheet_name,
+                                           chartsheet_name);
+            RB_REMOVE(lxw_chartsheet_names, workbook->chartsheet_names,
+                      chartsheet_name);
+            free(chartsheet_name);
+        }
+
+        free(workbook->chartsheet_names);
+    }
+
     lxw_hash_free(workbook->used_xf_formats);
     lxw_sst_free(workbook->sst);
     free(workbook->options.tmpdir);
     free(workbook->ordered_charts);
+    free(workbook->vba_project);
+    free(workbook->vba_codename);
     free(workbook);
 }
 
@@ -404,7 +445,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 +455,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. */
@@ -431,8 +473,9 @@ _prepare_num_formats(lxw_workbook *self)
                 num_format_index = calloc(1, sizeof(uint16_t));
                 *num_format_index = index;
                 format->num_format_index = index;
-                lxw_insert_hash_element(num_formats, num_format,
-                                        num_format_index, strlen(num_format));
+                lxw_insert_hash_element(num_formats, format->num_format,
+                                        num_format_index,
+                                        LXW_FORMAT_FIELD_LEN);
                 index++;
                 num_format_count++;
             }
@@ -494,6 +537,7 @@ _store_defined_name(lxw_workbook *self, const char *name,
                     const char *app_name, const char *formula, int16_t index,
                     uint8_t hidden)
 {
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     lxw_defined_name *defined_name;
     lxw_defined_name *list_defined_name;
@@ -544,7 +588,12 @@ _store_defined_name(lxw_workbook *self, const char *name,
             worksheet_name[strlen(worksheet_name) - 1] = '\0';
 
         /* Search for worksheet name to get the equivalent worksheet index. */
-        STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
+        STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+            if (sheet->is_chartsheet)
+                continue;
+            else
+                worksheet = sheet->u.worksheet;
+
             if (strcmp(worksheet_name, worksheet->name) == 0) {
                 defined_name->index = worksheet->index;
                 lxw_strcpy(defined_name->normalised_sheetname,
@@ -835,13 +884,23 @@ _add_chart_cache_data(lxw_workbook *self)
 STATIC void
 _prepare_drawings(lxw_workbook *self)
 {
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     lxw_image_options *image_options;
-    uint16_t chart_ref_id = 0;
-    uint16_t image_ref_id = 0;
-    uint16_t drawing_id = 0;
-
-    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
+    uint32_t chart_ref_id = 0;
+    uint32_t image_ref_id = 0;
+    uint32_t drawing_id = 0;
+    uint8_t is_chartsheet;
+
+    STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+        if (sheet->is_chartsheet) {
+            worksheet = sheet->u.chartsheet->worksheet;
+            is_chartsheet = LXW_TRUE;
+        }
+        else {
+            worksheet = sheet->u.worksheet;
+            is_chartsheet = LXW_FALSE;
+        }
 
         if (STAILQ_EMPTY(worksheet->image_data)
             && STAILQ_EMPTY(worksheet->chart_data))
@@ -852,7 +911,7 @@ _prepare_drawings(lxw_workbook *self)
         STAILQ_FOREACH(image_options, worksheet->chart_data, list_pointers) {
             chart_ref_id++;
             lxw_worksheet_prepare_chart(worksheet, chart_ref_id, drawing_id,
-                                        image_options);
+                                        image_options, is_chartsheet);
             if (image_options->chart)
                 STAILQ_INSERT_TAIL(self->ordered_charts, image_options->chart,
                                    ordered_list_pointers);
@@ -887,14 +946,18 @@ STATIC void
 _prepare_defined_names(lxw_workbook *self)
 {
     lxw_worksheet *worksheet;
+    lxw_sheet *sheet;
     char app_name[LXW_DEFINED_NAME_LENGTH];
     char range[LXW_DEFINED_NAME_LENGTH];
     char area[LXW_MAX_CELL_RANGE_LENGTH];
     char first_col[8];
     char last_col[8];
 
-    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
-
+    STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            continue;
+        else
+            worksheet = sheet->u.worksheet;
         /*
          * Check for autofilter settings and store them.
          */
@@ -1074,6 +1137,10 @@ _write_file_version(lxw_workbook *self)
     LXW_PUSH_ATTRIBUTES_STR("lowestEdited", "4");
     LXW_PUSH_ATTRIBUTES_STR("rupBuild", "4505");
 
+    if (self->vba_project)
+        LXW_PUSH_ATTRIBUTES_STR("codeName",
+                                "{37E998C4-C9E5-D4B9-71C8-EB1FF731991C}");
+
     lxw_xml_empty_tag(self->file, "fileVersion", &attributes);
 
     LXW_FREE_ATTRIBUTES();
@@ -1089,6 +1156,10 @@ _write_workbook_pr(lxw_workbook *self)
     struct xml_attribute *attribute;
 
     LXW_INIT_ATTRIBUTES();
+
+    if (self->vba_codename)
+        LXW_PUSH_ATTRIBUTES_STR("codeName", self->vba_codename);
+
     LXW_PUSH_ATTRIBUTES_STR("defaultThemeVersion", "124226");
 
     lxw_xml_empty_tag(self->file, "workbookPr", &attributes);
@@ -1168,13 +1239,23 @@ _write_sheet(lxw_workbook *self, const char *name, uint32_t sheet_id,
 STATIC void
 _write_sheets(lxw_workbook *self)
 {
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
+    lxw_chartsheet *chartsheet;
 
     lxw_xml_start_tag(self->file, "sheets", NULL);
 
-    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
-        _write_sheet(self, worksheet->name, worksheet->index + 1,
-                     worksheet->hidden);
+    STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+        if (sheet->is_chartsheet) {
+            chartsheet = sheet->u.chartsheet;
+            _write_sheet(self, chartsheet->name, chartsheet->index + 1,
+                         chartsheet->hidden);
+        }
+        else {
+            worksheet = sheet->u.worksheet;
+            _write_sheet(self, worksheet->name, worksheet->index + 1,
+                         worksheet->hidden);
+        }
     }
 
     lxw_xml_end_tag(self->file, "sheets");
@@ -1222,9 +1303,6 @@ _write_defined_name(lxw_workbook *self, lxw_defined_name *defined_name)
     LXW_FREE_ATTRIBUTES();
 }
 
-/*
- * Write the <definedNames> element.
- */
 STATIC void
 _write_defined_names(lxw_workbook *self)
 {
@@ -1328,16 +1406,32 @@ workbook_new_opt(const char *filename, lxw_workbook_options *options)
     GOTO_LABEL_ON_MEM_ERROR(workbook, mem_error);
     workbook->filename = lxw_strdup(filename);
 
+    /* Add the sheets list. */
+    workbook->sheets = calloc(1, sizeof(struct lxw_sheets));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->sheets, mem_error);
+    STAILQ_INIT(workbook->sheets);
+
     /* Add the worksheets list. */
     workbook->worksheets = calloc(1, sizeof(struct lxw_worksheets));
     GOTO_LABEL_ON_MEM_ERROR(workbook->worksheets, mem_error);
     STAILQ_INIT(workbook->worksheets);
 
+    /* Add the chartsheets list. */
+    workbook->chartsheets = calloc(1, sizeof(struct lxw_chartsheets));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->chartsheets, mem_error);
+    STAILQ_INIT(workbook->chartsheets);
+
     /* Add the worksheet names tree. */
     workbook->worksheet_names = calloc(1, sizeof(struct lxw_worksheet_names));
     GOTO_LABEL_ON_MEM_ERROR(workbook->worksheet_names, mem_error);
     RB_INIT(workbook->worksheet_names);
 
+    /* Add the chartsheet names tree. */
+    workbook->chartsheet_names = calloc(1,
+                                        sizeof(struct lxw_chartsheet_names));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->chartsheet_names, mem_error);
+    RB_INIT(workbook->chartsheet_names);
+
     /* Add the charts list. */
     workbook->charts = calloc(1, sizeof(struct lxw_charts));
     GOTO_LABEL_ON_MEM_ERROR(workbook->charts, mem_error);
@@ -1386,6 +1480,7 @@ workbook_new_opt(const char *filename, lxw_workbook_options *options)
     if (options) {
         workbook->options.constant_memory = options->constant_memory;
         workbook->options.tmpdir = lxw_strdup(options->tmpdir);
+        workbook->options.use_zip64 = options->use_zip64;
     }
 
     return workbook;
@@ -1402,7 +1497,8 @@ mem_error:
 lxw_worksheet *
 workbook_add_worksheet(lxw_workbook *self, const char *sheetname)
 {
-    lxw_worksheet *worksheet;
+    lxw_sheet *sheet = NULL;
+    lxw_worksheet *worksheet = NULL;
     lxw_worksheet_name *worksheet_name = NULL;
     lxw_error error;
     lxw_worksheet_init_data init_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -1419,13 +1515,13 @@ workbook_add_worksheet(lxw_workbook *self, const char *sheetname)
         GOTO_LABEL_ON_MEM_ERROR(new_name, mem_error);
 
         lxw_snprintf(new_name, LXW_MAX_SHEETNAME_LENGTH, "Sheet%d",
-                     self->num_sheets + 1);
+                     self->num_worksheets + 1);
         init_data.name = new_name;
         init_data.quoted_name = lxw_strdup(new_name);
     }
 
     /* Check that the worksheet name is valid. */
-    error = workbook_validate_worksheet_name(self, init_data.name);
+    error = workbook_validate_sheet_name(self, init_data.name);
     if (error) {
         LXW_WARN_FORMAT2("workbook_add_worksheet(): worksheet name '%s' has "
                          "error: %s", init_data.name, lxw_strerror(error));
@@ -1449,9 +1545,19 @@ workbook_add_worksheet(lxw_workbook *self, const char *sheetname)
     worksheet = lxw_worksheet_new(&init_data);
     GOTO_LABEL_ON_MEM_ERROR(worksheet, mem_error);
 
-    self->num_sheets++;
+    /* Add it to the worksheet list. */
+    self->num_worksheets++;
     STAILQ_INSERT_TAIL(self->worksheets, worksheet, list_pointers);
 
+    /* Create a new sheet object. */
+    sheet = calloc(1, sizeof(lxw_sheet));
+    GOTO_LABEL_ON_MEM_ERROR(sheet, mem_error);
+    sheet->u.worksheet = worksheet;
+
+    /* Add it to the worksheet list. */
+    self->num_sheets++;
+    STAILQ_INSERT_TAIL(self->sheets, sheet, list_pointers);
+
     /* Store the worksheet so we can look it up by name. */
     worksheet_name->name = init_data.name;
     worksheet_name->worksheet = worksheet;
@@ -1463,6 +1569,91 @@ mem_error:
     free(init_data.name);
     free(init_data.quoted_name);
     free(worksheet_name);
+    free(worksheet);
+    return NULL;
+}
+
+/*
+ * Add a new chartsheet to the Excel workbook.
+ */
+lxw_chartsheet *
+workbook_add_chartsheet(lxw_workbook *self, const char *sheetname)
+{
+    lxw_sheet *sheet = NULL;
+    lxw_chartsheet *chartsheet = NULL;
+    lxw_chartsheet_name *chartsheet_name = NULL;
+    lxw_error error;
+    lxw_worksheet_init_data init_data = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    char *new_name = NULL;
+
+    if (sheetname) {
+        /* Use the user supplied name. */
+        init_data.name = lxw_strdup(sheetname);
+        init_data.quoted_name = lxw_quote_sheetname((char *) sheetname);
+    }
+    else {
+        /* Use the default SheetN name. */
+        new_name = malloc(LXW_MAX_SHEETNAME_LENGTH);
+        GOTO_LABEL_ON_MEM_ERROR(new_name, mem_error);
+
+        lxw_snprintf(new_name, LXW_MAX_SHEETNAME_LENGTH, "Chart%d",
+                     self->num_chartsheets + 1);
+        init_data.name = new_name;
+        init_data.quoted_name = lxw_strdup(new_name);
+    }
+
+    /* Check that the chartsheet name is valid. */
+    error = workbook_validate_sheet_name(self, init_data.name);
+    if (error) {
+        LXW_WARN_FORMAT2
+            ("workbook_add_chartsheet(): chartsheet name '%s' has "
+             "error: %s", init_data.name, lxw_strerror(error));
+        goto mem_error;
+    }
+
+    /* Create a struct to find/store the chartsheet name/pointer. */
+    chartsheet_name = calloc(1, sizeof(struct lxw_chartsheet_name));
+    GOTO_LABEL_ON_MEM_ERROR(chartsheet_name, mem_error);
+
+    /* Initialize the metadata to pass to the chartsheet. */
+    init_data.hidden = 0;
+    init_data.index = self->num_sheets;
+    init_data.sst = self->sst;
+    init_data.optimize = self->options.constant_memory;
+    init_data.active_sheet = &self->active_sheet;
+    init_data.first_sheet = &self->first_sheet;
+    init_data.tmpdir = self->options.tmpdir;
+
+    /* Create a new chartsheet object. */
+    chartsheet = lxw_chartsheet_new(&init_data);
+    GOTO_LABEL_ON_MEM_ERROR(chartsheet, mem_error);
+
+    /* Add it to the chartsheet list. */
+    self->num_chartsheets++;
+    STAILQ_INSERT_TAIL(self->chartsheets, chartsheet, list_pointers);
+
+    /* Create a new sheet object. */
+    sheet = calloc(1, sizeof(lxw_sheet));
+    GOTO_LABEL_ON_MEM_ERROR(sheet, mem_error);
+    sheet->is_chartsheet = LXW_TRUE;
+    sheet->u.chartsheet = chartsheet;
+
+    /* Add it to the chartsheet list. */
+    self->num_sheets++;
+    STAILQ_INSERT_TAIL(self->sheets, sheet, list_pointers);
+
+    /* Store the chartsheet so we can look it up by name. */
+    chartsheet_name->name = init_data.name;
+    chartsheet_name->chartsheet = chartsheet;
+    RB_INSERT(lxw_chartsheet_names, self->chartsheet_names, chartsheet_name);
+
+    return chartsheet;
+
+mem_error:
+    free(init_data.name);
+    free(init_data.quoted_name);
+    free(chartsheet_name);
+    free(chartsheet);
     return NULL;
 }
 
@@ -1526,6 +1717,7 @@ workbook_default_format(lxw_workbook *self)
 lxw_error
 workbook_close(lxw_workbook *self)
 {
+    lxw_sheet *sheet = NULL;
     lxw_worksheet *worksheet = NULL;
     lxw_packager *packager = NULL;
     lxw_error error = LXW_NO_ERROR;
@@ -1536,17 +1728,41 @@ workbook_close(lxw_workbook *self)
 
     /* Ensure that at least one worksheet has been selected. */
     if (self->active_sheet == 0) {
-        worksheet = STAILQ_FIRST(self->worksheets);
-        worksheet->selected = 1;
-        worksheet->hidden = 0;
+        sheet = STAILQ_FIRST(self->sheets);
+        if (!sheet->is_chartsheet) {
+            worksheet = sheet->u.worksheet;
+            worksheet->selected = 1;
+            worksheet->hidden = 0;
+        }
     }
 
     /* Set the active sheet. */
-    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            continue;
+        else
+            worksheet = sheet->u.worksheet;
+
         if (worksheet->index == self->active_sheet)
             worksheet->active = 1;
     }
 
+    /* Set workbook and worksheet VBA codenames if a macro has been added. */
+    if (self->vba_project) {
+        if (!self->vba_codename)
+            workbook_set_vba_name(self, "ThisWorkbook");
+
+        STAILQ_FOREACH(sheet, self->sheets, list_pointers) {
+            if (sheet->is_chartsheet)
+                continue;
+            else
+                worksheet = sheet->u.worksheet;
+
+            if (!worksheet->vba_codename)
+                worksheet_set_vba_name(worksheet, worksheet->name);
+        }
+    }
+
     /* Set the defined names for the worksheets such as Print Titles. */
     _prepare_defined_names(self);
 
@@ -1557,13 +1773,15 @@ workbook_close(lxw_workbook *self)
     _add_chart_cache_data(self);
 
     /* Create a packager object to assemble sub-elements into a zip file. */
-    packager = lxw_packager_new(self->filename, self->options.tmpdir);
+    packager = lxw_packager_new(self->filename,
+                                self->options.tmpdir,
+                                self->options.use_zip64);
 
     /* If the packager fails it is generally due to a zip permission error. */
     if (packager == NULL) {
         fprintf(stderr, "[ERROR] workbook_close(): "
                 "Error creating '%s'. "
-                "Error = %s\n", self->filename, strerror(errno));
+                "System error = %s\n", self->filename, strerror(errno));
 
         error = LXW_ERROR_CREATING_XLSX_FILE;
         goto mem_error;
@@ -1579,26 +1797,47 @@ workbook_close(lxw_workbook *self)
     if (error == LXW_ERROR_CREATING_TMPFILE) {
         fprintf(stderr, "[ERROR] workbook_close(): "
                 "Error creating tmpfile(s) to assemble '%s'. "
-                "Error = %s\n", self->filename, strerror(errno));
+                "System error = %s\n", self->filename, strerror(errno));
     }
 
-    /* If LXW_ERROR_ZIP_FILE_OPERATION then errno is set by zlib. */
+    /* If LXW_ERROR_ZIP_FILE_OPERATION then errno is set by zip. */
     if (error == LXW_ERROR_ZIP_FILE_OPERATION) {
         fprintf(stderr, "[ERROR] workbook_close(): "
-                "Zlib error while creating xlsx file '%s'. "
-                "Error = %s\n", self->filename, strerror(errno));
+                "Zip ZIP_ERRNO error while creating xlsx file '%s'. "
+                "System error = %s\n", self->filename, strerror(errno));
+    }
+
+    /* If LXW_ERROR_ZIP_PARAMETER_ERROR then errno is set by zip. */
+    if (error == LXW_ERROR_ZIP_PARAMETER_ERROR) {
+        fprintf(stderr, "[ERROR] workbook_close(): "
+                "Zip ZIP_PARAMERROR error while creating xlsx file '%s'. "
+                "System error = %s\n", self->filename, strerror(errno));
+    }
+
+    /* If LXW_ERROR_ZIP_BAD_ZIP_FILE then errno is set by zip. */
+    if (error == LXW_ERROR_ZIP_BAD_ZIP_FILE) {
+        fprintf(stderr, "[ERROR] workbook_close(): "
+                "Zip ZIP_BADZIPFILE error while creating xlsx file '%s'. "
+                "This may require the use_zip64 option for large files. "
+                "System error = %s\n", self->filename, strerror(errno));
+    }
+
+    /* If LXW_ERROR_ZIP_INTERNAL_ERROR then errno is set by zip. */
+    if (error == LXW_ERROR_ZIP_INTERNAL_ERROR) {
+        fprintf(stderr, "[ERROR] workbook_close(): "
+                "Zip ZIP_INTERNALERROR error while creating xlsx file '%s'. "
+                "System error = %s\n", self->filename, strerror(errno));
     }
 
     /* The next 2 error conditions don't set errno. */
     if (error == LXW_ERROR_ZIP_FILE_ADD) {
         fprintf(stderr, "[ERROR] workbook_close(): "
-                "Zlib error adding file to xlsx file '%s'.\n",
-                self->filename);
+                "Zip error adding file to xlsx file '%s'.\n", self->filename);
     }
 
     if (error == LXW_ERROR_ZIP_CLOSE) {
         fprintf(stderr, "[ERROR] workbook_close(): "
-                "Zlib error closing xlsx file '%s'.\n", self->filename);
+                "Zip error closing xlsx file '%s'.\n", self->filename);
     }
 
 mem_error:
@@ -1908,11 +2147,33 @@ workbook_get_worksheet_by_name(lxw_workbook *self, const char *name)
         return NULL;
 }
 
+/*
+ * Get a chartsheet object from its name.
+ */
+lxw_chartsheet *
+workbook_get_chartsheet_by_name(lxw_workbook *self, const char *name)
+{
+    lxw_chartsheet_name chartsheet_name;
+    lxw_chartsheet_name *found;
+
+    if (!name)
+        return NULL;
+
+    chartsheet_name.name = name;
+    found = RB_FIND(lxw_chartsheet_names,
+                    self->chartsheet_names, &chartsheet_name);
+
+    if (found)
+        return found->chartsheet;
+    else
+        return NULL;
+}
+
 /*
  * Validate the worksheet name based on Excel's rules.
  */
 lxw_error
-workbook_validate_worksheet_name(lxw_workbook *self, const char *sheetname)
+workbook_validate_sheet_name(lxw_workbook *self, const char *sheetname)
 {
     /* Check the UTF-8 length of the worksheet name. */
     if (lxw_utf8_strlen(sheetname) > LXW_SHEETNAME_MAX)
@@ -1922,9 +2183,66 @@ workbook_validate_worksheet_name(lxw_workbook *self, const char *sheetname)
     if (strpbrk(sheetname, "[]:*?/\\"))
         return LXW_ERROR_INVALID_SHEETNAME_CHARACTER;
 
+    /* Check that the worksheet doesn't start or end with an apostrophe. */
+    if (sheetname[0] == '\'' || sheetname[strlen(sheetname) - 1] == '\'')
+        return LXW_ERROR_SHEETNAME_START_END_APOSTROPHE;
+
+    /* Check that the worksheet name isn't the reserved work "History". */
+    if (lxw_strcasecmp(sheetname, "history") == 0)
+        return LXW_ERROR_SHEETNAME_RESERVED;
+
     /* Check if the worksheet name is already in use. */
     if (workbook_get_worksheet_by_name(self, sheetname))
         return LXW_ERROR_SHEETNAME_ALREADY_USED;
 
+    /* Check if the chartsheet name is already in use. */
+    if (workbook_get_chartsheet_by_name(self, sheetname))
+        return LXW_ERROR_SHEETNAME_ALREADY_USED;
+
+    return LXW_NO_ERROR;
+}
+
+/*
+ * Add a vbaProject binary to the Excel workbook.
+ */
+lxw_error
+workbook_add_vba_project(lxw_workbook *self, const char *filename)
+{
+    FILE *filehandle;
+
+    if (!filename) {
+        LXW_WARN("workbook_add_vba_project(): "
+                 "filename must be specified.");
+        return LXW_ERROR_NULL_PARAMETER_IGNORED;
+    }
+
+    /* Check that the vbaProject file exists and can be opened. */
+    filehandle = fopen(filename, "rb");
+    if (!filehandle) {
+        LXW_WARN_FORMAT1("workbook_add_vba_project(): "
+                         "file doesn't exist or can't be opened: %s.",
+                         filename);
+        return LXW_ERROR_PARAMETER_VALIDATION;
+    }
+    fclose(filehandle);
+
+    self->vba_project = lxw_strdup(filename);
+
+    return LXW_NO_ERROR;
+}
+
+/*
+ * Set the VBA name for the workbook.
+ */
+lxw_error
+workbook_set_vba_name(lxw_workbook *self, const char *name)
+{
+    if (!name) {
+        LXW_WARN("workbook_set_vba_name(): " "name must be specified.");
+        return LXW_ERROR_NULL_PARAMETER_IGNORED;
+    }
+
+    self->vba_codename = lxw_strdup(name);
+
     return LXW_NO_ERROR;
 }