fast_excel 0.2.2 → 0.4.0

data/libxlsxwriter/include/xlsxwriter/xmlwriter.h

@@ -1,7 +1,7 @@
 /*
  * libxlsxwriter
  *
- * Copyright 2014-2017, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  * xmlwriter - A libxlsxwriter library for creating Excel XLSX
  *             XML files.
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include "common.h"
+#include "utility.h"
 
 #define LXW_MAX_ATTRIBUTE_LENGTH 256
 #define LXW_ATTR_32              32
@@ -165,6 +165,8 @@ void lxw_xml_data_element(FILE * xmlfile,
                           const char *data,
                           struct xml_attribute_list *attributes);
 
+void lxw_xml_rich_si_element(FILE * xmlfile, const char *string);
+
 char *lxw_escape_control_characters(const char *string);
 
 char *lxw_escape_data(const char *data);

data/libxlsxwriter/libxlsxwriter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "libxlsxwriter"
-  s.version               = "0.6.9"
+  s.version               = "0.8.6"
   s.summary               = "Libxlsxwriter: A C library for creating Excel XLSX files."
   s.ios.deployment_target = "6.0"
   s.osx.deployment_target = "10.8"
@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
                             * Defined names.
                             * Autofilters.
                             * Charts.
+                            * Data validation and drop down lists.
                             * Worksheet PNG/JPEG images.
                             * Memory optimisation mode for writing large files.
                             * Source code available on [GitHub](https://github.com/jmcnamara/libxlsxwriter).
@@ -24,6 +25,7 @@ Pod::Spec.new do |s|
                             * Works with GCC, Clang, Xcode, MSVC 2015, ICC, TCC, MinGW, MingGW-w64/32.
                             * Works on Linux, FreeBSD, OpenBSD, OS X, iOS and Windows. Also works on MSYS/MSYS2 and Cygwin.
                             * Compiles for 32 and 64 bit.
+                            * Compiles and works on big and little endian systems.
                             * The only dependency is on `zlib`.
                             DESC
 
@@ -36,7 +38,7 @@ Pod::Spec.new do |s|
   s.source_files          = "src/**/*.c", "third_party/**/{zip.c,ioapi.c,tmpfileplus.c}", "include/**/*.h"
 
   s.header_dir            = "xlsxwriter"
-  s.header_mappings_dir   = "include/xlsxwriter"
+  s.header_mappings_dir   = "include"
   s.library               = "z"
   s.compiler_flags        = "-DNOCRYPT=1", "-DNOUNCRYPT=1"
   s.pod_target_xcconfig   = { 'USER_HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libxlsxwriter/include' }

data/libxlsxwriter/src/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter library.
 #
-# Copyright 2014-2017, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2019, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.
@@ -15,8 +15,17 @@ endif
 OBJS_DIR    = .
 INC_DIR     = ../include
 
-# The minizip directory.
+LIBS = -lz
+
+ifdef USE_SYSTEM_MINIZIP
+LIBS   += -lminizip
+CFLAGS += -DUSE_SYSTEM_MINIZIP
+else
+# Use the local copy of minizip.
 MINIZIP_DIR = ../third_party/minizip
+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
@@ -29,9 +38,25 @@ TMPFILEPLUS_OBJ = $(TMPFILEPLUS_DIR)/tmpfileplus.o
 TMPFILEPLUS_SO  = $(TMPFILEPLUS_DIR)/tmpfileplus.so
 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
+endif
+
 # Flags passed to compiler.
 CFLAGS   += -g -O3 -Wall -Wextra -pedantic -ansi
 
+# Fix for modified zconf.h on Gentoo.
+ifneq (,$(findstring gentoo, $(shell uname -sr)))
+CFLAGS += -DOF=_Z_OF
+endif
+
+
 # Ignore icc remarks about inlining limits.
 ifeq ($(CC),icc)
 CFLAGS   +=-diag-disable=11074,11076
@@ -97,7 +122,7 @@ test_lib : libxlsxwriter_test.a
 
 # The static library.
 $(LIBXLSXWRITER_A) : $(OBJS)
-	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o $(TMPFILEPLUS_OBJ) $^
+	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $^
 
 # The dynamic library.
 ifeq ($(findstring m32,$(CFLAGS)),m32)
@@ -105,11 +130,11 @@ ARCH = -m32
 endif
 
 $(LIBXLSXWRITER_SO) : $(SOBJS)
