Merge branch 'viest:master' into format_rotation

Author: gyalogmixi

config.m4

@@ -1,17 +1,35 @@
-PHP_ARG_WITH(xlswriter, xlswriter support,
-[  --with-xlswriter         Include xlswriter support], yes)
-
-PHP_ARG_WITH(libxlsxwriter, system libxlsxwriter,
-[  --with-libxlsxwriter=DIR Use system libxlsxwriter], no, no)
-
-PHP_ARG_WITH(libxlsxio, system libxlsxio,
-[  --with-libxlsxio=DIR     Use system libxlsxio], no, no)
-
-PHP_ARG_WITH(openssl, openssl MD5,
-[  --with-openssl=DIR   Use openssl MD5], no, no)
-
-PHP_ARG_ENABLE(reader, enable xlsx reader support,
-[  --enable-reader          Enable xlsx reader?], yes, yes)
+PHP_ARG_WITH([xlswriter],
+    [xlswriter support],
+    [AS_HELP_STRING([--without-xlswriter],
+        [Disable xlswriter support])],
+    [yes])
+
+PHP_ARG_WITH([libxlsxwriter],
+    [system libxlsxwriter],
+    [AS_HELP_STRING([[--with-libxlsxwriter[=DIR]]],
+        [Use system libxlsxwriter])],
+    [no],
+    [no])
+
+PHP_ARG_WITH([libxlsxio],
+    [system libxlsxio],
+    [AS_HELP_STRING([[--with-libxlsxio[=DIR]]],
+        [Use system libxlsxio])],
+    [no],
+    [no])
+
+PHP_ARG_WITH([openssl],
+    [openssl MD5],
+    [AS_HELP_STRING([[--with-openssl[=DIR]]],
+        [Use openssl MD5])],
+    [no],
+    [no])
+
+PHP_ARG_ENABLE([reader],
+    [whether to enable the xlsx reader support],
+    [AS_HELP_STRING([--disable-reader],
+        [Disable xlsx reader])],
+    [yes])
 
 if test "$PHP_XLSWRITER" != "no"; then
     xls_writer_sources="

config.w32

