xlsxwriter 0.0.5 → 0.0.6

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

@@ -296,6 +296,16 @@ lxw_ct_add_worksheet_name(lxw_content_types *self, const char *name)
                         LXW_APP_DOCUMENT "spreadsheetml.worksheet+xml");
 }
 
+/*
+ * Add the name of a chartsheet to the ContentTypes overrides.
+ */
+void
+lxw_ct_add_chartsheet_name(lxw_content_types *self, const char *name)
+{
+    lxw_ct_add_override(self, name,
+                        LXW_APP_DOCUMENT "spreadsheetml.chartsheet+xml");
+}
+
 /*
  * Add the name of a chart to the ContentTypes overrides.
  */

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

@@ -239,7 +239,7 @@ _drawing_write_c_nv_pr(lxw_drawing *self, char *object_name, uint16_t index,
     LXW_PUSH_ATTRIBUTES_INT("id", index + 1);
     LXW_PUSH_ATTRIBUTES_STR("name", name);
 
-    if (drawing_object)
+    if (drawing_object && drawing_object->description)
         LXW_PUSH_ATTRIBUTES_STR("descr", drawing_object->description);
 
     lxw_xml_empty_tag(self->file, "xdr:cNvPr", &attributes);
@@ -489,13 +489,40 @@ _drawing_write_client_data(lxw_drawing *self)
     lxw_xml_empty_tag(self->file, "xdr:clientData", NULL);
 }
 
