fast_excel 0.2.6 → 0.3.0

data/libxlsxwriter/include/xlsxwriter/common.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -9,7 +9,7 @@
  *
  * @brief Common functions and defines for the libxlsxwriter library.
  *
- * <!-- Copyright 2014-2018, John McNamara, jmcnamara@cpan.org -->
+ * <!-- Copyright 2014-2019, John McNamara, jmcnamara@cpan.org -->
  *
  */
 #ifndef __LXW_COMMON_H__
@@ -65,13 +65,25 @@ typedef enum lxw_error {
     /** Error encountered when creating a tmpfile during file assembly. */
     LXW_ERROR_CREATING_TMPFILE,
 
-    /** Zlib error with a file operation while creating xlsx file. */
+    /** Error reading a tmpfile. */
+    LXW_ERROR_READING_TMPFILE,
+
+    /** Zip generic error ZIP_ERRNO while creating the xlsx file. */
     LXW_ERROR_ZIP_FILE_OPERATION,
 
-    /** Zlib error when adding sub file to xlsx file. */
+    /** Zip error ZIP_PARAMERROR while creating the xlsx file. */
+    LXW_ERROR_ZIP_PARAMETER_ERROR,
+
+    /** Zip error ZIP_BADZIPFILE (use_zip64 option may be required). */
+    LXW_ERROR_ZIP_BAD_ZIP_FILE,
+
+    /** Zip error ZIP_INTERNALERROR while creating the xlsx file. */
+    LXW_ERROR_ZIP_INTERNAL_ERROR,
+
+    /** File error or unknown zip error when adding sub file to xlsx file. */
     LXW_ERROR_ZIP_FILE_ADD,
 
-    /** Zlib error when closing xlsx file. */
+    /** Unknown zip error when closing xlsx file. */
     LXW_ERROR_ZIP_CLOSE,
 
     /** NULL function parameter ignored. */
@@ -83,12 +95,18 @@ typedef enum lxw_error {
     /** Worksheet name exceeds Excel's limit of 31 characters. */
     LXW_ERROR_SHEETNAME_LENGTH_EXCEEDED,
 
-    /** Worksheet name contains invalid Excel character: '[]:*?/\\' */
+    /** Worksheet name cannot contain invalid characters: '[ ] : * ? / \\' */
     LXW_ERROR_INVALID_SHEETNAME_CHARACTER,
 
+    /** Worksheet name cannot start or end with an apostrophe. */
+    LXW_ERROR_SHEETNAME_START_END_APOSTROPHE,
+
     /** Worksheet name is already in use. */
     LXW_ERROR_SHEETNAME_ALREADY_USED,
 
+    /** Worksheet name 'History' is reserved by Excel. */
+    LXW_ERROR_SHEETNAME_RESERVED,
+
     /** Parameter exceeds Excel's limit of 32 characters. */
     LXW_ERROR_32_STRING_LENGTH_EXCEEDED,
 
@@ -177,6 +195,9 @@ enum lxw_custom_property_types {
 #define LXW_FILENAME_LENGTH       128
 #define LXW_IGNORE                1
 
+#define LXW_PORTRAIT              1
+#define LXW_LANDSCAPE             0
+
 #define LXW_SCHEMA_MS        "http://schemas.microsoft.com/office/2006/relationships"
 #define LXW_SCHEMA_ROOT      "http://schemas.openxmlformats.org"
 #define LXW_SCHEMA_DRAWING   LXW_SCHEMA_ROOT "/drawingml/2006"

data/libxlsxwriter/include/xlsxwriter/content_types.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * content_types - A libxlsxwriter library for creating Excel XLSX
  *                 content_types files.
@@ -17,6 +17,7 @@
 
 #define LXW_APP_PACKAGE  "application/vnd.openxmlformats-package."
 #define LXW_APP_DOCUMENT "application/vnd.openxmlformats-officedocument."
+#define LXW_APP_MSEXCEL  "application/vnd.ms-excel."
 
 /*
  * Struct to represent a content_types.
@@ -37,7 +38,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_content_types *lxw_content_types_new();
+lxw_content_types *lxw_content_types_new(void);
 void lxw_content_types_free(lxw_content_types *content_types);
 void lxw_content_types_assemble_xml_file(lxw_content_types *content_types);
 void lxw_ct_add_default(lxw_content_types *content_types, const char *key,
@@ -46,6 +47,8 @@ void lxw_ct_add_override(lxw_content_types *content_types, const char *key,
                          const char *value);
 void lxw_ct_add_worksheet_name(lxw_content_types *content_types,
                                const char *name);
+void lxw_ct_add_chartsheet_name(lxw_content_types *content_types,
+                                const char *name);
 void lxw_ct_add_chart_name(lxw_content_types *content_types,
                            const char *name);
 void lxw_ct_add_drawing_name(lxw_content_types *content_types,

data/libxlsxwriter/include/xlsxwriter/core.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * core - A libxlsxwriter library for creating Excel XLSX core files.
  *
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_core *lxw_core_new();
+lxw_core *lxw_core_new(void);
 void lxw_core_free(lxw_core *core);
 void lxw_core_assemble_xml_file(lxw_core *self);
 

data/libxlsxwriter/include/xlsxwriter/custom.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * custom - A libxlsxwriter library for creating Excel custom property files.
  *
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_custom *lxw_custom_new();
+lxw_custom *lxw_custom_new(void);
 void lxw_custom_free(lxw_custom *custom);
 void lxw_custom_assemble_xml_file(lxw_custom *self);
 

data/libxlsxwriter/include/xlsxwriter/drawing.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * drawing - A libxlsxwriter library for creating Excel XLSX drawing files.
  *
@@ -77,6 +77,7 @@ typedef struct lxw_drawing {
     FILE *file;
 
     uint8_t embedded;
+    uint8_t orientation;
 
     struct lxw_drawing_objects *drawing_objects;
 
@@ -89,7 +90,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_drawing *lxw_drawing_new();
+lxw_drawing *lxw_drawing_new(void);
 void lxw_drawing_free(lxw_drawing *drawing);
 void lxw_drawing_assemble_xml_file(lxw_drawing *self);
 void lxw_free_drawing_object(struct lxw_drawing_object *drawing_object);

data/libxlsxwriter/include/xlsxwriter/format.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -480,7 +480,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_format *lxw_format_new();
+lxw_format *lxw_format_new(void);
 void lxw_format_free(lxw_format *format);
 int32_t lxw_format_get_xf_index(lxw_format *format);
 lxw_font *lxw_format_get_font_key(lxw_format *format);
@@ -691,7 +691,7 @@ void format_set_num_format(lxw_format *format, const char *num_format);
  *
  * @code
  *     format = workbook_add_format(workbook);
- *     format_set_num_format(format, 0x0F);     // d-mmm-yy
+ *     format_set_num_format_index(format, 0x0F); // d-mmm-yy
  * @endcode
  *
  * @note

data/libxlsxwriter/include/xlsxwriter/hash_table.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * hash_table - Hash table functions for libxlsxwriter.
  *

data/libxlsxwriter/include/xlsxwriter/packager.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * packager - A libxlsxwriter library for creating Excel XLSX packager files.
  *
@@ -32,11 +32,17 @@
 
 #define LXW_ZIP_BUFFER_SIZE (16384)
 
-/* If zlib returns Z_ERRNO then errno is set and we can trap that. Otherwise
- * return a default libxlsxwriter error. */
+/* If zip returns a ZIP_XXX error then errno is set and we can trap that in
+ * workbook.c. Otherwise return a default libxlsxwriter error. */
 #define RETURN_ON_ZIP_ERROR(err, default_err)   \
-    if (err == Z_ERRNO)                         \
+    if (err == ZIP_ERRNO)                       \
         return LXW_ERROR_ZIP_FILE_OPERATION;    \
+    else if (err == ZIP_PARAMERROR)             \
+        return LXW_ERROR_ZIP_PARAMETER_ERROR;   \
+    else if (err == ZIP_BADZIPFILE)             \
+        return LXW_ERROR_ZIP_BAD_ZIP_FILE;      \
+    else if (err == ZIP_INTERNALERROR)          \
+        return LXW_ERROR_ZIP_INTERNAL_ERROR;    \
     else                                        \
         return default_err;
 
@@ -54,9 +60,7 @@ typedef struct lxw_packager {
     char *filename;
     char *buffer;
     char *tmpdir;
-
-    uint16_t chart_count;
-    uint16_t drawing_count;
+    uint8_t use_zip64;
 
 } lxw_packager;
 
@@ -67,7 +71,8 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_packager *lxw_packager_new(const char *filename, char *tmpdir);
+lxw_packager *lxw_packager_new(const char *filename, char *tmpdir,
+                               uint8_t use_zip64);
 void lxw_packager_free(lxw_packager *packager);
 lxw_error lxw_create_package(lxw_packager *self);
 

data/libxlsxwriter/include/xlsxwriter/relationships.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * relationships - A libxlsxwriter library for creating Excel XLSX
  *                 relationships files.
@@ -47,7 +47,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_relationships *lxw_relationships_new();
+lxw_relationships *lxw_relationships_new(void);
 void lxw_free_relationships(lxw_relationships *relationships);
 void lxw_relationships_assemble_xml_file(lxw_relationships *self);
 

data/libxlsxwriter/include/xlsxwriter/shared_strings.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * shared_strings - A libxlsxwriter library for creating Excel XLSX
  *                  sst files.
@@ -37,6 +37,7 @@ STAILQ_HEAD(sst_order_list, sst_element);
 struct sst_element {
     uint32_t index;
     char *string;
+    uint8_t is_rich_string;
 
     STAILQ_ENTRY (sst_element) sst_order_pointers;
     RB_ENTRY (sst_element) sst_tree_pointers;
@@ -62,9 +63,10 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_sst *lxw_sst_new();
+lxw_sst *lxw_sst_new(void);
 void lxw_sst_free(lxw_sst *sst);
-struct sst_element *lxw_get_sst_index(lxw_sst *sst, const char *string);
+struct sst_element *lxw_get_sst_index(lxw_sst *sst, const char *string,
+                                      uint8_t is_rich_string);
 void lxw_sst_assemble_xml_file(lxw_sst *self);
 
 /* Declarations required for unit testing. */

data/libxlsxwriter/include/xlsxwriter/styles.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * styles - A libxlsxwriter library for creating Excel XLSX styles files.
  *
@@ -10,6 +10,7 @@
 #define __LXW_STYLES_H__
 
 #include <stdint.h>
+#include <ctype.h>
 
 #include "format.h"
 
@@ -37,9 +38,11 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_styles *lxw_styles_new();
+lxw_styles *lxw_styles_new(void);
 void lxw_styles_free(lxw_styles *styles);
 void lxw_styles_assemble_xml_file(lxw_styles *self);
+void lxw_styles_write_string_fragment(lxw_styles *self, char *string);
+void lxw_styles_write_rich_font(lxw_styles *lxw_styles, lxw_format *format);
 
 /* Declarations required for unit testing. */
 #ifdef TESTING
@@ -48,10 +51,12 @@ STATIC void _styles_xml_declaration(lxw_styles *self);
 STATIC void _write_style_sheet(lxw_styles *self);
 STATIC void _write_font_size(lxw_styles *self, double font_size);
 STATIC void _write_font_color_theme(lxw_styles *self, uint8_t theme);
-STATIC void _write_font_name(lxw_styles *self, const char *font_name);
+STATIC void _write_font_name(lxw_styles *self, const char *font_name,
+                             uint8_t is_rich_string);
 STATIC void _write_font_family(lxw_styles *self, uint8_t font_family);
 STATIC void _write_font_scheme(lxw_styles *self, const char *font_scheme);
-STATIC void _write_font(lxw_styles *self, lxw_format *format);
+STATIC void _write_font(lxw_styles *self, lxw_format *format,
+                        uint8_t is_rich_string);
 STATIC void _write_fonts(lxw_styles *self);
 STATIC void _write_default_fill(lxw_styles *self, const char *pattern);
 STATIC void _write_fills(lxw_styles *self);

data/libxlsxwriter/include/xlsxwriter/theme.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * theme - A libxlsxwriter library for creating Excel XLSX theme files.
  *
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-lxw_theme *lxw_theme_new();
+lxw_theme *lxw_theme_new(void);
 void lxw_theme_free(lxw_theme *theme);
 void lxw_theme_xml_declaration(lxw_theme *self);
 void lxw_theme_assemble_xml_file(lxw_theme *self);

data/libxlsxwriter/include/xlsxwriter/utility.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -9,7 +9,7 @@
  *
  * @brief Utility functions for libxlsxwriter.
  *
- * <!-- Copyright 2014-2018, John McNamara, jmcnamara@cpan.org -->
+ * <!-- Copyright 2014-2019, John McNamara, jmcnamara@cpan.org -->
  *
  */
 
@@ -17,6 +17,7 @@
 #define __LXW_UTILITY_H__
 
 #include <stdint.h>
+#include <strings.h>
 #include "common.h"
 #include "xmlwriter.h"
 
@@ -86,6 +87,20 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
+/**
+ * @brief Retrieve the library version.
+ *
+ * @return The "X.Y.Z" version string.
+ *
+ * Get the library version as a "X.Y.Z" version string
+ *
+ *  @code
+ *      printf("Libxlsxwriter version = %s\n", lxw_version());
+ *  @endcode
+ *
+ */
+const char *lxw_version(void);
+
 /**
  * @brief Converts a libxlsxwriter error number to a string.
  *
@@ -152,6 +167,13 @@ size_t lxw_utf8_strlen(const char *str);
 
 void lxw_str_tolower(char *str);
 
+/* Define a portable version of strcasecmp(). */
+#ifdef _MSC_VER
+#define lxw_strcasecmp _stricmp
+#else
+#define lxw_strcasecmp strcasecmp
+#endif
+
 FILE *lxw_tmpfile(char *tmpdir);
 
 /* Use a user defined function to format doubles in sprintf or else a simple
@@ -163,6 +185,8 @@ int lxw_sprintf_dbl(char *data, double number);
         lxw_snprintf(data, LXW_ATTR_32, "%.16g", number)
 #endif
 
+uint16_t lxw_hash_password(const char *password);
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
 }

data/libxlsxwriter/include/xlsxwriter/workbook.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2018, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -46,6 +46,7 @@
 #include <errno.h>
 
 #include "worksheet.h"
+#include "chartsheet.h"
 #include "chart.h"
 #include "shared_strings.h"
 #include "hash_table.h"
@@ -55,12 +56,27 @@
 
 /* Define the tree.h RB structs for the red-black head types. */
 RB_HEAD(lxw_worksheet_names, lxw_worksheet_name);
+RB_HEAD(lxw_chartsheet_names, lxw_chartsheet_name);
 
 /* Define the queue.h structs for the workbook lists. */
+STAILQ_HEAD(lxw_sheets, lxw_sheet);
 STAILQ_HEAD(lxw_worksheets, lxw_worksheet);
+STAILQ_HEAD(lxw_chartsheets, lxw_chartsheet);
 STAILQ_HEAD(lxw_charts, lxw_chart);
 TAILQ_HEAD(lxw_defined_names, lxw_defined_name);
 
+/* TODO */
+typedef struct lxw_sheet {
+    uint8_t is_chartsheet;
+
+    union {
+        lxw_worksheet *worksheet;
+        lxw_chartsheet *chartsheet;
+    } u;
+
+    STAILQ_ENTRY (lxw_sheet) list_pointers;
+} lxw_sheet;
+
 /* Struct to represent a worksheet name/pointer pair. */
 typedef struct lxw_worksheet_name {
     const char *name;
@@ -69,18 +85,37 @@ typedef struct lxw_worksheet_name {
     RB_ENTRY (lxw_worksheet_name) tree_pointers;
 } lxw_worksheet_name;
 
+/* Struct to represent a chartsheet name/pointer pair. */
+typedef struct lxw_chartsheet_name {
+    const char *name;
+    lxw_chartsheet *chartsheet;
+
+    RB_ENTRY (lxw_chartsheet_name) tree_pointers;
+} lxw_chartsheet_name;
+
 /* Wrapper around RB_GENERATE_STATIC from tree.h to avoid unused function
  * warnings and to avoid portability issues with the _unused attribute. */
-#define LXW_RB_GENERATE_NAMES(name, type, field, cmp)     \
-    RB_GENERATE_INSERT_COLOR(name, type, field, static)   \
-    RB_GENERATE_REMOVE_COLOR(name, type, field, static)   \
-    RB_GENERATE_INSERT(name, type, field, cmp, static)    \
-    RB_GENERATE_REMOVE(name, type, field, static)         \
-    RB_GENERATE_FIND(name, type, field, cmp, static)      \
-    RB_GENERATE_NEXT(name, type, field, static)           \
-    RB_GENERATE_MINMAX(name, type, field, static)         \
-    /* Add unused struct to allow adding a semicolon */   \
-    struct lxw_rb_generate_names{int unused;}
+#define LXW_RB_GENERATE_WORKSHEET_NAMES(name, type, field, cmp)  \
+    RB_GENERATE_INSERT_COLOR(name, type, field, static)          \
+    RB_GENERATE_REMOVE_COLOR(name, type, field, static)          \
+    RB_GENERATE_INSERT(name, type, field, cmp, static)           \
+    RB_GENERATE_REMOVE(name, type, field, static)                \
+    RB_GENERATE_FIND(name, type, field, cmp, static)             \
+    RB_GENERATE_NEXT(name, type, field, static)                  \
+    RB_GENERATE_MINMAX(name, type, field, static)                \
+    /* Add unused struct to allow adding a semicolon */          \
+    struct lxw_rb_generate_worksheet_names{int unused;}
+
+#define LXW_RB_GENERATE_CHARTSHEET_NAMES(name, type, field, cmp) \
+    RB_GENERATE_INSERT_COLOR(name, type, field, static)          \
+    RB_GENERATE_REMOVE_COLOR(name, type, field, static)          \
+    RB_GENERATE_INSERT(name, type, field, cmp, static)           \
+    RB_GENERATE_REMOVE(name, type, field, static)                \
+    RB_GENERATE_FIND(name, type, field, cmp, static)             \
+    RB_GENERATE_NEXT(name, type, field, static)                  \
+    RB_GENERATE_MINMAX(name, type, field, static)                \
+    /* Add unused struct to allow adding a semicolon */          \
+    struct lxw_rb_generate_charsheet_names{int unused;}
 
 /**
  * @brief Macro to loop over all the worksheets in a workbook.
@@ -168,27 +203,40 @@ typedef struct lxw_doc_properties {
  *
  * The following properties are supported:
  *
- * - `constant_memory`: Reduces the amount of data stored in memory so that
- *   large files can be written efficiently.
- *
- *   @note In this mode a row of data is written and then discarded when a
- *   cell in a new row is added via one of the `worksheet_write_*()`
- *   functions. Therefore, once this option is active, data should be written in
- *   sequential row order. For this reason the `worksheet_merge_range()`
- *   doesn't work in this mode. See also @ref ww_mem_constant.
+ * - `constant_memory`: This option reduces the amount of data stored in
+ *   memory so that large files can be written efficiently. This option is off
+ *   by default. See the note below for limitations when this mode is on.
  *
- * - `tmpdir`: libxlsxwriter stores workbook data in temporary files prior
- *   to assembling the final XLSX file. The temporary files are created in the
+ * - `tmpdir`: libxlsxwriter stores workbook data in temporary files prior to
+ *   assembling the final XLSX file. The temporary files are created in the
  *   system's temp directory. If the default temporary directory isn't
  *   accessible to your application, or doesn't contain enough space, you can
- *   specify an alternative location using the `tempdir` option.
+ *   specify an alternative location using the `tmpdir` option.
+ *
+ * - `use_zip64`: Make the zip library use ZIP64 extensions when writing very
+ *   large xlsx files to allow the zip container, or individual XML files
+ *   within it, to be greater than 4 GB. See [ZIP64 on Wikipedia][zip64_wiki]
+ *   for more information. This option is off by default.
+ *
+ *   [zip64_wiki]: https://en.wikipedia.org/wiki/Zip_(file_format)#ZIP64
+ *
+ * @note In `constant_memory` mode a row of data is written and then discarded
+ * when a cell in a new row is added via one of the `worksheet_write_*()`
+ * functions. Therefore, once this option is active, data should be written in
+ * sequential row order. For this reason the `worksheet_merge_range()` doesn't
+ * work in this mode. See also @ref ww_mem_constant.
+ *
  */
 typedef struct lxw_workbook_options {
-    /** Optimize the workbook to use constant memory for worksheets */
+    /** Optimize the workbook to use constant memory for worksheets. */
     uint8_t constant_memory;
 
     /** Directory to use for the temporary files created by libxlsxwriter. */
     char *tmpdir;
+
+    /** Allow ZIP64 extensions when creating the xlsx file zip container. */
+    uint8_t use_zip64;
+
 } lxw_workbook_options;
 
 /**
@@ -201,8 +249,11 @@ typedef struct lxw_workbook_options {
 typedef struct lxw_workbook {
 
     FILE *file;
+    struct lxw_sheets *sheets;
     struct lxw_worksheets *worksheets;
+    struct lxw_chartsheets *chartsheets;
     struct lxw_worksheet_names *worksheet_names;
+    struct lxw_chartsheet_names *chartsheet_names;
     struct lxw_charts *charts;
     struct lxw_charts *ordered_charts;
     struct lxw_formats *formats;
@@ -215,6 +266,8 @@ typedef struct lxw_workbook {
     lxw_workbook_options options;
 
     uint16_t num_sheets;
+    uint16_t num_worksheets;
+    uint16_t num_chartsheets;
     uint16_t first_sheet;
     uint16_t active_sheet;
     uint16_t num_xf_formats;
@@ -232,6 +285,9 @@ typedef struct lxw_workbook {
 
     lxw_hash_table *used_xf_formats;
 
+    char *vba_project;
+    char *vba_codename;
+
 } lxw_workbook;
 
 
@@ -273,30 +329,37 @@ lxw_workbook *workbook_new(const char *filename);
  * additional options to be set.
  *
  * @code
- *    lxw_workbook_options options = {.constant_memory = 1,
- *                                    .tmpdir = "C:\\Temp"};
+ *    lxw_workbook_options options = {.constant_memory = LXW_TRUE,
+ *                                    .tmpdir = "C:\\Temp",
+ *                                    .use_zip64 = LXW_FALSE};
  *
  *    lxw_workbook  *workbook  = workbook_new_opt("filename.xlsx", &options);
  * @endcode
  *
  * The options that can be set via #lxw_workbook_options are:
  *
- * - `constant_memory`: Reduces the amount of data stored in memory so that
- *   large files can be written efficiently.
- *
- *   @note In this mode a row of data is written and then discarded when a
- *   cell in a new row is added via one of the `worksheet_write_*()`
- *   functions. Therefore, once this option is active, data should be written in
- *   sequential row order. For this reason the `worksheet_merge_range()`
- *   doesn't work in this mode. See also @ref ww_mem_constant.
+ * - `constant_memory`: This option reduces the amount of data stored in
+ *   memory so that large files can be written efficiently. This option is off
+ *   by default. See the note below for limitations when this mode is on.
  *
- * - `tmpdir`: libxlsxwriter stores workbook data in temporary files prior
- *   to assembling the final XLSX file. The temporary files are created in the
+ * - `tmpdir`: libxlsxwriter stores workbook data in temporary files prior to
+ *   assembling the final XLSX file. The temporary files are created in the
  *   system's temp directory. If the default temporary directory isn't
  *   accessible to your application, or doesn't contain enough space, you can
- *   specify an alternative location using the `tempdir` option.*
+ *   specify an alternative location using the `tmpdir` option.
  *
- * See @ref working_with_memory for more details.
+ * - `use_zip64`: Make the zip library use ZIP64 extensions when writing very
+ *   large xlsx files to allow the zip container, or individual XML files
+ *   within it, to be greater than 4 GB. See [ZIP64 on Wikipedia][zip64_wiki]
+ *   for more information. This option is off by default.
+ *
+ *   [zip64_wiki]: https://en.wikipedia.org/wiki/Zip_(file_format)#ZIP64
+ *
+ * @note In `constant_memory` mode a row of data is written and then discarded
+ * when a cell in a new row is added via one of the `worksheet_write_*()`
+ * functions. Therefore, once this option is active, data should be written in
+ * sequential row order. For this reason the `worksheet_merge_range()` doesn't
+ * work in this mode. See also @ref ww_mem_constant.
  *
  */
 lxw_workbook *workbook_new_opt(const char *filename,
@@ -317,7 +380,7 @@ lxw_workbook *new_workbook_opt(const char *filename,
  *
  * @return A lxw_worksheet object.
  *
- * The `%workbook_add_worksheet()` function adds a new worksheet to a workbook:
+ * The `%workbook_add_worksheet()` function adds a new worksheet to a workbook.
  *
  * At least one worksheet should be added to a new workbook: The @ref
  * worksheet.h "Worksheet" object is used to write data and configure a
@@ -336,18 +399,65 @@ lxw_workbook *new_workbook_opt(const char *filename,
  *
  * @image html workbook02.png
  *
- * The worksheet name must be a valid Excel worksheet name, i.e. it must be
- * less than 32 character and it cannot contain any of the characters:
+ * The worksheet name must be a valid Excel worksheet name, i.e:
  *
- *     / \ [ ] : * ?
- *
- * In addition, you cannot use the same, case insensitive, `sheetname` for more
- * than one worksheet.
+ * - The name is less than or equal to 31 UTF-8 characters.
+ * - The name doesn't contain any of the characters: ` [ ] : * ? / \ `
+ * - The name doesn't start or end with an apostrophe.
+ * - The name isn't "History", which is reserved by Excel. (Case insensitive).
+ * - The name isn't already in use. (Case insensitive).
  *
+ * If any of these errors are encountered the function will return NULL.
+ * You can check for valid name using the `workbook_validate_sheet_name()`
+ * function.
  */
 lxw_worksheet *workbook_add_worksheet(lxw_workbook *workbook,
                                       const char *sheetname);
 
+/**
+ * @brief Add a new chartsheet to a workbook.
+ *
+ * @param workbook  Pointer to a lxw_workbook instance.
+ * @param sheetname Optional chartsheet name, defaults to Chart1, etc.
+ *
+ * @return A lxw_chartsheet object.
+ *
+ * The `%workbook_add_chartsheet()` function adds a new chartsheet to a
+ * workbook. The @ref chartsheet.h "Chartsheet" object is like a worksheet
+ * except it displays a chart instead of cell data.
+ *
+ * @image html chartsheet.png
+ *
+ * The `sheetname` parameter is optional. If it is `NULL` the default
+ * Excel convention will be followed, i.e. Chart1, Chart2, etc.:
+ *
+ * @code
+ *     chartsheet = workbook_add_chartsheet(workbook, NULL  );     // Chart1
+ *     chartsheet = workbook_add_chartsheet(workbook, "My Chart"); // My Chart
+ *     chartsheet = workbook_add_chartsheet(workbook, NULL  );     // Chart3
+ *
+ * @endcode
+ *
+ * The chartsheet name must be a valid Excel worksheet name, i.e.:
+ *
+ * - The name is less than or equal to 31 UTF-8 characters.
+ * - The name doesn't contain any of the characters: ` [ ] : * ? / \ `
+ * - The name doesn't start or end with an apostrophe.
+ * - The name isn't "History", which is reserved by Excel. (Case insensitive).
+ * - The name isn't already in use. (Case insensitive).
+ *
+ * If any of these errors are encountered the function will return NULL.
+ * You can check for valid name using the `workbook_validate_sheet_name()`
+ * function.
+ *
+ * At least one worksheet should be added to a new workbook when creating a
+ * chartsheet in order to provide data for the chart. The @ref worksheet.h
+ * "Worksheet" object is used to write data and configure a worksheet in the
+ * workbook.
+ */
+lxw_chartsheet *workbook_add_chartsheet(lxw_workbook *workbook,
+                                        const char *sheetname);
+
 /**
  * @brief Create a new @ref format.h "Format" object to formats cells in
  *        worksheets.
@@ -693,31 +803,98 @@ lxw_worksheet *workbook_get_worksheet_by_name(lxw_workbook *workbook,
                                               const char *name);
 
 /**
- * @brief Validate a worksheet name.
+ * @brief Get a chartsheet object from its name.
+ *
+ * @param workbook Pointer to a lxw_workbook instance.
+ * @param name     chartsheet name.
+ *
+ * @return A lxw_chartsheet object.
+ *
+ * This function returns a lxw_chartsheet object reference based on its name:
+ *
+ * @code
+ *     chartsheet = workbook_get_chartsheet_by_name(workbook, "Chart1");
+ * @endcode
+ *
+ */
+lxw_chartsheet *workbook_get_chartsheet_by_name(lxw_workbook *workbook,
+                                                const char *name);
+
+/**
+ * @brief Validate a worksheet or chartsheet name.
  *
  * @param workbook  Pointer to a lxw_workbook instance.
- * @param sheetname Worksheet name to validate.
+ * @param sheetname Sheet name to validate.
  *
  * @return A #lxw_error.
  *
- * This function is used to validate a worksheet name according to the rules
- * used by Excel:
+ * This function is used to validate a worksheet or chartsheet name according
+ * to the rules used by Excel:
  *
  * - The name is less than or equal to 31 UTF-8 characters.
  * - The name doesn't contain any of the characters: ` [ ] : * ? / \ `
- * - The name isn't already in use.
+ * - The name doesn't start or end with an apostrophe.
+ * - The name isn't "History", which is reserved by Excel. (Case insensitive).
+ * - The name isn't already in use. (Case insensitive, see the note below).
  *
  * @code
- *     lxw_error err = workbook_validate_worksheet_name(workbook, "Foglio");
+ *     lxw_error err = workbook_validate_sheet_name(workbook, "Foglio");
  * @endcode
  *
- * This function is called by `workbook_add_worksheet()` but it can be
- * explicitly called by the user beforehand to ensure that the worksheet
- * name is valid.
+ * This function is called by `workbook_add_worksheet()` and
+ * `workbook_add_chartsheet()` but it can be explicitly called by the user
+ * beforehand to ensure that the sheet name is valid.
+ *
+ * @note This function does an ASCII lowercase string comparison to determine
+ * if the sheet name is already in use. It doesn't take UTF-8 characters into
+ * account. Thus it would flag "Café" and "café" as a duplicate (just like
+ * Excel) but it wouldn't catch "CAFÉ". If you need a full UTF-8 case
+ * insensitive check you should use a third party library to implement it.
+ *
+ */
+lxw_error workbook_validate_sheet_name(lxw_workbook *workbook,
+                                       const char *sheetname);
+
+/**
+ * @brief Add a vbaProject binary to the Excel workbook.
+ *
+ * @param workbook Pointer to a lxw_workbook instance.
+ * @param filename The path/filename of the vbaProject.bin file.
  *
+ * The `%workbook_add_vba_project()` function can be used to add macros or
+ * functions to a workbook using a binary VBA project file that has been
+ * extracted from an existing Excel xlsm file:
+ *
+ * @code
+ *     workbook_add_vba_project(workbook, "vbaProject.bin");
+ * @endcode
+ *
+ * Only one `vbaProject.bin file` can be added per workbook.
+ *
+ * @return A #lxw_error.
+ */
+lxw_error workbook_add_vba_project(lxw_workbook *workbook,
+                                   const char *filename);
+
+/**
+ * @brief Set the VBA name for the workbook.
+ *
+ * @param workbook Pointer to a lxw_workbook instance.
+ * @param name     Name of the workbook used by VBA.
+ *
+ * The `workbook_set_vba_name()` function can be used to set the VBA name for
+ * the workbook. This is sometimes required when a vbaProject macro included
+ * via `workbook_add_vba_project()` refers to the workbook.
+ *
+ * @code
+ *     workbook_set_vba_name(workbook, "MyWorkbook");
+ * @endcode
+ *
+ * The most common Excel VBA name for a workbook is `ThisWorkbook`.
+ *
+ * @return A #lxw_error.
  */
-lxw_error workbook_validate_worksheet_name(lxw_workbook *workbook,
-                                           const char *sheetname);
+lxw_error workbook_set_vba_name(lxw_workbook *workbook, const char *name);
 
 void lxw_workbook_free(lxw_workbook *workbook);
 void lxw_workbook_assemble_xml_file(lxw_workbook *workbook);