fast_excel 0.4.1 → 0.5.0

data/libxlsxwriter/include/xlsxwriter/xmlwriter.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * xmlwriter - A libxlsxwriter library for creating Excel XLSX
  *             XML files.
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "utility.h"
 
-#define LXW_MAX_ATTRIBUTE_LENGTH 256
+#define LXW_MAX_ATTRIBUTE_LENGTH 2080   /* Max URL length. */
 #define LXW_ATTR_32              32
 
 #define LXW_ATTRIBUTE_COPY(dst, src)                    \
@@ -55,7 +55,7 @@ STAILQ_HEAD(xml_attribute_list, xml_attribute);
 /* Create a new attribute struct to add to a xml_attribute_list. */
 struct xml_attribute *lxw_new_attribute_str(const char *key,
                                             const char *value);
-struct xml_attribute *lxw_new_attribute_int(const char *key, uint32_t value);
+struct xml_attribute *lxw_new_attribute_int(const char *key, uint64_t value);
 struct xml_attribute *lxw_new_attribute_dbl(const char *key, double value);
 
 /* Macro to initialize the xml_attribute_list pointers. */
@@ -85,11 +85,13 @@ struct xml_attribute *lxw_new_attribute_dbl(const char *key, double value);
 
 /* Macro to free xml_attribute_list and attribute. */
 #define LXW_FREE_ATTRIBUTES()                                 \
-    while (!STAILQ_EMPTY(&attributes)) {                      \
-        attribute = STAILQ_FIRST(&attributes);                \
-        STAILQ_REMOVE_HEAD(&attributes, list_entries);        \
-        free(attribute);                                      \
-    }
+    do {                                                      \
+        while (!STAILQ_EMPTY(&attributes)) {                  \
+            attribute = STAILQ_FIRST(&attributes);            \
+            STAILQ_REMOVE_HEAD(&attributes, list_entries);    \
+            free(attribute);                                  \
+        }                                                     \
+    } while (0)
 
 /**
  * Create the XML declaration in an XML file.
@@ -167,7 +169,9 @@ void lxw_xml_data_element(FILE * xmlfile,
 
 void lxw_xml_rich_si_element(FILE * xmlfile, const char *string);
 
+uint8_t lxw_has_control_characters(const char *string);
 char *lxw_escape_control_characters(const char *string);
+char *lxw_escape_url_characters(const char *string, uint8_t escape_hash);
 
 char *lxw_escape_data(const char *data);
 

data/libxlsxwriter/include/xlsxwriter.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  */
 
 /**
@@ -18,6 +18,8 @@
 #include "xlsxwriter/format.h"
 #include "xlsxwriter/utility.h"
 
-#define LXW_VERSION "0.8.6"
+#define LXW_VERSION "1.1.5"
+#define LXW_VERSION_ID 115
+#define LXW_SOVERSION "5"
 
 #endif /* __LXW_XLSXWRITER_H__ */

data/libxlsxwriter/libxlsxwriter.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |s|
   s.name                  = "libxlsxwriter"
-  s.version               = "0.8.6"
+  s.version               = "1.1.5"
   s.summary               = "Libxlsxwriter: A C library for creating Excel XLSX files."
-  s.ios.deployment_target = "6.0"
+  s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.8"
 
   s.description           = <<-DESC
@@ -17,7 +17,10 @@ Pod::Spec.new do |s|
                             * Autofilters.
                             * Charts.
                             * Data validation and drop down lists.