-	$(Q)$(CC) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_DIR)/ioapi.so $(MINIZIP_DIR)/zip.so $(TMPFILEPLUS_SO) $^ -lz
+	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $^ $(LIBS)
 
 # The test library.
 $(LIBXLSXWRITER_TO) : $(TOBJS)
-	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o  $(TMPFILEPLUS_OBJ) $^
+	$(Q)$(AR) $(ARFLAGS) $@ $(MINIZIP_OBJ) $(TMPFILEPLUS_OBJ) $^
 
 # Minimal target for quick compile without creating the libs.
 test_compile : $(OBJS)
@@ -119,7 +144,7 @@ test_compile : $(OBJS)
 	$(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $<
 
 %.so : %.c $(HDRS)
-	$(Q)$(CC) $(FPIC) -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(Q)$(CC) $(FPIC) -I$(INC_DIR) $(LDFLAGS) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
 
 %.to : %.c $(HDRS)
 	$(Q)$(CC) -g -O3 -DTESTING -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@

data/libxlsxwriter/src/app.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.
  *
  */
 
@@ -25,7 +25,7 @@
  * Create a new app object.
  */
 lxw_app *
-lxw_app_new()
+lxw_app_new(void)
 {
     lxw_app *app = calloc(1, sizeof(lxw_app));
     GOTO_LABEL_ON_MEM_ERROR(app, mem_error);

data/libxlsxwriter/src/chart.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.
  *
  */
 
@@ -311,13 +311,21 @@ _chart_convert_font_args(lxw_chart_font *user_font)
     font = calloc(1, sizeof(struct lxw_chart_font));
     RETURN_ON_MEM_ERROR(font, NULL);
 
-    memcpy(font, user_font, sizeof(lxw_chart_font));
-
+    /* Copy the user supplied properties. */
     font->name = lxw_strdup(user_font->name);
+    font->size = user_font->size;
+    font->bold = user_font->bold;
+    font->italic = user_font->italic;
+    font->underline = user_font->underline;
+    font->rotation = user_font->rotation;
+    font->color = user_font->color;
+    font->pitch_family = user_font->pitch_family;
+    font->charset = user_font->charset;
+    font->baseline = user_font->baseline;
 
     /* Convert font size units. */
-    if (font->size)
-        font->size = font->size * 100;
+    if (font->size > 0.0)
+        font->size = font->size * 100.0;
 
     /* Convert rotation into 60,000ths of a degree. */
     if (font->rotation)
@@ -345,7 +353,12 @@ _chart_convert_line_args(lxw_chart_line *user_line)
     line = calloc(1, sizeof(struct lxw_chart_line));
     RETURN_ON_MEM_ERROR(line, NULL);
 
-    memcpy(line, user_line, sizeof(lxw_chart_line));
+    /* Copy the user supplied properties. */
+    line->color = user_line->color;
+    line->none = user_line->none;
+    line->width = user_line->width;
+    line->dash_type = user_line->dash_type;
+    line->transparency = user_line->transparency;
 
     if (line->color) {
         line->color = lxw_format_check_color(line->color);
@@ -372,7 +385,10 @@ _chart_convert_fill_args(lxw_chart_fill *user_fill)
     fill = calloc(1, sizeof(struct lxw_chart_fill));
     RETURN_ON_MEM_ERROR(fill, NULL);
 
-    memcpy(fill, user_fill, sizeof(lxw_chart_fill));
+    /* Copy the user supplied properties. */
+    fill->color = user_fill->color;
+    fill->none = user_fill->none;
+    fill->transparency = user_fill->transparency;
 
     if (fill->color) {
         fill->color = lxw_format_check_color(fill->color);
@@ -409,7 +425,10 @@ _chart_convert_pattern_args(lxw_chart_pattern *user_pattern)
     pattern = calloc(1, sizeof(struct lxw_chart_pattern));
     RETURN_ON_MEM_ERROR(pattern, NULL);
 
-    memcpy(pattern, user_pattern, sizeof(lxw_chart_pattern));
+    /* Copy the user supplied properties. */
+    pattern->fg_color = user_pattern->fg_color;
+    pattern->bg_color = user_pattern->bg_color;
+    pattern->type = user_pattern->type;
 
     pattern->fg_color = lxw_format_check_color(pattern->fg_color);
     pattern->has_fg_color = LXW_TRUE;
@@ -424,8 +443,6 @@ _chart_convert_pattern_args(lxw_chart_pattern *user_pattern)
         pattern->has_bg_color = LXW_TRUE;
     }
 
-    pattern->type = user_pattern->type;
-
     return pattern;
 }
 
@@ -556,6 +573,15 @@ _chart_xml_declaration(lxw_chart *self)
     lxw_xml_declaration(self->file);
 }
 
+/*
+ * Write the <c:protection> element.
+ */
+STATIC void
+_chart_write_protection(lxw_chart *self)
+{
+    lxw_xml_empty_tag(self->file, "c:protection", NULL);
+}
+
 /*
  * Write the <c:chartSpace> element.
  */
@@ -836,8 +862,8 @@ _chart_write_a_def_rpr(lxw_chart *self, lxw_chart_font *font)
         use_font_default = !(has_color || has_latin || font->baseline == -1);
 
         /* Set the font attributes. */
-        if (font->size)
-            LXW_PUSH_ATTRIBUTES_INT("sz", font->size);
+        if (font->size > 0.0)
+            LXW_PUSH_ATTRIBUTES_DBL("sz", font->size);
 
         if (use_font_default || font->bold)
             LXW_PUSH_ATTRIBUTES_INT("b", font->bold & 0x1);
@@ -908,8 +934,8 @@ _chart_write_a_r_pr(lxw_chart *self, lxw_chart_font *font)
         use_font_default = !(has_color || has_latin || font->baseline == -1);
 
         /* Set the font attributes. */
-        if (font->size)
-            LXW_PUSH_ATTRIBUTES_INT("sz", font->size);
+        if (font->size > 0.0)
+            LXW_PUSH_ATTRIBUTES_DBL("sz", font->size);
 
         if (use_font_default || font->bold)
             LXW_PUSH_ATTRIBUTES_INT("b", font->bold & 0x1);
@@ -1137,7 +1163,7 @@ _chart_write_v_num(lxw_chart *self, double number)
 {
     char data[LXW_ATTR_32];
 
-    lxw_snprintf(data, LXW_ATTR_32, "%.16g", number);
+    lxw_sprintf_dbl(data, number);
 
     lxw_xml_data_element(self->file, "c:v", data, NULL);
 }
@@ -3184,13 +3210,19 @@ _chart_write_auto(lxw_chart *self)
  * Write the <c:lblAlgn> element.
  */
 STATIC void
-_chart_write_label_align(lxw_chart *self)
+_chart_write_label_align(lxw_chart *self, lxw_chart_axis *axis)
 {
     struct xml_attribute_list attributes;
     struct xml_attribute *attribute;
 
     LXW_INIT_ATTRIBUTES();
-    LXW_PUSH_ATTRIBUTES_STR("val", "ctr");
+
+    if (axis->label_align == LXW_CHART_AXIS_LABEL_ALIGN_LEFT)
+        LXW_PUSH_ATTRIBUTES_STR("val", "l");
+    else if (axis->label_align == LXW_CHART_AXIS_LABEL_ALIGN_RIGHT)
+        LXW_PUSH_ATTRIBUTES_STR("val", "r");
+    else
+        LXW_PUSH_ATTRIBUTES_STR("val", "ctr");
 
     lxw_xml_empty_tag(self->file, "c:lblAlgn", &attributes);
 
@@ -3568,6 +3600,9 @@ _chart_write_legend(lxw_chart *self)
         case LXW_CHART_LEGEND_BOTTOM:
             _chart_write_legend_pos(self, "b");
             break;
+        case LXW_CHART_LEGEND_TOP_RIGHT:
+            _chart_write_legend_pos(self, "tr");
+            break;
         case LXW_CHART_LEGEND_OVERLAY_RIGHT:
             _chart_write_legend_pos(self, "r");
             has_overlay = LXW_TRUE;
@@ -3576,6 +3611,10 @@ _chart_write_legend(lxw_chart *self)
             _chart_write_legend_pos(self, "l");
             has_overlay = LXW_TRUE;
             break;
+        case LXW_CHART_LEGEND_OVERLAY_TOP_RIGHT:
+            _chart_write_legend_pos(self, "tr");
+            has_overlay = LXW_TRUE;
+            break;
         default:
             _chart_write_legend_pos(self, "r");
     }
@@ -4074,7 +4113,7 @@ _chart_write_cat_axis(lxw_chart *self)
     _chart_write_auto(self);
 
     /* Write the c:lblAlgn element. */
-    _chart_write_label_align(self);
+    _chart_write_label_align(self, self->x_axis);
 
     /* Write the c:lblOffset element. */
     _chart_write_label_offset(self);
@@ -4565,6 +4604,10 @@ _chart_write_pie_plot_area(lxw_chart *self)
     /* Write subclass chart type elements for primary and secondary axes. */
     self->write_chart_type(self);
 
+    /* Write the c:spPr element for the plotarea formatting. */
+    _chart_write_sp_pr(self, self->plotarea_line, self->plotarea_fill,
+                       self->plotarea_pattern);
+
     lxw_xml_end_tag(self->file, "c:plotArea");
 }
 