+/*
+ * Write the <a:graphicFrameLocks> element.
+ */
+STATIC void
+_drawing_write_a_graphic_frame_locks(lxw_drawing *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_INT("noGrp", 1);
+
+    lxw_xml_empty_tag(self->file, "a:graphicFrameLocks", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <xdr:cNvGraphicFramePr> element.
  */
 STATIC void
 _drawing_write_c_nv_graphic_frame_pr(lxw_drawing *self)
 {
-    lxw_xml_empty_tag(self->file, "xdr:cNvGraphicFramePr", NULL);
+    if (self->embedded) {
+        lxw_xml_empty_tag(self->file, "xdr:cNvGraphicFramePr", NULL);
+    }
+    else {
+        lxw_xml_start_tag(self->file, "xdr:cNvGraphicFramePr", NULL);
+
+        /* Write the a:graphicFrameLocks element. */
+        _drawing_write_a_graphic_frame_locks(self);
+
+        lxw_xml_end_tag(self->file, "xdr:cNvGraphicFramePr");
+    }
 }
 
 /*
@@ -705,6 +732,73 @@ _drawing_write_two_cell_anchor(lxw_drawing *self, uint16_t index,
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <xdr:ext> element.
+ */
+STATIC void
+_drawing_write_ext(lxw_drawing *self, uint32_t cx, uint32_t cy)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_INT("cx", cx);
+    LXW_PUSH_ATTRIBUTES_INT("cy", cy);
+
+    lxw_xml_empty_tag(self->file, "xdr:ext", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <xdr:pos> element.
+ */
+STATIC void
+_drawing_write_pos(lxw_drawing *self, int32_t x, int32_t y)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_INT("x", x);
+    LXW_PUSH_ATTRIBUTES_INT("y", y);
+
+    lxw_xml_empty_tag(self->file, "xdr:pos", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <xdr:absoluteAnchor> element.
+ */
+STATIC void
+_drawing_write_absolute_anchor(lxw_drawing *self)
+{
+    lxw_xml_start_tag(self->file, "xdr:absoluteAnchor", NULL);
+
+    if (self->orientation == LXW_LANDSCAPE) {
+        /* Write the xdr:pos element. */
+        _drawing_write_pos(self, 0, 0);
+
+        /* Write the xdr:ext element. */
+        _drawing_write_ext(self, 9308969, 6078325);
+    }
+    else {
+        /* Write the xdr:pos element. */
+        _drawing_write_pos(self, 0, -47625);
+
+        /* Write the xdr:ext element. */
+        _drawing_write_ext(self, 6162675, 6124575);
+    }
+
+    _drawing_write_graphic_frame(self, 1);
+
+    /* Write the xdr:clientData element. */
+    _drawing_write_client_data(self);
+
+    lxw_xml_end_tag(self->file, "xdr:absoluteAnchor");
+}
+
 /*****************************************************************************
  *
  * XML file assembly functions.
@@ -733,7 +827,10 @@ lxw_drawing_assemble_xml_file(lxw_drawing *self)
             _drawing_write_two_cell_anchor(self, index, drawing_object);
             index++;
         }
-
+    }
+    else {
+        /* Write the xdr:absoluteAnchor element. Mainly for chartsheets. */
+        _drawing_write_absolute_anchor(self);
     }
 
     lxw_xml_end_tag(self->file, "xdr:wsDr");

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

@@ -15,6 +15,9 @@
 STATIC lxw_error _add_file_to_zip(lxw_packager *self, FILE * file,
                                   const char *filename);
 
+STATIC lxw_error _add_buffer_to_zip(lxw_packager *self, unsigned char *buffer,
+                                    size_t buffer_size, const char *filename);
+
 /*
  * Forward declarations.
  */
@@ -164,12 +167,18 @@ STATIC lxw_error
 _write_worksheet_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
     lxw_error err;
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            continue;
+        else
+            worksheet = sheet->u.worksheet;
+
         lxw_snprintf(sheetname, LXW_FILENAME_LENGTH,
                      "xl/worksheets/sheet%d.xml", index++);
 
@@ -191,6 +200,43 @@ _write_worksheet_files(lxw_packager *self)
     return LXW_NO_ERROR;
 }
 
+/*
+ * Write the chartsheet files.
+ */
+STATIC lxw_error
+_write_chartsheet_files(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
+    lxw_chartsheet *chartsheet;
+    char sheetname[LXW_FILENAME_LENGTH] = { 0 };
+    uint16_t index = 1;
+    lxw_error err;
+
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            chartsheet = sheet->u.chartsheet;
+        else
+            continue;
+
+        lxw_snprintf(sheetname, LXW_FILENAME_LENGTH,
+                     "xl/chartsheets/sheet%d.xml", index++);
+
+        chartsheet->file = lxw_tmpfile(self->tmpdir);
+        if (!chartsheet->file)
+            return LXW_ERROR_CREATING_TMPFILE;
+
+        lxw_chartsheet_assemble_xml_file(chartsheet);
+
+        err = _add_file_to_zip(self, chartsheet->file, sheetname);
+        RETURN_ON_ERROR(err);
+
+        fclose(chartsheet->file);
+    }
+
+    return LXW_NO_ERROR;
+}
+
 /*
  * Write the /xl/media/image?.xml files.
  */
@@ -198,6 +244,7 @@ STATIC lxw_error
 _write_image_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     lxw_image_options *image;
     lxw_error err;
@@ -206,7 +253,11 @@ _write_image_files(lxw_packager *self)
     char filename[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            continue;
+        else
+            worksheet = sheet->u.worksheet;
 
         if (STAILQ_EMPTY(worksheet->image_data))
             continue;
@@ -216,17 +267,24 @@ _write_image_files(lxw_packager *self)
             lxw_snprintf(filename, LXW_FILENAME_LENGTH,
                          "xl/media/image%d.%s", index++, image->extension);
 
-            /* Check that the image file exists and can be opened. */
-            image_stream = fopen(image->filename, "rb");
-            if (!image_stream) {
-                LXW_WARN_FORMAT1("Error adding image to xlsx file: file "
-                                 "doesn't exist or can't be opened: %s.",
-                                 image->filename);
-                return LXW_ERROR_CREATING_TMPFILE;
+            if (!image->is_image_buffer) {
+                /* Check that the image file exists and can be opened. */
+                image_stream = fopen(image->filename, "rb");
+                if (!image_stream) {
+                    LXW_WARN_FORMAT1("Error adding image to xlsx file: file "
+                                     "doesn't exist or can't be opened: %s.",
+                                     image->filename);
+                    return LXW_ERROR_CREATING_TMPFILE;
+                }
+
+                err = _add_file_to_zip(self, image_stream, filename);
+                fclose(image_stream);
+            }
+            else {
+                err = _add_buffer_to_zip(self,
+                                         image->image_buffer,
+                                         image->image_buffer_size, filename);
             }
-
-            err = _add_file_to_zip(self, image_stream, filename);
-            fclose(image_stream);
 
             RETURN_ON_ERROR(err);
         }
@@ -276,13 +334,19 @@ STATIC lxw_error
 _write_drawing_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     lxw_drawing *drawing;
     char filename[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
     lxw_error err;
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            worksheet = sheet->u.chartsheet->worksheet;
+        else
+            worksheet = sheet->u.worksheet;
+
         drawing = worksheet->drawing;
 
         if (drawing) {
@@ -340,7 +404,9 @@ STATIC lxw_error
 _write_app_file(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
+    lxw_chartsheet *chartsheet;
     lxw_defined_name *defined_name;
     lxw_app *app;
     uint16_t named_range_count = 0;
@@ -361,12 +427,30 @@ _write_app_file(lxw_packager *self)
         goto mem_error;
     }
 
-    lxw_snprintf(number, LXW_ATTR_32, "%d", self->workbook->num_sheets);
+    if (self->workbook->num_worksheets) {
+        lxw_snprintf(number, LXW_ATTR_32, "%d",
+                     self->workbook->num_worksheets);
+        lxw_app_add_heading_pair(app, "Worksheets", number);
+    }
+
+    if (self->workbook->num_chartsheets) {
+        lxw_snprintf(number, LXW_ATTR_32, "%d",
+                     self->workbook->num_chartsheets);
+        lxw_app_add_heading_pair(app, "Charts", number);
+    }
 
-    lxw_app_add_heading_pair(app, "Worksheets", number);
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (!sheet->is_chartsheet) {
+            worksheet = sheet->u.worksheet;
+            lxw_app_add_part_name(app, worksheet->name);
+        }
+    }
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
-        lxw_app_add_part_name(app, worksheet->name);
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet) {
+            chartsheet = sheet->u.chartsheet;
+            lxw_app_add_part_name(app, chartsheet->name);
+        }
     }
 
     /* Add the Named Ranges parts. */
@@ -568,9 +652,11 @@ _write_content_types_file(lxw_packager *self)
 {
     lxw_content_types *content_types = lxw_content_types_new();
     lxw_workbook *workbook = self->workbook;
-    lxw_worksheet *worksheet;
+    lxw_sheet *sheet;
     char filename[LXW_MAX_ATTRIBUTE_LENGTH] = { 0 };
     uint16_t index = 1;
+    uint16_t worksheet_index = 1;
+    uint16_t chartsheet_index = 1;
     lxw_error err = LXW_NO_ERROR;
 
     if (!content_types) {
@@ -593,10 +679,17 @@ _write_content_types_file(lxw_packager *self)
     if (workbook->has_bmp)
         lxw_ct_add_default(content_types, "bmp", "image/bmp");
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
-        lxw_snprintf(filename, LXW_FILENAME_LENGTH,
-                     "/xl/worksheets/sheet%d.xml", index++);
-        lxw_ct_add_worksheet_name(content_types, filename);
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet) {
+            lxw_snprintf(filename, LXW_FILENAME_LENGTH,
+                         "/xl/chartsheets/sheet%d.xml", chartsheet_index++);
+            lxw_ct_add_chartsheet_name(content_types, filename);
+        }
+        else {
+            lxw_snprintf(filename, LXW_FILENAME_LENGTH,
+                         "/xl/worksheets/sheet%d.xml", worksheet_index++);
+            lxw_ct_add_worksheet_name(content_types, filename);
+        }
     }
 
     for (index = 1; index <= self->chart_count; index++) {
@@ -637,9 +730,10 @@ _write_workbook_rels_file(lxw_packager *self)
 {
     lxw_relationships *rels = lxw_relationships_new();
     lxw_workbook *workbook = self->workbook;
-    lxw_worksheet *worksheet;
+    lxw_sheet *sheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
-    uint16_t index = 1;
+    uint16_t worksheet_index = 1;
+    uint16_t chartsheet_index = 1;
     lxw_error err = LXW_NO_ERROR;
 
     if (!rels) {
@@ -653,10 +747,19 @@ _write_workbook_rels_file(lxw_packager *self)
         goto mem_error;
     }
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
-        lxw_snprintf(sheetname, LXW_FILENAME_LENGTH, "worksheets/sheet%d.xml",
-                     index++);
-        lxw_add_document_relationship(rels, "/worksheet", sheetname);
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet) {
+            lxw_snprintf(sheetname,
+                         LXW_FILENAME_LENGTH,
+                         "chartsheets/sheet%d.xml", chartsheet_index++);
+            lxw_add_document_relationship(rels, "/chartsheet", sheetname);
+        }
+        else {
+            lxw_snprintf(sheetname,
+                         LXW_FILENAME_LENGTH,
+                         "worksheets/sheet%d.xml", worksheet_index++);
+            lxw_add_document_relationship(rels, "/worksheet", sheetname);
+        }
     }
 
     lxw_add_document_relationship(rels, "/theme", "theme/theme1.xml");
@@ -688,12 +791,17 @@ _write_worksheet_rels_file(lxw_packager *self)
     lxw_relationships *rels;
     lxw_rel_tuple *rel;
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 0;
     lxw_error err;
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            continue;
+        else
+            worksheet = sheet->u.worksheet;
 
         index++;
 
@@ -735,6 +843,68 @@ _write_worksheet_rels_file(lxw_packager *self)
     return LXW_NO_ERROR;
 }
 