-                            * Worksheet PNG/JPEG images.
+                            * Conditional formatting.
+                            * Worksheet PNG/JPEG/GIF images.
+                            * Cell comments.
+                            * Support for adding Macros.
                             * Memory optimisation mode for writing large files.
                             * Source code available on [GitHub](https://github.com/jmcnamara/libxlsxwriter).
                             * FreeBSD license.
@@ -35,8 +38,8 @@ Pod::Spec.new do |s|
   s.author                = { "John McNamara" => "jmcnamara@cpan.org" }
 
   s.source                = { :git => "https://github.com/jmcnamara/libxlsxwriter.git", :tag => "RELEASE_" + s.version.to_s }
-  s.source_files          = "src/**/*.c", "third_party/**/{zip.c,ioapi.c,tmpfileplus.c}", "include/**/*.h"
-
+  s.source_files          = "src/*.c", "third_party/**/{zip.c,ioapi.c,tmpfileplus.c,md5.c}", "include/**/*.h"
+  s.preserve_paths        = [ 'third_party/**/*.h' ]
   s.header_dir            = "xlsxwriter"
   s.header_mappings_dir   = "include"
   s.library               = "z"

data/libxlsxwriter/src/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter library.
 #
-# Copyright 2014-2019, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2022, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.
@@ -11,6 +11,13 @@ ifdef V
 Q=
 endif
 
+DESTDIR ?=
+PREFIX  ?= /usr/local
+OPT_LEVEL ?= -O3
+
+SOVERSION = $(shell sed -n -e 's/.*LXW_SOVERSION \"\(.*\)\"/\1/p' ../include/xlsxwriter.h)
+
+
 # Directory variables.
 OBJS_DIR    = .
 INC_DIR     = ../include
@@ -27,7 +34,6 @@ MINIZIP_OBJ = $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o
 MINIZIP_SO  = $(MINIZIP_DIR)/ioapi.so $(MINIZIP_DIR)/zip.so
 endif
 
-
 ifdef USE_STANDARD_TMPFILE
 # Use standard/C tmpfile().
 CFLAGS += -DUSE_STANDARD_TMPFILE
@@ -38,24 +44,45 @@ TMPFILEPLUS_OBJ = $(TMPFILEPLUS_DIR)/tmpfileplus.o
 TMPFILEPLUS_SO  = $(TMPFILEPLUS_DIR)/tmpfileplus.so
 endif
 
+ifdef USE_NO_MD5
+# Don't use MD5 to avoid duplicate image files.
+CFLAGS += -DUSE_NO_MD5
+else
+ifdef USE_OPENSSL_MD5
+CFLAGS += -DUSE_OPENSSL_MD5 -Wno-deprecated-declarations
+LIBS   += -lcrypto
+else
+# Use md5 (the default).
+MD5_DIR = ../third_party/md5
+MD5_OBJ = $(MD5_DIR)/md5.o
+MD5_SO  = $(MD5_DIR)/md5.so
+endif
+endif
+
 # Set flag for big endian architecture.
 ifdef USE_BIG_ENDIAN
 CFLAGS += -DLXW_BIG_ENDIAN
 endif
 
-# Use a user-defined double number formatting function.
-ifdef USE_DOUBLE_FUNCTION
-CFLAGS += -DUSE_DOUBLE_FUNCTION
+# Use a third party double number formatting function.
+ifdef USE_DTOA_LIBRARY
+CFLAGS += -DUSE_DTOA_LIBRARY
+DTOA_LIB_DIR = ../third_party/dtoa
+DTOA_LIB_OBJ = $(DTOA_LIB_DIR)/emyg_dtoa.o
+DTOA_LIB_SO  = $(DTOA_LIB_DIR)/emyg_dtoa.so
 endif
 
-# Flags passed to compiler.
-CFLAGS   += -g -O3 -Wall -Wextra -pedantic -ansi
+# Use fmemopen()/open_memstream() to avoid creating temporary files
+ifdef USE_MEM_FILE
+USE_FMEMOPEN = 1
+endif
 
-# Fix for modified zconf.h on Gentoo.
-ifneq (,$(findstring gentoo, $(shell uname -sr)))
-CFLAGS += -DOF=_Z_OF
+ifdef USE_FMEMOPEN
+CFLAGS += -DUSE_FMEMOPEN
 endif
 
+# Flags passed to compiler.
+CFLAGS   += -g $(OPT_LEVEL) -Wall -Wextra -Wstrict-prototypes -pedantic -ansi
 
 # Ignore icc remarks about inlining limits.
 ifeq ($(CC),icc)
@@ -64,7 +91,7 @@ endif
 
 # Library names.
 LIBXLSXWRITER_A  = libxlsxwriter.a
-LIBXLSXWRITER_SO = libxlsxwriter.so
+LIBXLSXWRITER_SO = libxlsxwriter.so.$(SOVERSION)
 
 # Library with additional non-static functions for testing.
 LIBXLSXWRITER_TO = libxlsxwriter_test.a
@@ -74,15 +101,15 @@ ARFLAGS = rc
 
 # Flags passed to dynamic linker.
 FPIC = -fPIC
-SOFLAGS = -shared $(FPIC)
+SOFLAGS = -shared $(FPIC) -Wl,-soname,$(LIBXLSXWRITER_SO)
 
 # Get Env/OS name.
 UNAME := $(shell uname)
 
 # Change make options on OS X.
 ifeq ($(UNAME), Darwin)
-LIBXLSXWRITER_SO = libxlsxwriter.dylib
-SOFLAGS = -dynamiclib $(FPIC) -install_name /usr/lib/$(LIBXLSXWRITER_SO)
+LIBXLSXWRITER_SO = libxlsxwriter.$(SOVERSION).dylib
+SOFLAGS = -dynamiclib $(FPIC) -compatibility_version $(SOVERSION) -install_name $(PREFIX)/lib/$(LIBXLSXWRITER_SO) $(GCOV)
 endif
 
 # Check for MinGW/MinGW64/Cygwin environments.
@@ -118,11 +145,21 @@ TOBJS = $(patsubst %.c,%.to,$(SRCS))
 all : $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO)
 	$(Q)cp $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO) ../lib
 
