fast_excel 0.5.0 → 0.6.1

data/libxlsxwriter/src/core.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 

data/libxlsxwriter/src/custom.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 

data/libxlsxwriter/src/drawing.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 
@@ -505,8 +506,11 @@ _drawing_write_a_off(lxw_drawing *self, lxw_drawing_object *drawing_object)
     struct xml_attribute *attribute;
 
     LXW_INIT_ATTRIBUTES();
-    LXW_PUSH_ATTRIBUTES_INT("x", drawing_object->col_absolute);
-    LXW_PUSH_ATTRIBUTES_INT("y", drawing_object->row_absolute);
+
+    /* Use %d to allow for writing uint64_t on ansi 32bit systems. The largest
+       Excel value will fit without losing precision. */
+    LXW_PUSH_ATTRIBUTES_DBL("x", drawing_object->col_absolute);
+    LXW_PUSH_ATTRIBUTES_DBL("y", drawing_object->row_absolute);
 
     lxw_xml_empty_tag(self->file, "a:off", &attributes);
 

data/libxlsxwriter/src/format.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 
@@ -546,6 +547,12 @@ format_set_text_justlast(lxw_format *self)
 void
 format_set_pattern(lxw_format *self, uint8_t value)
 {
+    if (value > LXW_PATTERN_GRAY_0625) {
+        LXW_WARN_FORMAT1("format_set_pattern(): invalid pattern value: %d",
+                         value);
+        return;
+    }
+
     self->pattern = value;
 }
 
@@ -689,6 +696,12 @@ format_set_diag_color(lxw_format *self, lxw_color_t color)
 void
 format_set_diag_border(lxw_format *self, uint8_t style)
 {
+    if (style > LXW_BORDER_SLANT_DASH_DOT) {
+        LXW_WARN_FORMAT1("format_set_diag_border(): invalid border style: %d",
+                         style);
+        return;
+    }
+
     self->diag_border = style;
 }
 
@@ -707,6 +720,13 @@ format_set_num_format_index(lxw_format *self, uint8_t value)
 void
 format_set_valign(lxw_format *self, uint8_t value)
 {
+    if (value > LXW_ALIGN_VERTICAL_DISTRIBUTED) {
+        LXW_WARN_FORMAT1
+            ("format_set_valign(): invalid vertical alignment value: %d",
+             value);
+        return;
+    }
+
     self->text_v_align = value;
 }
 

data/libxlsxwriter/src/hash_table.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 

data/libxlsxwriter/src/metadata.c

@@ -3,7 +3,8 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * SPDX-License-Identifier: BSD-2-Clause
+ * Copyright 2014-2026, John McNamara, jmcnamara@cpan.org.
  *
  */
 
@@ -76,10 +77,17 @@ _metadata_write_metadata(lxw_metadata *self)
         "spreadsheetml/2006/main";
     char xmlns_xda[] = "http://schemas.microsoft.com/office/"
         "spreadsheetml/2017/dynamicarray";
+    char xmlns_xlrd[] = "http://schemas.microsoft.com/office/"
+        "spreadsheetml/2017/richdata";
 
     LXW_INIT_ATTRIBUTES();
     LXW_PUSH_ATTRIBUTES_STR("xmlns", xmlns);
-    LXW_PUSH_ATTRIBUTES_STR("xmlns:xda", xmlns_xda);
+
+    if (self->has_embedded_images)
+        LXW_PUSH_ATTRIBUTES_STR("xmlns:xlrd", xmlns_xlrd);
+
+    if (self->has_dynamic_functions)
+        LXW_PUSH_ATTRIBUTES_STR("xmlns:xda", xmlns_xda);
 
     lxw_xml_start_tag(self->file, "metadata", &attributes);
 
@@ -87,10 +95,10 @@ _metadata_write_metadata(lxw_metadata *self)
 }
 
 /*
- * Write the <metadataType> element.
+ * Write the <metadataType> element for dynamic functions.
  */
 STATIC void