+/*
+ * Write the chartsheet .rels files for chartsheets that contain links to
+ * external data such as drawings.
+ */
+STATIC lxw_error
+_write_chartsheet_rels_file(lxw_packager *self)
+{
+    lxw_relationships *rels;
+    lxw_rel_tuple *rel;
+    lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
+    lxw_worksheet *worksheet;
+    char sheetname[LXW_FILENAME_LENGTH] = { 0 };
+    uint16_t index = 0;
+    lxw_error err;
+
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            worksheet = sheet->u.chartsheet->worksheet;
+        else
+            continue;
+
+        index++;
+
+        /* TODO. This should never be empty. Put check higher up. */
+        if (STAILQ_EMPTY(worksheet->external_drawing_links))
+            continue;
+
+        rels = lxw_relationships_new();
+
+        rels->file = lxw_tmpfile(self->tmpdir);
+        if (!rels->file) {
+            lxw_free_relationships(rels);
+            return LXW_ERROR_CREATING_TMPFILE;
+        }
+
+        STAILQ_FOREACH(rel, worksheet->external_hyperlinks, list_pointers) {
+            lxw_add_worksheet_relationship(rels, rel->type, rel->target,
+                                           rel->target_mode);
+        }
+
+        STAILQ_FOREACH(rel, worksheet->external_drawing_links, list_pointers) {
+            lxw_add_worksheet_relationship(rels, rel->type, rel->target,
+                                           rel->target_mode);
+        }
+
+        lxw_snprintf(sheetname, LXW_FILENAME_LENGTH,
+                     "xl/chartsheets/_rels/sheet%d.xml.rels", index);
+
+        lxw_relationships_assemble_xml_file(rels);
+
+        err = _add_file_to_zip(self, rels->file, sheetname);
+
+        fclose(rels->file);
+        lxw_free_relationships(rels);
+
+        RETURN_ON_ERROR(err);
+    }
+
+    return LXW_NO_ERROR;
+}
+
 /*
  * Write the drawing .rels files for worksheets that contain charts or
  * drawings.
@@ -745,12 +915,17 @@ _write_drawing_rels_file(lxw_packager *self)
     lxw_relationships *rels;
     lxw_rel_tuple *rel;
     lxw_workbook *workbook = self->workbook;
+    lxw_sheet *sheet;
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
     lxw_error err;
 
-    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+    STAILQ_FOREACH(sheet, workbook->sheets, list_pointers) {
+        if (sheet->is_chartsheet)
+            worksheet = sheet->u.chartsheet->worksheet;
+        else
+            worksheet = sheet->u.worksheet;
 
         if (STAILQ_EMPTY(worksheet->drawing_links))
             continue;
@@ -895,6 +1070,47 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
     return LXW_NO_ERROR;
 }
 
+STATIC lxw_error
+_add_buffer_to_zip(lxw_packager *self, unsigned char *buffer,
+                   size_t buffer_size, const char *filename)
+{
+    int16_t error = ZIP_OK;
+
+    error = zipOpenNewFileInZip4_64(self->zipfile,
+                                    filename,
+                                    &self->zipfile_info,
+                                    NULL, 0, NULL, 0, NULL,
+                                    Z_DEFLATED, Z_DEFAULT_COMPRESSION, 0,
+                                    -MAX_WBITS, DEF_MEM_LEVEL,
+                                    Z_DEFAULT_STRATEGY, NULL, 0, 0, 0, 0);
+
+    if (error != ZIP_OK) {
+        LXW_ERROR("Error adding member to zipfile");
+        RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
+    }
+
+    error = zipWriteInFileInZip(self->zipfile,
+                                buffer, (unsigned int) buffer_size);
+
+    if (error < 0) {
+        LXW_ERROR("Error in writing member in the zipfile");
+        RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
+    }
+
+    if (error < 0) {
+        RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
+    }
+    else {
+        error = zipCloseFileInZip(self->zipfile);
+        if (error != ZIP_OK) {
+            LXW_ERROR("Error in closing member in the zipfile");
+            RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_FILE_ADD);
+        }
+    }
+
+    return LXW_NO_ERROR;
+}
+
 /*
  * Write the xml files that make up the XLXS OPC package.
  */
@@ -907,6 +1123,9 @@ lxw_create_package(lxw_packager *self)
     error = _write_worksheet_files(self);
     RETURN_ON_ERROR(error);
 
+    error = _write_chartsheet_files(self);
+    RETURN_ON_ERROR(error);
+
     error = _write_workbook_file(self);
     RETURN_ON_ERROR(error);
 
@@ -943,6 +1162,9 @@ lxw_create_package(lxw_packager *self)
     error = _write_worksheet_rels_file(self);
     RETURN_ON_ERROR(error);
 
+    error = _write_chartsheet_rels_file(self);
+    RETURN_ON_ERROR(error);
+
     error = _write_drawing_rels_file(self);
     RETURN_ON_ERROR(error);