+ifeq ($(UNAME), Darwin)
+	$(Q)rm -f ../lib/libxlsxwriter.dylib
+	$(Q)ln -s $(LIBXLSXWRITER_SO) ../lib/libxlsxwriter.dylib
+endif
+
+ifneq ($(UNAME), Darwin)
+	$(Q)rm -f ../lib/libxlsxwriter.so
+	$(Q)ln -s $(LIBXLSXWRITER_SO) ../lib/libxlsxwriter.so
+endif
+
 test_lib : libxlsxwriter_test.a
 
 # The static library.
 $(LIBXLSXWRITER_A) : $(OBJS)
-	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $^
+	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $(DTOA_LIB_OBJ) $(MD5_OBJ) $^
 
 # The dynamic library.
 ifeq ($(findstring m32,$(CFLAGS)),m32)
@@ -130,26 +167,26 @@ ARCH = -m32
 endif
 
 $(LIBXLSXWRITER_SO) : $(SOBJS)
-	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $^ $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $(DTOA_LIB_SO) $^ $(LIBS)
 
 # The test library.
 $(LIBXLSXWRITER_TO) : $(TOBJS)
-	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $^
+	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $(DTOA_LIB_SO) $(MD5_OBJ) $^
 
 # Minimal target for quick compile without creating the libs.
 test_compile : $(OBJS)
 
 # Targets for the object files.
 %.o  : %.c $(HDRS)
-	$(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $<
+	$(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) $(TARGET_ARCH) $(GCOV) -c $<
 
 %.so : %.c $(HDRS)
-	$(Q)$(CC) $(FPIC) -I$(INC_DIR) $(LDFLAGS) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(Q)$(CC) $(FPIC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) $(TARGET_ARCH) $(GCOV) -c $< -o $@
 
 %.to : %.c $(HDRS)
-	$(Q)$(CC) -g -O3 -DTESTING -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(Q)$(CC) -g $(OPT_LEVEL) -DTESTING -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) $(GCOV) -c $< -o $@
 
 
 # Clean up any temp/build files.
 clean :
-	$(Q)rm -f *.o *.a *.so *.to *.dylib *.dll
+	$(Q)rm -f *.o *.a *.so *.so.* *.to *.dylib *.dll *.gcno *.gcda

data/libxlsxwriter/src/app.c

@@ -3,7 +3,7 @@
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
@@ -132,7 +132,10 @@ _write_application(lxw_app *self)
 STATIC void
 _write_doc_security(lxw_app *self)
 {
-    lxw_xml_data_element(self->file, "DocSecurity", "0", NULL);
+    if (self->doc_security == 2)
+        lxw_xml_data_element(self->file, "DocSecurity", "2", NULL);
+    else
+        lxw_xml_data_element(self->file, "DocSecurity", "0", NULL);
 }
 
 /*