-_metadata_write_metadata_type(lxw_metadata *self)
+_metadata_write_cell_metadata_type(lxw_metadata *self)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
@@ -115,6 +123,34 @@ _metadata_write_metadata_type(lxw_metadata *self)
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <metadataType> element for embedded images.
+ */
+STATIC void
+_metadata_write_value_metadata_type(lxw_metadata *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_STR("name", "XLRICHVALUE");
+    LXW_PUSH_ATTRIBUTES_INT("minSupportedVersion", 120000);
+    LXW_PUSH_ATTRIBUTES_INT("copy", 1);
+    LXW_PUSH_ATTRIBUTES_INT("pasteAll", 1);
+    LXW_PUSH_ATTRIBUTES_INT("pasteValues", 1);
+    LXW_PUSH_ATTRIBUTES_INT("merge", 1);
+    LXW_PUSH_ATTRIBUTES_INT("splitFirst", 1);
+    LXW_PUSH_ATTRIBUTES_INT("rowColShift", 1);
+    LXW_PUSH_ATTRIBUTES_INT("clearFormats", 1);
+    LXW_PUSH_ATTRIBUTES_INT("clearComments", 1);
+    LXW_PUSH_ATTRIBUTES_INT("assign", 1);
+    LXW_PUSH_ATTRIBUTES_INT("coerce", 1);
+
+    lxw_xml_empty_tag(self->file, "metadataType", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <metadataTypes> element.
  */
@@ -123,14 +159,24 @@ _metadata_write_metadata_types(lxw_metadata *self)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
+    uint8_t count = 0;
+
+    if (self->has_dynamic_functions)
+        count++;
+
+    if (self->has_embedded_images)
+        count++;
 
     LXW_INIT_ATTRIBUTES();
-    LXW_PUSH_ATTRIBUTES_INT("count", 1);
+    LXW_PUSH_ATTRIBUTES_INT("count", count);
 
     lxw_xml_start_tag(self->file, "metadataTypes", &attributes);
 
     /* Write the metadataType element. */
-    _metadata_write_metadata_type(self);
+    if (self->has_dynamic_functions)
+        _metadata_write_cell_metadata_type(self);
+    if (self->has_embedded_images)
+        _metadata_write_value_metadata_type(self);
 
     lxw_xml_end_tag(self->file, "metadataTypes");
 
@@ -156,10 +202,10 @@ _metadata_write_xda_dynamic_array_properties(lxw_metadata *self)
 }
 
 /*
- * Write the <ext> element.
+ * Write the <ext> element for dynamic functions.
  */
 STATIC void
-_metadata_write_ext(lxw_metadata *self)
+_metadata_write_cell_ext(lxw_metadata *self)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
@@ -178,10 +224,49 @@ _metadata_write_ext(lxw_metadata *self)
 }
 
 /*
- * Write the <futureMetadata> element.
+ * Write the <xlrd:rvb> element.
  */
 STATIC void