@@ -4907,6 +4950,10 @@ lxw_chart_assemble_xml_file(lxw_chart *self)
     /* Write the c:style element. */
     _chart_write_style(self);
 
+    /* Write the c:protection element. */
+    if (self->is_protected)
+        _chart_write_protection(self);
+
     /* Write the c:chart element. */
     _chart_write_chart(self);
 
@@ -4915,7 +4962,8 @@ lxw_chart_assemble_xml_file(lxw_chart *self)
                        self->chartarea_pattern);
 
     /* Write the c:printSettings element. */
-    _chart_write_print_settings(self);
+    if (!self->is_chartsheet)
+        _chart_write_print_settings(self);
 
     lxw_xml_end_tag(self->file, "c:chartSpace");
 }
@@ -5384,7 +5432,8 @@ chart_series_set_labels_percentage(lxw_chart_series *series)
  * Set an data labels number format.
  */
 void
-chart_series_set_labels_num_format(lxw_chart_series *series, char *num_format)
+chart_series_set_labels_num_format(lxw_chart_series *series,
+                                   const char *num_format)
 {
     if (!num_format)
         return;
@@ -5531,7 +5580,7 @@ chart_series_set_trendline_intercept(lxw_chart_series *series,
  * Set a line type for a series trendline.
  */
 void
-chart_series_set_trendline_name(lxw_chart_series *series, char *name)
+chart_series_set_trendline_name(lxw_chart_series *series, const char *name)
 {
     if (!name)
         return;
@@ -5558,6 +5607,24 @@ chart_series_set_trendline_line(lxw_chart_series *series,
     series->trendline_line = _chart_convert_line_args(line);
 }
 
+/*
+ * Set the X or Y error bars from a chart series.
+ */
+lxw_series_error_bars *
+chart_series_get_error_bars(lxw_chart_series *series,
+                            lxw_chart_error_bar_axis axis_type)
+{
+    if (!series)
+        return NULL;
+
+    if (axis_type == LXW_CHART_ERROR_BAR_AXIS_X)
+        return series->x_error_bars;
+    else if (axis_type == LXW_CHART_ERROR_BAR_AXIS_Y)
+        return series->y_error_bars;
+    else
+        return NULL;
+}
+
 /*
  * Set the error bars and type for a chart series.
  */
@@ -5622,6 +5689,23 @@ chart_series_set_error_bars_line(lxw_series_error_bars *error_bars,
     error_bars->line = _chart_convert_line_args(line);
 }
 
+/*
+ * Get an axis pointer from a chart.
+ */
+lxw_chart_axis *
+chart_axis_get(lxw_chart *self, lxw_chart_axis_type axis_type)
+{
+    if (!self)
+        return NULL;
+
+    if (axis_type == LXW_CHART_AXIS_TYPE_X)
+        return self->x_axis;
+    else if (axis_type == LXW_CHART_AXIS_TYPE_Y)
+        return self->y_axis;
+    else
+        return NULL;
+}
+
 /*
  * Set an axis caption.
  */
@@ -5638,7 +5722,7 @@ chart_axis_set_name(lxw_chart_axis *axis, const char *name)
 }
 
 /*
- * Set an axis caption, with a range instead or a formula..
+ * Set an axis caption, with a range instead or a formula.
  */
 void
 chart_axis_set_name_range(lxw_chart_axis *axis, const char *sheetname,
@@ -5687,7 +5771,7 @@ chart_axis_set_num_font(lxw_chart_axis *axis, lxw_chart_font *font)
  * Set an axis number format.
  */
 void
-chart_axis_set_num_format(lxw_chart_axis *axis, char *num_format)
+chart_axis_set_num_format(lxw_chart_axis *axis, const char *num_format)
 {
     if (!num_format)
         return;
@@ -5983,6 +6067,15 @@ chart_axis_minor_gridlines_set_line(lxw_chart_axis *axis,
         axis->minor_gridlines.visible = LXW_TRUE;
 }
 
+/*
+ * Set the chart axis label alignment.
+ */
+void
+chart_axis_set_label_align(lxw_chart_axis *axis, uint8_t align)
+{
+    axis->label_align = align;
+}
+
 /*
  * Set the chart title.
  */