@@ -3,7 +3,6 @@
 ARG_WITH("xlswriter", "xlswriter support", "no");
 
 if (PHP_XLSWRITER != "no") {
-
     if (
         CHECK_HEADER_ADD_INCLUDE("minizip/zip.h", "CFLAGS_XLSWRITER", configure_module_dirname + "\\library\\libxlsxwriter\\third_party;" + PHP_EXTRA_INCLUDES) &&
         CHECK_HEADER_ADD_INCLUDE("xlsxwriter.h",  "CFLAGS_XLSWRITER", configure_module_dirname + "\\library\\libxlsxwriter\\include;" + PHP_EXTRA_INCLUDES) &&

include/help.h

@@ -18,5 +18,6 @@
 unsigned int file_exists(const char *path);
 unsigned int directory_exists(const char *path);
 zend_long date_double_to_timestamp(double value);
+lxw_row_col_options* default_row_col_options();
 
 #endif //PHP_EXT_XLS_EXPORT_HELP_H

include/xlswriter.h

@@ -88,6 +88,10 @@ typedef struct {
     lxw_format  *format;
 } xls_resource_format_t;
 
+typedef struct {
+    HashTable *maps;
+} xls_resource_formats_cache_t;
+
 typedef struct {
     lxw_data_validation *validation;
 } xls_resource_validation_t;
@@ -102,11 +106,13 @@ typedef struct {
 } xls_resource_rich_string_t;
 
 typedef struct _vtiful_xls_object {
-    xls_resource_read_t   read_ptr;
-    xls_resource_write_t  write_ptr;
-    zend_long             write_line;
-    xls_resource_format_t format_ptr;
-    zend_object           zo;
+    xls_resource_read_t          read_ptr;
+    xls_resource_write_t         write_ptr;
+    zend_long                    write_line;
+    xls_resource_format_t        format_ptr;
+    xls_resource_formats_cache_t formats_cache_ptr;
+    lxw_row_col_options          *row_options;
+    zend_object                  zo;
 } xls_object;
 
 typedef struct _vtiful_format_object {
@@ -294,6 +300,15 @@ static inline void php_vtiful_close_resource(zend_object *obj) {
         intern->format_ptr.format = NULL;
     }
 
+    if (intern->formats_cache_ptr.maps != NULL) {
+        zend_hash_destroy(intern->formats_cache_ptr.maps);
+    }
+
+    if (intern->row_options != NULL) {
+        efree(intern->row_options);
+        intern->row_options = NULL;
+    }
+
 #ifdef ENABLE_READER
     if (intern->read_ptr.sheet_t != NULL) {
         xlsxioread_sheet_close(intern->read_ptr.sheet_t);
@@ -340,14 +355,14 @@ void printed_direction(xls_resource_write_t *res, unsigned int direction);
 void xls_file_path(zend_string *file_name, zval *dir_path, zval *file_path);
 void freeze_panes(xls_resource_write_t *res, zend_long row, zend_long column);
 void margins(xls_resource_write_t *res, double left, double right, double top, double bottom);
-void set_row(zend_string *range, double height, xls_resource_write_t *res, lxw_format *format);
+void set_row(zend_string *range, double height, xls_resource_write_t *res, lxw_format *format, lxw_row_col_options *user_options);
 void validation(xls_resource_write_t *res, zend_string *range, lxw_data_validation *validation);
-void set_column(zend_string *range, double width, xls_resource_write_t *res, lxw_format *format);
+void set_column(zend_string *range, double width, xls_resource_write_t *res, lxw_format *format, lxw_row_col_options *user_options);
 void merge_cells(zend_string *range, zval *value, xls_resource_write_t *res, lxw_format *format);
 void comment_writer(zend_string *comment, zend_long row, zend_long columns, xls_resource_write_t *res);
 void call_object_method(zval *object, const char *function_name, uint32_t param_count, zval *params, zval *ret_val);
 void chart_writer(zend_long row, zend_long columns, xls_resource_chart_t *chart_resource, xls_resource_write_t *res);
-void worksheet_set_rows(lxw_row_t start, lxw_row_t end, double height, xls_resource_write_t *res, lxw_format *format);
+void worksheet_set_rows(lxw_row_t start, lxw_row_t end, double height, xls_resource_write_t *res, lxw_format *format, lxw_row_col_options *user_options);
 void image_writer(zval *value, zend_long row, zend_long columns, double width, double height, xls_resource_write_t *res);
 void formula_writer(zend_string *value, zend_long row, zend_long columns, xls_resource_write_t *res, lxw_format *format);
 void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_write_t *res, zend_string *format, lxw_format *format_handle);
@@ -361,4 +376,6 @@ lxw_datetime timestamp_to_datetime(zend_long timestamp);
 zend_string* char_join_to_zend_str(const char *left, const char *right);
 zend_string* str_pick_up(zend_string *left, const char *right, size_t len);
 
+lxw_format* object_format(xls_object *obj, zend_string *format, lxw_format *format_handle);
+
 #endif

kernel/common.c

@@ -88,6 +88,7 @@ void call_object_method(zval *object, const char *function_name, uint32_t param_
 }
 /* }}} */
 
+/* {{{ */
 lxw_datetime timestamp_to_datetime(zend_long timestamp)
 {
     int yearLocal   = php_idate('Y', timestamp, 0);
@@ -102,4 +103,53 @@ lxw_datetime timestamp_to_datetime(zend_long timestamp)
     };
 
     return datetime;
-}
+}
+/* }}} */
+
+/* {{{ */
+lxw_format* object_format(xls_object *obj, zend_string *format, lxw_format *format_handle)
+{
+    if (format == NULL && format_handle == NULL) {
+        return NULL;
+    }
+
+    if (format != NULL && format_handle != NULL) {
+        zend_string *_format_key = strpprintf(0, "%p|%s", format_handle, format->val);
+
+        void *exit_format = zend_hash_str_find_ptr(obj->formats_cache_ptr.maps, ZEND_STRL(_format_key->val));
+
+        if (exit_format != NULL) {
+            zend_string_release(_format_key);
+
+            return (lxw_format *)exit_format;
+        }
+
+        lxw_format *new_format = workbook_add_format((&obj->write_ptr)->workbook);
+        format_copy(new_format, format_handle);
+        format_set_num_format(new_format, ZSTR_VAL(format));
+
+        zend_hash_str_add_ptr(obj->formats_cache_ptr.maps, ZEND_STRL(_format_key->val), new_format);
+
+        zend_string_release(_format_key);
+
+        return new_format;
+    }
+
+    if (format != NULL) {
+        void *exit_format = zend_hash_str_find_ptr(obj->formats_cache_ptr.maps, ZEND_STRL(format->val));
+
+        if (exit_format != NULL) {
+            return (lxw_format *)exit_format;
+        }
+
+        lxw_format *new_format = workbook_add_format((&obj->write_ptr)->workbook);
+        format_set_num_format(new_format, ZSTR_VAL(format));
+
+        zend_hash_str_add_ptr(obj->formats_cache_ptr.maps, ZEND_STRL(format->val), new_format);
+
+        return new_format;
+    }
+
+    return format_handle;
+}
+/* }}} */