-_metadata_write_future_metadata(lxw_metadata *self)
+_metadata_write_xlrd_rvb(lxw_metadata *self, uint32_t index)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_INT("i", index);
+
+    lxw_xml_empty_tag(self->file, "xlrd:rvb", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <ext> element for embedded images.
+ */
+STATIC void
+_metadata_write_value_ext(lxw_metadata *self, uint32_t index)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_STR("uri", "{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}");
+
+    lxw_xml_start_tag(self->file, "ext", &attributes);
+
+    /* Write the xlrd:rvb element. */
+    _metadata_write_xlrd_rvb(self, index);
+
+    lxw_xml_end_tag(self->file, "ext");
+
+    LXW_FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <futureMetadata> element for dynamic functions.
+ */
+STATIC void
+_metadata_write_cell_future_metadata(lxw_metadata *self)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
@@ -193,14 +278,12 @@ _metadata_write_future_metadata(lxw_metadata *self)
     lxw_xml_start_tag(self->file, "futureMetadata", &attributes);
 
     lxw_xml_start_tag(self->file, "bk", NULL);
-
     lxw_xml_start_tag(self->file, "extLst", NULL);
 
     /* Write the ext element. */
-    _metadata_write_ext(self);
+    _metadata_write_cell_ext(self);
 
     lxw_xml_end_tag(self->file, "extLst");
-
     lxw_xml_end_tag(self->file, "bk");
 
     lxw_xml_end_tag(self->file, "futureMetadata");
@@ -208,18 +291,52 @@ _metadata_write_future_metadata(lxw_metadata *self)
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <futureMetadata> element for embedded images.
+ */
+STATIC void
+_metadata_write_value_future_metadata(lxw_metadata *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    uint32_t i;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_STR("name", "XLRICHVALUE");
+    LXW_PUSH_ATTRIBUTES_INT("count", self->num_embedded_images);
+
+    lxw_xml_start_tag(self->file, "futureMetadata", &attributes);
+
+    for (i = 0; i < self->num_embedded_images; i++) {
+        lxw_xml_start_tag(self->file, "bk", NULL);
+
+        lxw_xml_start_tag(self->file, "extLst", NULL);
+
+        /* Write the ext element. */
+        _metadata_write_value_ext(self, i);
+
+        lxw_xml_end_tag(self->file, "extLst");
+        lxw_xml_end_tag(self->file, "bk");
+
+    }
+
+    lxw_xml_end_tag(self->file, "futureMetadata");
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <rc> element.
  */
 STATIC void
-_metadata_write_rc(lxw_metadata *self)
+_metadata_write_rc(lxw_metadata *self, uint8_t type, uint32_t index)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
 
     LXW_INIT_ATTRIBUTES();
-    LXW_PUSH_ATTRIBUTES_STR("t", "1");
-    LXW_PUSH_ATTRIBUTES_STR("v", "0");
+    LXW_PUSH_ATTRIBUTES_INT("t", type);
+    LXW_PUSH_ATTRIBUTES_INT("v", index);
 
     lxw_xml_empty_tag(self->file, "rc", &attributes);
 
@@ -227,7 +344,7 @@ _metadata_write_rc(lxw_metadata *self)
 }
 
 /*
- * Write the <cellMetadata> element.
+ * Write the <cellMetadata> element for dynamic functions.
  */
 STATIC void
 _metadata_write_cell_metadata(lxw_metadata *self)
@@ -243,7 +360,7 @@ _metadata_write_cell_metadata(lxw_metadata *self)
     lxw_xml_start_tag(self->file, "bk", NULL);
 
     /* Write the rc element. */
-    _metadata_write_rc(self);
+    _metadata_write_rc(self, 1, 0);
 
     lxw_xml_end_tag(self->file, "bk");
 
@@ -252,6 +369,39 @@ _metadata_write_cell_metadata(lxw_metadata *self)
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <cellMetadata> element for embedded images.
+ */
+STATIC void
+_metadata_write_value_metadata(lxw_metadata *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    uint8_t type = 1;
+    uint32_t i;
+
+    if (self->has_dynamic_functions)
+        type = 2;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_INT("count", self->num_embedded_images);
+
+    lxw_xml_start_tag(self->file, "valueMetadata", &attributes);
+
+    for (i = 0; i < self->num_embedded_images; i++) {
+        lxw_xml_start_tag(self->file, "bk", NULL);
+
+        /* Write the rc element. */
+        _metadata_write_rc(self, type, i);
+
+        lxw_xml_end_tag(self->file, "bk");
+    }
+
+    lxw_xml_end_tag(self->file, "valueMetadata");
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*****************************************************************************
  *
  * XML file assembly functions.
@@ -274,10 +424,16 @@ lxw_metadata_assemble_xml_file(lxw_metadata *self)
     _metadata_write_metadata_types(self);
 
     /* Write the futureMetadata element. */
-    _metadata_write_future_metadata(self);
+    if (self->has_dynamic_functions)
+        _metadata_write_cell_future_metadata(self);
+    if (self->has_embedded_images)
+        _metadata_write_value_future_metadata(self);
 
     /* Write the cellMetadata element. */
-    _metadata_write_cell_metadata(self);
+    if (self->has_dynamic_functions)
+        _metadata_write_cell_metadata(self);
+    if (self->has_embedded_images)
+        _metadata_write_value_metadata(self);
 
     lxw_xml_end_tag(self->file, "metadata");
 }