commit a27b6de38e3f87bbefeb8fe9fcd24e268dc63675
Author: John McNamara <jmcnamara@cpan.org>
Date:   Sun Jun 8 17:40:59 2014 +0100

    Initial commit

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..c745f6aa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,53 @@
+*.a
+*.o
+*.so
+*.to
+*.lo
+*.la
+*.dylib
+test_*
+!test_*.c
+!test_*.cpp
+!test_*.py
+*.tar.gz
+*~
+TAGS
+.#*
+*#
+~*xlsx
+*.xlsx
+!test/functional/xlsx_files/*.xlsx
+*.pyc
+.cproject
+.project
+.pydevproject
+.settings/
+.DS_Store
+__pycache__
+docs/html
+docs/latex
+.deps
+.dirstamp
+_temp.c
+examples/*
+!examples/*.c
+!examples/Makefile
+
+
+third_party/gtest-1.7.0/Makefile
+third_party/gtest-1.7.0/build-aux/config.h
+third_party/gtest-1.7.0/build-aux/stamp-h1
+third_party/gtest-1.7.0/config.log
+third_party/gtest-1.7.0/config.status
+third_party/gtest-1.7.0/lib/
+third_party/gtest-1.7.0/libtool
+third_party/gtest-1.7.0/scripts/gtest-config
+
+third_party/zlib-1.2.8/configure.log
+third_party/zlib-1.2.8/contrib/minizip/miniunz
+third_party/zlib-1.2.8/contrib/minizip/minizip
+third_party/zlib-1.2.8/example
+third_party/zlib-1.2.8/examplesh
+third_party/zlib-1.2.8/minigzip
+third_party/zlib-1.2.8/minigzipsh
+third_party/zlib-1.2.8/zlib.pc
diff --git a/.indent.pro b/.indent.pro
new file mode 100644
index 00000000..588c79e0
--- /dev/null
+++ b/.indent.pro
@@ -0,0 +1,70 @@
+/*
+ * Indent rules for libxlsxwriter.
+ *
+ * The rules for user defined typedefs can be update as follows:
+ *
+   perl -i -pe 'print and last if /[l]ibxlsxwriter typedefs/' .indent.pro
+   ack -h typedef include src | perl -lne 'print "-T $1" if /\w+\s+\w+\s+(\w+)/' | sort >> .indent.pro
+ *
+ */
+
+/* Command line options used with GNU indent 2.2.10 */
+--braces-on-if-line
+--braces-on-struct-decl-line
+--case-indentation 4
+--continue-at-parentheses
+--declaration-comment-column 0
+--format-first-column-comments
+--honour-newlines
+--ignore-profile
+--indent-label 0
+--indent-level 4
+--no-space-after-function-call-names
+--no-tabs
+--swallow-optional-blank-lines
+
+/* Typedefs used in the code. */
+-T int8_t
+-T int16_t
+-T int32_t
+-T int64_t
+-T uint8_t
+-T uint16_t
+-T uint32_t
+-T uint64_t
+-T ssize_t
+-T size_t
+-T time_t
+
+-T LIST_ENTRY
+-T SLIST_ENTRY
+-T STAILQ_ENTRY
+-T TAILQ_ENTRY
+
+/* libxlsxwriter typedefs. */
+-T lxw_app
+-T lxw_border
+-T lxw_cell
+-T lxw_color_t
+-T lxw_content_types
+-T lxw_core
+-T lxw_datetime
+-T lxw_doc_properties
+-T lxw_fill
+-T lxw_font
+-T lxw_format
+-T lxw_hash_element
+-T lxw_hash_table
+-T lxw_heading_pair
+-T lxw_packager
+-T lxw_part_name
+-T lxw_rel_tuple
+-T lxw_relationships
+-T lxw_row
+-T lxw_sst
+-T lxw_styles
+-T lxw_theme
+-T lxw_tuple
+-T lxw_workbook
+-T lxw_worksheet
+-T lxw_worksheet_init_data
diff --git a/Changes.txt b/Changes.txt
new file mode 100644
index 00000000..93eaea09
--- /dev/null
+++ b/Changes.txt
@@ -0,0 +1,10 @@
+/**
+@page changes Changes
+
+
+## 0.0.1 June 8 2014
+
+- First GitHub release.
+
+
+*/
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..026c4962
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,87 @@
+
+Libxlsxwriter is released under a FreeBSD license:
+
+    Copyright (c) 2013, John McNamara <jmcnamara@cpan.org>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+    of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+
+
+Libxlsxwriter includes `queue.h` from FreeBSD and the `minizip` component of
+`zlib` which have the following licenses:
+
+
+Queue.h from FreeBSD:
+
+    Copyright (c) 1991, 1993
+     The Regents of the University of California.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    4. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+
+Zlib has the following License/Copyright:
+
+    (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+       claim that you wrote the original software. If you use this software
+       in a product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+    2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+    3. This notice may not be removed or altered from any source distribution.
+
+    Jean-loup Gailly        Mark Adler
+    jloup@gzip.org          madler@alumni.caltech.edu
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..63a5095c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,68 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+.PHONY: docs tags examples
+
+# Build the libs.
+all :
+	$(Q)make -C third_party/minizip
+	$(Q)make -C src
+
+# Build the example programs.
+examples:
+	$(Q)make -C examples
+
+# Clean src and test directories.
+clean :
+	$(Q)make clean -C src
+	$(Q)make clean -C test/unit
+	$(Q)make clean -C test/functional/src
+	$(Q)make clean -C examples
+	$(Q)make clean -C third_party/minizip
+	$(Q)rm -rf docs/html
+
+# Run the unit tests.
+test : all test_functional test_unit
+	$(Q)make test -C test/unit
+
+# Run the functional tests.
+test_functional : all
+	$(Q)make -C test/functional/src
+	$(Q)py.test test/functional -v
+
+# Run all tests.
+test_unit : all
+	@echo "Compiling unit tests ..."
+	$(Q)make test -C test/unit
+
+# Test the functional test exes with valgrind.
+test_valgrind : all
+	$(Q)make -C test/functional/src test_valgrind
+	$(Q)make -C examples test_valgrind
+
+# Indent the source files with the .indent.pro settings.
+indent:
+	$(Q)gindent src/*.c include/*.h
+
+tags:
+	$(Q)rm -f TAGS
+	$(Q)etags src/*.c include/*.h include/xlsxwriter/*.h
+
+# Build the doxygen docs.
+docs:
+	$(Q)make -C docs
+
+# Simple minded install.
+install:
+	$(Q)cp -r include/* /usr/include
+	$(Q)cp lib/* /usr/lib
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 00000000..bd2df40e
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,8 @@
+
+
+
+The libxlsxwriter library.
+
+
+Work in Progress. Check back later.
+
diff --git a/dev/release/fix_dox.sh b/dev/release/fix_dox.sh
new file mode 100755
index 00000000..499fa90f
--- /dev/null
+++ b/dev/release/fix_dox.sh
@@ -0,0 +1,9 @@
+#/bin/bash
+
+# Perform some minor clean-ups/fixes to the docs.
+
+perl -i -pe "s/Related&#160;Pages/Contents/" html/*.html
+perl -i -pe "s/Related Pages/Contents/"      html/*.html
+perl -i -pe "s/_page/_8h/"                   html/pages.html
+perl -i ../dev/release/fix_example_docs.pl   html/examples.html
+
diff --git a/dev/release/fix_example_docs.pl b/dev/release/fix_example_docs.pl
new file mode 100644
index 00000000..d8742aad
--- /dev/null
+++ b/dev/release/fix_example_docs.pl
@@ -0,0 +1,75 @@
+#!/usr/bin/perl
+
+#
+# Simple program to arrange the example programs in a user defined order
+# instead or sorted order. Also add a caption.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+use warnings;
+use strict;
+
+# The required example order and descriptions.
+my @examples = (
+    [ 'hello.c',             'A simple hello world example' ],
+    [ 'anatomy.c',           'The anatomy of a libxlsxwriter program' ],
+    [ 'demo.c',              'Demo of some of the libxlsxwriter features' ],
+    [ 'tutorial1.c',         'Tutorial 1 from the documentation' ],
+    [ 'tutorial2.c',         'Tutorial 2 from the documentation' ],
+    [ 'tutorial3.c',         'Tutorial 3 from the documentation' ],
+    [ 'format_font.c',       'Example of writing data with font formatting' ],
+    [ 'format_num_format.c', 'Example of writing data with number formatting' ],
+    [ 'dates_and_times01.c', 'Writing dates and times with numbers' ],
+    [ 'dates_and_times02.c', 'Writing dates and times with datetime' ],
+    [ 'dates_and_times03.c', 'Dates and times with different formats' ],
+    [ 'utf8.c',              'A example of some UTF-8 text' ],
+);
+
+# Convert the array refs to a hash for lookups.
+my %examples;
+for my $example (@examples) {
+    $examples{$example->[0]} = 1;
+}
+
+my $in_list = 0;
+
+while ( my $line = <> ) {
+
+    # Print all lines not in the <ul> list.
+    print $line if !$in_list;
+
+    # Check for <ul> list.
+    if ( $line =~ /<div class="textblock">/ ) {
+        $in_list = 1;
+    }
+
+    # Capture the <li> items of the list.
+    if ( $line =~ /<li><a class="el" href="[^"]+">([^<]+)/ ) {
+        my $example = $1;
+
+        # Warn if there are any new/unkown items.
+        if ( !exists $examples{$example} ) {
+            warn "Unknown example: $example\n";
+        }
+        next;
+    }
+
+    # At the end of the <ul> list print out the <li> items in user defined order.
+    if ( $line =~ m{^</ul>} ) {
+        $in_list = 0;
+
+        for my $aref ( @examples ) {
+            my $example  = $aref->[0];
+            my $filename = $aref->[0];
+            my $desc     = $aref->[1];
+
+            $example =~ s/.c/_8c-example.html/;
+
+            printf qq(<li><a class="el" href="%s">%s</a> %s</li>\n\n),
+              $example, $filename, $desc;
+        }
+        print $line;
+    }
+}
+
+__END__
diff --git a/docs/Doxyfile b/docs/Doxyfile
new file mode 100644
index 00000000..905a67e3
--- /dev/null
+++ b/docs/Doxyfile
@@ -0,0 +1,2349 @@
+# Doxyfile 1.8.7
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = libxlsxwriter
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = NO
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = src/mainpage.dox                  \
+                         src/introduction.dox              \
+                         src/getting_started.dox           \
+                         src/tutorial01.dox                \
+                         src/tutorial02.dox                \
+                         src/tutorial03.dox                \
+                         ../include/xlsxwriter/workbook.h  \
+                         ../include/xlsxwriter/worksheet.h \
+                         ../include/xlsxwriter/format.h    \
+                         ../include/xlsxwriter/utility.h   \
+                         src/working_with_formats.dox      \
+                         src/working_with_colors.dox       \
+                         src/working_with_dates.dox        \
+                         src/working_with_memory.dox       \
+                         src/examples.dox                  \
+                         src/running_the_tests.dox         \
+                         src/faq.dox                       \
+                         src/bugs.dox                      \
+                         src/author.dox                    \
+                         src/license.dox                   \
+                         ../Changes.txt
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = ../examples ..
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = images
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+#CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+#CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = customdoxygen.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 73
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 65
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 71
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = NO
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/docs/DoxygenLayout.xml b/docs/DoxygenLayout.xml
new file mode 100644
index 00000000..f042cc76
--- /dev/null
+++ b/docs/DoxygenLayout.xml
@@ -0,0 +1,177 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.7 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
+    <tab type="files" visible="yes" title="">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro="Example programs using libxlsxwriter:"/>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <detaileddescription title="Description"/>
+    <sourcelink visible="yes"/>
+    <memberdef>
+      <functions title=""/>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <defines title=""/>
+      <enums title=""/>
+      <variables title=""/>
+    </memberdef>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <typedefs title=""/>
+      <variables title=""/>
+      <enums title=""/>
+      <defines title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 00000000..b6b6e938
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,25 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Make everything.
+all : docs
+
+# Clean up.
+clean :
+	$(Q)rm -rf html/*
+
+# Build the doxygen docs.
+docs:
+	$(Q)doxygen
+	$(Q)../dev/release/fix_dox.sh
+
diff --git a/docs/customdoxygen.css b/docs/customdoxygen.css
new file mode 100644
index 00000000..26b1202d
--- /dev/null
+++ b/docs/customdoxygen.css
@@ -0,0 +1,1482 @@
+/* The standard CSS for doxygen 1.8.7 */
+
+body, table, div, p, dl {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 18px;
+    line-height: 1.428571429;
+    color: #333333;
+}
+
+code, pre {
+    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+}
+
+#MSearchBox {
+    width: 220px;
+}
+
+#MSearchBox .right {
+    width:70px;
+}
+
+/* @group Heading Levels */
+
+h1.groupheader {
+    font-size: 10%;
+}
+
+.title {
+    font-size: 150%;
+    font-weight: bold;
+    margin: 10px 2px;
+}
+
+h2.groupheader {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: 500;
+    line-height: 1.1;
+    color: #000000;
+    font-size: 36px;
+    font-weight: normal;
+    width: 100%;
+    margin-top: 50px;
+    margin-bottom: 30px;
+    border-bottom: 5px solid #dedede;
+    padding-bottom: 10px
+    padding-top: 10px;
+}
+
+h3.groupheader {
+    font-size: 100%;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    -webkit-transition: text-shadow 0.5s linear;
+    -moz-transition: text-shadow 0.5s linear;
+    -ms-transition: text-shadow 0.5s linear;
+    -o-transition: text-shadow 0.5s linear;
+    transition: text-shadow 0.5s linear;
+    margin-right: 15px;
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+    text-shadow: 0 0 15px cyan;
+}
+
+dt {
+    font-weight: bold;
+}
+
+div.multicol {
+    -moz-column-gap: 1em;
+    -webkit-column-gap: 1em;
+    -moz-column-count: 3;
+    -webkit-column-count: 3;
+}
+
+p.startli, p.startdd {
+    margin-top: 2px;
+}
+
+p.starttd {
+    margin-top: 0px;
+}
+
+p.endli {
+    margin-bottom: 0px;
+}
+
+p.enddd {
+    margin-bottom: 4px;
+}
+
+p.endtd {
+    margin-bottom: 2px;
+}
+
+/* @end */
+
+caption {
+    font-weight: bold;
+}
+
+span.legend {
+    font-size: 70%;
+    text-align: center;
+}
+
+h3.version {
+    font-size: 90%;
+    text-align: center;
+}
+
+div.qindex, div.navtab{
+    background-color: #F4F5EF;
+    border: 1px solid #CCD3B4;
+    text-align: center;
+}
+
+div.qindex, div.navpath {
+    width: 100%;
+    line-height: 140%;
+}
+
+div.navtab {
+    margin-right: 15px;
+}
+
+/* @group Link Styling */
+
+a {
+    color: #808C53;
+    font-weight: normal;
+    text-decoration: none;
+}
+
+.contents a:visited {
+    color: #919F5E;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+a.qindex {
+    font-weight: bold;
+}
+
+a.qindexHL {
+    font-weight: bold;
+    background-color: #C8CFAE;
+    color: #ffffff;
+    border: 1px double #BBC49C;
+}
+
+.contents a.qindexHL:visited {
+    color: #ffffff;
+}
+
+a.el {
+    font-weight: bold;
+}
+
+a.elRef {
+}
+
+a.code, a.code:visited, a.line, a.line:visited {
+    color: #4665A2; 
+}
+
+a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited {
+    color: #4665A2; 
+}
+
+/* @end */
+
+dl.el {
+    margin-left: -1cm;
+}
+
+pre.fragment {
+    width: 825px;
+    display: block;
+    padding: 9.5px;
+    margin: 0 0 20px;
+    font-size: 13px;
+    line-height: 1.428571429;
+    word-break: break-all;
+    word-wrap: break-word;
+    color: #333333;
+    background-color: #f5f5f5;
+    border: 1px solid #cccccc;
+}
+
+div.fragment {
+    width: 825px;
+    display: block;
+    padding: 9.5px;
+    margin: 0 0 20px;
+    font-size: 14px;
+    line-height: 1.428571429;
+    word-break: break-all;
+    word-wrap: break-word;
+    color: #333333;
+    background-color: #f5f5f5;
+    border: 1px solid #cccccc;
+}
+
+div.line {
+    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+    font-size: 14px;
+    min-height: 14px;
+    line-height: 1.4;
+    text-wrap: unrestricted;
+    white-space: -moz-pre-wrap; /* Moz */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    white-space: pre-wrap;      /* CSS3  */
+    word-wrap: break-word;      /* IE 5.5+ */
+    text-indent: -53px;
+    padding-left: 53px;
+    padding-bottom: 0px;
+    margin: 0px;
+    -webkit-transition-property: background-color, box-shadow;
+    -webkit-transition-duration: 0.5s;
+    -moz-transition-property: background-color, box-shadow;
+    -moz-transition-duration: 0.5s;
+    -ms-transition-property: background-color, box-shadow;
+    -ms-transition-duration: 0.5s;
+    -o-transition-property: background-color, box-shadow;
+    -o-transition-duration: 0.5s;
+    transition-property: background-color, box-shadow;
+    transition-duration: 0.5s;
+}
+
+div.line.glow {
+    background-color: cyan;
+    box-shadow: 0 0 10px cyan;
+}
+
+
+span.lineno {
+    padding-right: 4px;
+    text-align: right;
+    border-right: 2px solid #0F0;
+    background-color: #E8E8E8;
+    white-space: pre;
+}
+span.lineno a {
+    background-color: #D8D8D8;
+}
+
+span.lineno a:hover {
+    background-color: #C8C8C8;
+}
+
+div.ah {
+    background-color: black;
+    font-weight: bold;
+    color: #ffffff;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    padding: 0.2em;
+    border: solid thin #333;
+    border-radius: 0.5em;
+    -webkit-border-radius: .5em;
+    -moz-border-radius: .5em;
+    box-shadow: 2px 2px 3px #999;
+    -webkit-box-shadow: 2px 2px 3px #999;
+    -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
+    background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
+}
+
+div.groupHeader {
+    margin-left: 16px;
+    margin-top: 12px;
+    font-weight: bold;
+}
+
+div.groupText {
+    margin-left: 16px;
+    font-style: italic;
+}
+
+body {
+    background-color: white;
+    color: black;
+    margin-top: 15px;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 40px;
+}
+
+div.contents {
+    margin-top: 10px;
+    margin-left: 12px;
+    margin-right: 8px;
+}
+
+td.indexkey {
+    background-color: #F4F5EF;
+    font-weight: bold;
+    border: 1px solid #DFE3D0;
+    margin: 2px 0px 2px 0;
+    padding: 2px 10px;
+    white-space: nowrap;
+    vertical-align: top;
+}
+
+td.indexvalue {
+    background-color: #F4F5EF;
+    border: 1px solid #DFE3D0;
+    padding: 2px 10px;
+    margin: 2px 0px;
+}
+
+tr.memlist {
+    background-color: #F5F6F1;
+}
+
+p.formulaDsp {
+    text-align: center;
+}
+
+img.formulaDsp {
+    
+}
+
+img.formulaInl {
+    vertical-align: middle;
+}
+
+div.center {
+    text-align: center;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    padding: 0px;
+}
+
+div.center img {
+    border: 0px;
+}
+
+address.footer {
+    text-align: right;
+    padding-right: 12px;
+}
+
+img.footer {
+    border: 0px;
+    vertical-align: middle;
+}
+
+/* @group Code Colorization */
+
+span.keyword {
+    color: #008000
+}
+
+span.keywordtype {
+    color: #604020
+}
+
+span.keywordflow {
+    color: #000000
+}
+
+span.comment {
+    color: #65B154
+}
+
+span.preprocessor {
+    color: #806020
+}
+
+span.stringliteral {
+    color: #002080
+}
+
+span.charliteral {
+    color: #008080
+}
+
+span.vhdldigit { 
+    color: #ff00ff 
+}
+
+span.vhdlchar { 
+    color: #000000 
+}
+
+span.vhdlkeyword { 
+    color: #700070 
+}
+
+span.vhdllogic { 
+    color: #ff0000 
+}
+
+blockquote {
+    background-color: #FAFBF8;
+    border-left: 2px solid #C8CFAE;
+    margin: 0 24px 0 30px;
+    padding: 0 12px 0 16px;
+    font-style: italic;
+}
+
+/* @end */
+
+/*
+.search {
+    color: #003399;
+    font-weight: bold;
+}
+
+form.search {
+    margin-bottom: 0px;
+    margin-top: 0px;
+}
+
+input.search {
+    font-size: 75%;
+    color: #000080;
+    font-weight: normal;
+    background-color: #e8eef2;
+}
+*/
+
+td.tiny {
+    font-size: 75%;
+}
+
+.dirtab {
+    padding: 4px;
+    border-collapse: collapse;
+    border: 1px solid #CCD3B4;
+}
+
+th.dirtab {
+    background: #F4F5EF;
+    font-weight: bold;
+}
+
+hr {
+    height: 0px;
+    border: none;
+    border-top: 1px solid #96A465;
+}
+
+hr.footer {
+    height: 1px;
+}
+
+/* @group Member Descriptions */
+
+table.memberdecls {
+    border-spacing: 0px;
+    padding: 0px;
+}
+
+.memberdecls td, .fieldtable tr {
+    -webkit-transition-property: background-color, box-shadow;
+    -webkit-transition-duration: 0.5s;
+    -moz-transition-property: background-color, box-shadow;
+    -moz-transition-duration: 0.5s;
+    -ms-transition-property: background-color, box-shadow;
+    -ms-transition-duration: 0.5s;
+    -o-transition-property: background-color, box-shadow;
+    -o-transition-duration: 0.5s;
+    transition-property: background-color, box-shadow;
+    transition-duration: 0.5s;
+}
+
+.memberdecls td.glow, .fieldtable tr.glow {
+    background-color: cyan;
+    box-shadow: 0 0 15px cyan;
+}
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+    background-color: #FBFCFA;
+    border: none;
+    margin: 4px;
+    padding: 1px 0 0 8px;
+}
+
+.mdescLeft, .mdescRight {
+    padding: 0px 8px 4px 8px;
+    color: #555;
+}
+
+.memSeparator {
+    border-bottom: 1px solid #DEE4F0;
+    line-height: 1px;
+    margin: 0px;
+    padding: 0px;
+}
+
+.memItemLeft, .memTemplItemLeft {
+    white-space: nowrap;
+}
+
+.memItemRight {
+    width: 100%;
+}
+
+.memTemplParams {
+    color: #919F5E;
+    white-space: nowrap;
+    font-size: 80%;
+}
+
+/* @end */
+
+/* @group Member Details */
+
+/* Styles for detailed member documentation */
+
+.memtemplate {
+    font-size: 80%;
+    color: #919F5E;
+    font-weight: normal;
+    margin-left: 9px;
+}
+
+.memnav {
+    background-color: #F4F5EF;
+    border: 1px solid #CCD3B4;
+    text-align: center;
+    margin: 2px;
+    margin-right: 15px;
+    padding: 2px;
+}
+
+.mempage {
+    width: 100%;
+}
+
+.memitem {
+    padding: 0;
+    margin-bottom: 10px;
+    margin-right: 5px;
+    -webkit-transition: box-shadow 0.5s linear;
+    -moz-transition: box-shadow 0.5s linear;
+    -ms-transition: box-shadow 0.5s linear;
+    -o-transition: box-shadow 0.5s linear;
+    transition: box-shadow 0.5s linear;
+    display: table !important;
+    width: 100%;
+}
+
+.memitem.glow {
+     box-shadow: 0 0 15px cyan;
+}
+
+.memname {
+    font-weight: bold;
+    margin-left: 6px;
+}
+
+.memname td {
+    vertical-align: bottom;
+}
+
+.memproto, dl.reflist dt {
+    margin-top: 10px;
+    border-top: 1px solid #CFD5B8;
+    border-left: 1px solid #CFD5B8;
+    border-right: 1px solid #CFD5B8;
+    padding: 6px 0px 6px 0px;
+    color: #525A35;
+    font-weight: bold;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+    background-image:url('nav_f.png');
+    background-repeat:repeat-x;
+    background-color: #EFF1E8;
+    /* opera specific markup */
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    border-top-right-radius: 4px;
+    border-top-left-radius: 4px;
+    /* firefox specific markup */
+    -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+    -moz-border-radius-topright: 4px;
+    -moz-border-radius-topleft: 4px;
+    /* webkit specific markup */
+    -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    -webkit-border-top-right-radius: 4px;
+    -webkit-border-top-left-radius: 4px;
+
+}
+
+.memdoc, dl.reflist dd {
+    border-bottom: 1px solid #CFD5B8;      
+    border-left: 1px solid #CFD5B8;      
+    border-right: 1px solid #CFD5B8; 
+    padding: 6px 10px 2px 50px;
+    background-color: #FDFDFC;
+    border-top-width: 0;
+    background-image:url('nav_g.png');
+    background-repeat:repeat-x;
+    background-color: #FFFFFF;
+    /* opera specific markup */
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+    /* firefox specific markup */
+    -moz-border-radius-bottomleft: 4px;
+    -moz-border-radius-bottomright: 4px;
+    -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+    /* webkit specific markup */
+    -webkit-border-bottom-left-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+    -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+dl.reflist dt {
+    padding: 5px;
+}
+
+dl.reflist dd {
+    margin: 0px 0px 10px 0px;
+    padding: 5px;
+}
+
+.paramkey {
+    text-align: right;
+}
+
+.paramtype {
+    white-space: nowrap;
+}
+
+.paramname {
+    color: #602020;
+    white-space: nowrap;
+}
+.paramname em {
+    font-style: normal;
+}
+.paramname code {
+    line-height: 14px;
+}
+
+.params, .retval, .exception, .tparams {
+    margin-left: 0px;
+    padding-left: 0px;
+}       
+
+.params .paramname, .retval .paramname {
+    font-weight: bold;
+    vertical-align: top;
+}
+    
+.params .paramtype {
+    font-style: italic;
+    vertical-align: top;
+}       
+    
+.params .paramdir {
+    font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+    vertical-align: top;
+}
+
+table.mlabels {
+    border-spacing: 0px;
+}
+
+td.mlabels-left {
+    width: 100%;
+    padding: 0px;
+}
+
+td.mlabels-right {
+    vertical-align: bottom;
+    padding: 0px;
+    white-space: nowrap;
+}
+
+span.mlabels {
+    margin-left: 8px;
+}
+
+span.mlabel {
+    background-color: #B0BA8B;
+    border-top:1px solid #9EAA71;
+    border-left:1px solid #9EAA71;
+    border-right:1px solid #DFE3D0;
+    border-bottom:1px solid #DFE3D0;
+    text-shadow: none;
+    color: white;
+    margin-right: 4px;
+    padding: 2px 3px;
+    border-radius: 3px;
+    font-size: 7pt;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+
+
+
+/* @end */
+
+/* these are for tree view inside a (index) page */
+
+div.directory {
+    margin: 10px 0px;
+    border-top: 1px solid #C8CFAE;
+    border-bottom: 1px solid #C8CFAE;
+    width: 100%;
+}
+
+.directory table {
+    border-collapse:collapse;
+}
+
+.directory td {
+    margin: 0px;
+    padding: 0px;
+    vertical-align: top;
+}
+
+.directory td.entry {
+    white-space: nowrap;
+    padding-right: 6px;
+    padding-top: 3px;
+}
+
+.directory td.entry a {
+    outline:none;
+}
+
+.directory td.entry a img {
+    border: none;
+}
+
+.directory td.desc {
+    width: 100%;
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-top: 3px;
+    border-left: 1px solid rgba(0,0,0,0.05);
+}
+
+.directory tr.even {
+    padding-left: 6px;
+    background-color: #FAFBF8;
+}
+
+.directory img {
+    vertical-align: -30%;
+}
+
+.directory .levels {
+    white-space: nowrap;
+    width: 100%;
+    text-align: right;
+    font-size: 9pt;
+}
+
+.directory .levels span {
+    cursor: pointer;
+    padding-left: 2px;
+    padding-right: 2px;
+    color: #808C53;
+}
+
+.arrow {
+    color: #C8CFAE;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    cursor: pointer;
+    font-size: 80%;
+    display: inline-block;
+    width: 16px;
+    height: 22px;
+}
+
+.icon {
+    font-family: Arial, Helvetica;
+    font-weight: bold;
+    font-size: 12px;
+    height: 14px;
+    width: 16px;
+    display: inline-block;
+    background-color: #B0BA8B;
+    color: white;
+    text-align: center;
+    border-radius: 4px;
+    margin-left: 2px;
+    margin-right: 2px;
+}
+
+.icona {
+    width: 24px;
+    height: 22px;
+    display: inline-block;
+}
+
+.iconfopen {
+    width: 24px;
+    height: 18px;
+    margin-bottom: 4px;
+    background-image:url('ftv2folderopen.png');
+    background-position: 0px -4px;
+    background-repeat: repeat-y;
+    vertical-align:top;
+    display: inline-block;
+}
+
+.iconfclosed {
+    width: 24px;
+    height: 18px;
+    margin-bottom: 4px;
+    background-image:url('ftv2folderclosed.png');
+    background-position: 0px -4px;
+    background-repeat: repeat-y;
+    vertical-align:top;
+    display: inline-block;
+}
+
+.icondoc {
+    width: 24px;
+    height: 18px;
+    margin-bottom: 4px;
+    background-image:url('ftv2doc.png');
+    background-position: 0px -4px;
+    background-repeat: repeat-y;
+    vertical-align:top;
+    display: inline-block;
+}
+
+table.directory {
+    font: 400 14px Roboto,sans-serif;
+}
+
+/* @end */
+
+div.dynheader {
+    margin-top: 8px;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+address {
+    font-style: normal;
+    color: #5D663C;
+}
+
+table.doxtable {
+    border-collapse:collapse;
+    margin-top: 4px;
+    margin-bottom: 4px;
+    margin-left: 50px;
+
+}
+
+table.doxtable td, table.doxtable th {
+    border: 1px solid #DDDDDD;
+    padding: 3px 7px 2px;
+}
+
+table.doxtable th {
+    background-color: #f2f2f2;
+    color: #000000;
+    /* font-size: 110%; */
+    padding-bottom: 4px;
+    padding-top: 5px;
+}
+
+table.fieldtable {
+    /*width: 100%;*/
+    margin-bottom: 10px;
+    border: 1px solid #CFD5B8;
+    border-spacing: 0px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+    -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+}
+
+.fieldtable td, .fieldtable th {
+    padding: 3px 7px 2px;
+}
+
+.fieldtable td.fieldtype, .fieldtable td.fieldname {
+    white-space: nowrap;
+    border-right: 1px solid #CFD5B8;
+    border-bottom: 1px solid #CFD5B8;
+    vertical-align: top;
+}
+
+.fieldtable td.fieldname {
+    padding-top: 3px;
+}
+
+.fieldtable td.fielddoc {
+    border-bottom: 1px solid #CFD5B8;
+    /*width: 100%;*/
+}
+
+.fieldtable td.fielddoc p:first-child {
+    margin-top: 0px;
+}       
+    
+.fieldtable td.fielddoc p:last-child {
+    margin-bottom: 2px;
+}
+
+.fieldtable tr:last-child td {
+    border-bottom: none;
+}
+
+.fieldtable th {
+    background-image:url('nav_f.png');
+    background-repeat:repeat-x;
+    background-color: #EFF1E8;
+    font-size: 90%;
+    color: #525A35;
+    padding-bottom: 4px;
+    padding-top: 5px;
+    text-align:left;
+    -moz-border-radius-topleft: 4px;
+    -moz-border-radius-topright: 4px;
+    -webkit-border-top-left-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom: 1px solid #CFD5B8;
+}
+
+
+.tabsearch {
+    top: 0px;
+    left: 10px;
+    height: 36px;
+    background-image: url('tab_b.png');
+    z-index: 101;
+    overflow: hidden;
+    font-size: 13px;
+}
+
+.navpath ul
+{
+    font-size: 11px;
+    background-image:url('tab_b.png');
+    background-repeat:repeat-x;
+    background-position: 0 -5px;
+    height:30px;
+    line-height:30px;
+    color:#BEC69F;
+    border:solid 1px #DDE2CE;
+    overflow:hidden;
+    margin:0px;
+    padding:0px;
+}
+
+.navpath li
+{
+    list-style-type:none;
+    float:left;
+    padding-left:10px;
+    padding-right:15px;
+    background-image:url('bc_s.png');
+    background-repeat:no-repeat;
+    background-position:right;
+    color:#737E4B;
+}
+
+.navpath li.navelem a
+{
+    height:32px;
+    display:block;
+    text-decoration: none;
+    outline: none;
+    color: #59613A;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+    text-decoration: none;    
+}
+
+.navpath li.navelem a:hover
+{
+    color:#AAB583;
+}
+
+.navpath li.footer
+{
+    list-style-type:none;
+    float:right;
+    padding-left:10px;
+    padding-right:15px;
+    background-image:none;
+    background-repeat:no-repeat;
+    background-position:right;
+    color:#737E4B;
+    font-size: 8pt;
+}
+
+
+div.summary
+{
+    float: right;
+    font-size: 8pt;
+    padding-right: 5px;
+    width: 50%;
+    text-align: right;
+}       
+
+div.summary a
+{
+    white-space: nowrap;
+}
+
+div.ingroups
+{
+    font-size: 8pt;
+    width: 50%;
+    text-align: left;
+}
+
+div.ingroups a
+{
+    white-space: nowrap;
+}
+
+div.header
+{
+    background-image:url('nav_h.png');
+    background-repeat:repeat-x;
+    background-color: #FBFCFA;
+    margin:  0px;
+    border-bottom: 5px solid #dedede;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 36px;
+    font-weight: 500;
+    line-height: 1.1;
+    margin-bottom: 30px;
+    padding-bottom: 10px
+    padding-top: 10px;
+    color: #000000;
+}
+
+
+
+div.headertitle
+{
+    padding: 5px 5px 5px 10px;
+}
+
+dl
+{
+    padding: 0 0 0 10px;
+}
+
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
+{
+    margin-left: 0px;
+    padding-left: 0px;
+}
+
+dl.note
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left: 0px;
+}
+
+dl.warning, dl.attention
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #FF0000;
+}
+
+dl.pre, dl.post, dl.invariant
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #00D000;
+}
+
+dl.deprecated
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #505050;
+}
+
+dl.todo
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #00C0E0;
+}
+
+dl.test
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #3030E0;
+}
+
+dl.bug
+{
+    margin-left:-7px;
+    padding-left: 3px;
+    border-left:4px solid;
+    border-color: #C08050;
+}
+
+dl.section dd {
+    margin-bottom: 6px;
+}
+
+
+#projectlogo
+{
+    text-align: center;
+    vertical-align: bottom;
+    border-collapse: separate;
+}
+ 
+#projectlogo img
+{ 
+    border: 0px none;
+}
+ 
+#projectname
+{
+    font: 300% Tahoma, Arial,sans-serif;
+    padding-bottom: 24px;
+}
+    
+#projectbrief
+{
+    font: 120% Tahoma, Arial,sans-serif;
+    margin: 0px;
+    padding: 0px;
+}
+
+#projectnumber
+{
+    font: 50% Tahoma, Arial,sans-serif;
+    margin: 0px;
+    padding: 0px;
+}
+
+#titlearea
+{
+    padding: 0px;
+    margin: 0px;
+    width: 100%;
+    border-bottom: 1px solid #9EAA71;
+}
+
+.image
+{
+    text-align: left;
+    margin-left: 20px;
+}
+
+.dotgraph
+{
+    text-align: center;
+}
+
+.mscgraph
+{
+    text-align: center;
+}
+
+.diagraph
+{
+    text-align: center;
+}
+
+.caption
+{
+    font-weight: bold;
+}
+
+div.zoom
+{
+    border: 1px solid #C1C9A4;
+}
+
+dl.citelist {
+    margin-bottom:50px;
+}
+
+dl.citelist dt {
+    color:#6D7747;
+    float:left;
+    font-weight:bold;
+    margin-right:10px;
+    padding:5px;
+}
+
+dl.citelist dd {
+    margin:2px 0;
+    padding:5px 0;
+}
+
+div.toc {
+    padding: 14px 25px;
+    background-color: #F9FAF6;
+    border: 1px solid #E9ECE0;
+    border-radius: 7px 7px 7px 7px;
+    float: right;
+    height: auto;
+    margin: 0 20px 10px 10px;
+    width: 200px;
+}
+
+div.toc li {
+    background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+    font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+    margin-top: 5px;
+    padding-left: 10px;
+    padding-top: 2px;
+}
+
+div.toc h3 {
+    font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+    color: #919F5E;
+    border-bottom: 0 none;
+    margin: 0;
+}
+
+div.toc ul {
+    list-style: none outside none;
+    border: medium none;
+    padding: 0px;
+}       
+
+div.toc li.level1 {
+    margin-left: 0px;
+}
+
+div.toc li.level2 {
+    margin-left: 15px;
+}
+
+div.toc li.level3 {
+    margin-left: 30px;
+}
+
+div.toc li.level4 {
+    margin-left: 45px;
+}
+
+.inherit_header {
+    font-weight: bold;
+    color: gray;
+    cursor: pointer;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.inherit_header td {
+    padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+    display: none;
+}
+
+tr.heading h2 {
+    margin-top: 12px;
+    margin-bottom: 4px;
+}
+
+/* tooltip related style info */
+
+.ttc {
+    position: absolute;
+    display: none;
+}
+
+#powerTip {
+    cursor: default;
+    white-space: nowrap;
+    background-color: white;
+    border: 1px solid gray;
+    border-radius: 4px 4px 4px 4px;
+    box-shadow: 1px 1px 7px gray;
+    display: none;
+    font-size: smaller;
+    max-width: 80%;
+    opacity: 0.9;
+    padding: 1ex 1em 1em;
+    position: absolute;
+    z-index: 2147483647;
+}
+
+#powerTip div.ttdoc {
+    color: grey;
+    font-style: italic;
+}
+
+#powerTip div.ttname a {
+    font-weight: bold;
+}
+
+#powerTip div.ttname {
+    font-weight: bold;
+}
+
+#powerTip div.ttdeci {
+    color: #006318;
+}
+
+#powerTip div {
+    margin: 0px;
+    padding: 0px;
+    font: 12px/16px Roboto,sans-serif;
+}
+
+#powerTip:before, #powerTip:after {
+    content: "";
+    position: absolute;
+    margin: 0px;
+}
+
+#powerTip.n:after,  #powerTip.n:before,
+#powerTip.s:after,  #powerTip.s:before,
+#powerTip.w:after,  #powerTip.w:before,
+#powerTip.e:after,  #powerTip.e:before,
+#powerTip.ne:after, #powerTip.ne:before,
+#powerTip.se:after, #powerTip.se:before,
+#powerTip.nw:after, #powerTip.nw:before,
+#powerTip.sw:after, #powerTip.sw:before {
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+}
+
+#powerTip.n:after,  #powerTip.s:after,
+#powerTip.w:after,  #powerTip.e:after,
+#powerTip.nw:after, #powerTip.ne:after,
+#powerTip.sw:after, #powerTip.se:after {
+    border-color: rgba(255, 255, 255, 0);
+}
+
+#powerTip.n:before,  #powerTip.s:before,
+#powerTip.w:before,  #powerTip.e:before,
+#powerTip.nw:before, #powerTip.ne:before,
+#powerTip.sw:before, #powerTip.se:before {
+    border-color: rgba(128, 128, 128, 0);
+}
+
+#powerTip.n:after,  #powerTip.n:before,
+#powerTip.ne:after, #powerTip.ne:before,
+#powerTip.nw:after, #powerTip.nw:before {
+    top: 100%;
+}
+
+#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
+    border-top-color: #ffffff;
+    border-width: 10px;
+    margin: 0px -10px;
+}
+#powerTip.n:before {
+    border-top-color: #808080;
+    border-width: 11px;
+    margin: 0px -11px;
+}
+#powerTip.n:after, #powerTip.n:before {
+    left: 50%;
+}
+
+#powerTip.nw:after, #powerTip.nw:before {
+    right: 14px;
+}
+
+#powerTip.ne:after, #powerTip.ne:before {
+    left: 14px;
+}
+
+#powerTip.s:after,  #powerTip.s:before,
+#powerTip.se:after, #powerTip.se:before,
+#powerTip.sw:after, #powerTip.sw:before {
+    bottom: 100%;
+}
+
+#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
+    border-bottom-color: #ffffff;
+    border-width: 10px;
+    margin: 0px -10px;
+}
+
+#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
+    border-bottom-color: #808080;
+    border-width: 11px;
+    margin: 0px -11px;
+}
+
+#powerTip.s:after, #powerTip.s:before {
+    left: 50%;
+}
+
+#powerTip.sw:after, #powerTip.sw:before {
+    right: 14px;
+}
+
+#powerTip.se:after, #powerTip.se:before {
+    left: 14px;
+}
+
+#powerTip.e:after, #powerTip.e:before {
+    left: 100%;
+}
+#powerTip.e:after {
+    border-left-color: #ffffff;
+    border-width: 10px;
+    top: 50%;
+    margin-top: -10px;
+}
+#powerTip.e:before {
+    border-left-color: #808080;
+    border-width: 11px;
+    top: 50%;
+    margin-top: -11px;
+}
+
+#powerTip.w:after, #powerTip.w:before {
+    right: 100%;
+}
+#powerTip.w:after {
+    border-right-color: #ffffff;
+    border-width: 10px;
+    top: 50%;
+    margin-top: -10px;
+}
+#powerTip.w:before {
+    border-right-color: #808080;
+    border-width: 11px;
+    top: 50%;
+    margin-top: -11px;
+}
+
+@media print
+{
+  #top { display: none; }
+  #side-nav { display: none; }
+  #nav-path { display: none; }
+  body { overflow:visible; }
+  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
+  .summary { display: none; }
+  .memitem { page-break-inside: avoid; }
+  #doc-content
+  {
+    margin-left:0 !important;
+    height:auto !important;
+    width:auto !important;
+    overflow:inherit;
+    display:inline;
+  }
+}
+
diff --git a/docs/images/anatomy.png b/docs/images/anatomy.png
new file mode 100644
index 00000000..e3361671
Binary files /dev/null and b/docs/images/anatomy.png differ
diff --git a/docs/images/date_example01.png b/docs/images/date_example01.png
new file mode 100644
index 00000000..fc24d777
Binary files /dev/null and b/docs/images/date_example01.png differ
diff --git a/docs/images/date_example02.png b/docs/images/date_example02.png
new file mode 100644
index 00000000..8346ec17
Binary files /dev/null and b/docs/images/date_example02.png differ
diff --git a/docs/images/date_example03.png b/docs/images/date_example03.png
new file mode 100644
index 00000000..5a5939bc
Binary files /dev/null and b/docs/images/date_example03.png differ
diff --git a/docs/images/demo.png b/docs/images/demo.png
new file mode 100644
index 00000000..5975c9f6
Binary files /dev/null and b/docs/images/demo.png differ
diff --git a/docs/images/format_font.png b/docs/images/format_font.png
new file mode 100644
index 00000000..0dd9b947
Binary files /dev/null and b/docs/images/format_font.png differ
diff --git a/docs/images/format_set_font_name.png b/docs/images/format_set_font_name.png
new file mode 100644
index 00000000..e1043db5
Binary files /dev/null and b/docs/images/format_set_font_name.png differ
diff --git a/docs/images/format_set_num_format.png b/docs/images/format_set_num_format.png
new file mode 100644
index 00000000..6831253d
Binary files /dev/null and b/docs/images/format_set_num_format.png differ
diff --git a/docs/images/formats_intro.png b/docs/images/formats_intro.png
new file mode 100644
index 00000000..916c5388
Binary files /dev/null and b/docs/images/formats_intro.png differ
diff --git a/docs/images/formats_set_bg_color.png b/docs/images/formats_set_bg_color.png
new file mode 100644
index 00000000..fd8e14af
Binary files /dev/null and b/docs/images/formats_set_bg_color.png differ
diff --git a/docs/images/hello01.png b/docs/images/hello01.png
new file mode 100644
index 00000000..93c3ed13
Binary files /dev/null and b/docs/images/hello01.png differ
diff --git a/docs/images/logo.png b/docs/images/logo.png
new file mode 100644
index 00000000..8428d76c
Binary files /dev/null and b/docs/images/logo.png differ
diff --git a/docs/images/text_indent.png b/docs/images/text_indent.png
new file mode 100644
index 00000000..335dc9a2
Binary files /dev/null and b/docs/images/text_indent.png differ
diff --git a/docs/images/tutorial01.png b/docs/images/tutorial01.png
new file mode 100644
index 00000000..bff5b6be
Binary files /dev/null and b/docs/images/tutorial01.png differ
diff --git a/docs/images/tutorial02.png b/docs/images/tutorial02.png
new file mode 100644
index 00000000..c12380f2
Binary files /dev/null and b/docs/images/tutorial02.png differ
diff --git a/docs/images/tutorial03.png b/docs/images/tutorial03.png
new file mode 100644
index 00000000..031367ab
Binary files /dev/null and b/docs/images/tutorial03.png differ
diff --git a/docs/images/utf8.png b/docs/images/utf8.png
new file mode 100644
index 00000000..2e3022b2
Binary files /dev/null and b/docs/images/utf8.png differ
diff --git a/docs/images/workbook01.png b/docs/images/workbook01.png
new file mode 100644
index 00000000..c0a2be89
Binary files /dev/null and b/docs/images/workbook01.png differ
diff --git a/docs/images/workbook02.png b/docs/images/workbook02.png
new file mode 100644
index 00000000..2c87fa7a
Binary files /dev/null and b/docs/images/workbook02.png differ
diff --git a/docs/images/worksheet02.png b/docs/images/worksheet02.png
new file mode 100644
index 00000000..a00ea716
Binary files /dev/null and b/docs/images/worksheet02.png differ
diff --git a/docs/images/write_formula01.png b/docs/images/write_formula01.png
new file mode 100644
index 00000000..e5bd7755
Binary files /dev/null and b/docs/images/write_formula01.png differ
diff --git a/docs/images/write_number01.png b/docs/images/write_number01.png
new file mode 100644
index 00000000..9c311d06
Binary files /dev/null and b/docs/images/write_number01.png differ
diff --git a/docs/images/write_number02.png b/docs/images/write_number02.png
new file mode 100644
index 00000000..c328bab3
Binary files /dev/null and b/docs/images/write_number02.png differ
diff --git a/docs/images/write_string01.png b/docs/images/write_string01.png
new file mode 100644
index 00000000..14ac9262
Binary files /dev/null and b/docs/images/write_string01.png differ
diff --git a/docs/images/write_string02.png b/docs/images/write_string02.png
new file mode 100644
index 00000000..c788f61e
Binary files /dev/null and b/docs/images/write_string02.png differ
diff --git a/docs/images/write_string03.png b/docs/images/write_string03.png
new file mode 100644
index 00000000..da27c07c
Binary files /dev/null and b/docs/images/write_string03.png differ
diff --git a/docs/src/author.dox b/docs/src/author.dox
new file mode 100644
index 00000000..a90f8dbc
--- /dev/null
+++ b/docs/src/author.dox
@@ -0,0 +1,19 @@
+/**
+@page author Author
+
+Libxlsxwriter was written by John McNamara.
+
+- [GitHub](https://github.com/jmcnamara)
+- [Twitter \@jmcnamara13](https://twitter.com/jmcnamara13)
+
+
+Donations
+---------
+
+If you would like to donate to the libxlsxwriter project to keep it active
+you can do so via
+[PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ATE9EFWNF7PBJ).
+
+Next: @ref license
+
+*/
diff --git a/docs/src/bugs.dox b/docs/src/bugs.dox
new file mode 100644
index 00000000..befc1977
--- /dev/null
+++ b/docs/src/bugs.dox
@@ -0,0 +1,141 @@
+/**
+
+@page bugs Known Issues and Bugs
+
+
+This section lists known issues and bugs and gives some information on
+how to submit bug reports.
+
+## Content is Unreadable. Open and Repair
+
+Very, very occasionally you may encounter a bug which generates an Excel
+warning when opening an `libxlsxwriter` file like:
+
+> Excel could not open file.xlsx because some content is unreadable. Do
+> you want to open and repair this workbook.
+
+This ominous sounding message is Excel's standard warning for any validation
+error in the XML used for the components of the XLSX file.
+
+If you encounter an issue like this you should open an issue on GitHub with a
+program to replicate the issue (see below) or send one of the failing output
+files to the @ref author.
+
+## Formulas displayed as `NAME?` until edited
+
+Excel 2010 and 2013 added functions which weren't defined in the original file
+specification. These functions are referred to as *future* functions. Examples
+of these functions are `ACOT`, `CHISQ.DIST.RT` , `CONFIDENCE.NORM`, `STDEV.P`,
+`STDEV.S` and `WORKDAY.INTL`. The full list is given in the [MS XLSX
+extensions documentation on future
+functions](http://msdn.microsoft.com/en-us/library/dd907480%28v=office.12%29.aspx).
+
+When written using `write_formula()` these functions need to be fully
+qualified with the `_xlfn.` prefix as they are shown in the MS XLSX
+documentation link above. For example:
+
+    worksheet_write_formula(worksheet, 0, 0,"=_xlfn.STDEV.S(B1:B10)", NULL);
+
+
+## Formula results displaying as zero in non-Excel applications
+
+
+Due to wide range of possible formulas and inter-dependencies between them,
+`xlsxwriter` doesn't, and realistically cannot, calculate the result of a
+formula when it is written to an XLSX file. Instead, it stores the value 0 as
+the formula result. It then sets a global flag in the XLSX file to say that
+all formulas and functions should be recalculated when the file is opened.
+
+This is the method recommended in the Excel documentation and in general it
+works fine with spreadsheet applications. However, applications that don't
+have a facility to calculate formulas, such as Excel Viewer, or several mobile
+applications, will only display the 0 results.
+
+If required, it is also possible to specify the calculated result of the
+formula using the worksheet_write_formula_num() function.
+
+
+# Reporting Bugs
+
+
+Here are some tips on reporting bugs in `libxlsxwriter`.
+
+## Upgrade to the latest version of the library
+
+The bug you are reporting may already be fixed in the latest version of
+the module.
+
+Check the @ref changes section to see what has changed in the latest
+versions.
+
+You can check which version of `libxlsxwriter` that you are using by compiling
+and running the following program:
+
+@code
+#include <stdio.h>
+#include "xlsxwriter.h"
+
+int main() {
+
+    printf("Libxlsxwriter version = %s\n", LXW_VERSION);
+
+    return 0;
+}
+@endcode
+
+
+## Read the documentation
+
+Read or search the `libxlsxwriter` documentation to see if the issue you are
+encountering is already explained.
+
+
+## Look at the example programs
+
+There are many @ref examples in the distribution. Try to identify an example
+program that corresponds to your query and adapt it to use as a bug report.
+
+## Use the xlsxwriter Issue tracker
+
+The [libxlsxwriter issue
+tracker](https://github.com/jmcnamara/libxlsxwriter/issues) is on GitHub.
+
+
+## Tips for submitting a bug report
+
+1.  Describe the problem as clearly and as concisely as possible.
+2.  Include a sample program. This is probably the most important step.
+    It is generally easier to describe a problem in code than in written
+    prose.
+3.  The sample program should be as small as possible to demonstrate the
+    problem. Don't copy and paste large non-relevant sections of your
+    program.
+
+A sample bug report is shown below. This format helps analyse and respond to
+the bug report more quickly.
+
+    Issue with SOMETHING
+
+    I am using libxlsxwriter to do SOMETHING but it appears to do SOMETHING ELSE.
+
+    I am using CC version X.Y.Z, OS = uname and libxlsxwriter x.y.z.
+
+    Here is some code that demonstrates the problem:
+
+    #include "xlsxwriter.h"
+
+    int main() {
+
+        lxw_workbook  *workbook  = new_workbook("bug_report.xlsx");
+        lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+        worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
+        worksheet_write_number(worksheet, 1, 0, 123, NULL);
+
+        return workbook_close(workbook);
+    }
+
+
+Next: @ref author "The library author"
+
+*/
diff --git a/docs/src/cworkbook.dox b/docs/src/cworkbook.dox
new file mode 100644
index 00000000..21f94b34
--- /dev/null
+++ b/docs/src/cworkbook.dox
@@ -0,0 +1,495 @@
+/**
+ * .. _workbook:
+ *
+ * The Workbook Class
+ * ==================
+ *
+ * The Workbook class is the main class exposed by the xlsxwriter module and it is
+ * the only class that you will need to instantiate directly.
+ *
+ * The Workbook class represents the entire spreadsheet as you see it in Excel and
+ * internally it represents the Excel file as it is written on disk.
+ *
+ * Constructor
+ */
+
+ *
+/**
+ * @brief Create a new xlsxwriter Workbook object.
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param filename The name of the new Excel file to create.
+ * @param options  Optional workbook parameters. See below.
+ *    :rtype:          A Workbook object.
+ *
+ *
+ * The ``Workbook:new()`` constructor is used to create a new Excel workbook with a
+ * given filename:
+ *
+ * @code
+ *     import xlsxwriter
+ *
+ *     workbook  = xlsxwriter.Workbook('filename.xlsx');
+ *     worksheet = workbook:add_worksheet();
+ *
+ *     worksheet:write(0, 0, 'Hello Excel');
+ *
+ * @endcode
+ *
+ * @image html workbook01.png
+ *
+ * The constructor options are:
+ *
+ * * **constant_memory**: Reduces the amount of data stored in memory so that
+ *   large files can be written efficiently:
+ *
+ * @code
+ *        workbook = xlsxwriter.Workbook(filename, {constant_memory = True});
+ *
+ *   Note, in this mode a row of data is written and then discarded when a cell
+ *   in a new row is added via one of the worksheet ``write_()`` methods.
+ *   Therefore, once this mode is active, data should be written in sequential
+ *   row order.
+ *
+ *   See :ref:`memory_perf` for more details.
+ *
+ * @endcode
+ *
+ * * **tmpdir**: ``xlsxwriter`` stores worksheet data in a temporary files prior
+ *   to assembling the final XLSX file. The temporary files are created in the
+ *   system's temp directory. If the default temporary directory isn't accessible
+ *   to your application, or doesn't contain enough space, you can specify an
+ *   alternative location using the ``tempdir`` option:
+ *
+ * @code
+ *        workbook = xlsxwriter.Workbook(filename, {tmpdir = '/home/user/tmp'});
+ *
+ *   The temporary directory must exist and will not be created.
+ *
+ * @endcode
+ *
+ * * **in_memory**: To avoid the use of temporary files in the assembly of the
+ *   final XLSX file, for example on servers that don't allow temp files such as
+ *   the Google APP Engine, set the ``in_memory`` constructor option to ``True``:
+ *
+ * @code
+ *        workbook = xlsxwriter.Workbook(filename, {in_memory = True});
+ *
+ *   This option overrides the ``constant_memory`` option.
+ * @endcode
+ *
+ * * **strings_to_numbers**: Enable the
+ *   :ref:`worksheet: <Worksheet>`:func:`write()` method to convert strings to
+ *   numbers, where possible, using :func:`float()` in order to avoid an Excel
+ *   warning about "Numbers Stored as Text". The default is ``False``:
+ *
+ * @code
+ *       workbook = xlsxwriter.Workbook(filename, {strings_to_numbers = True});
+ *
+ * @endcode
+ *
+ * * **strings_to_formulas**: Enable the
+ *   :ref:`worksheet: <Worksheet>`:func:`write()` method to convert strings to
+ *   formulas. The default is ``True``:
+ *
+ * @code
+ *       workbook = xlsxwriter.Workbook(filename, {strings_to_formulas = False});
+ *
+ * @endcode
+ *
+ * * **strings_to_urls**: Enable the
+ *   :ref:`worksheet: <Worksheet>`:func:`write()` method to convert strings to
+ *   urls. The default is ``True``:
+ *
+ * @code
+ *       workbook = xlsxwriter.Workbook(filename, {strings_to_urls = True});
+ *
+ * @endcode
+ *
+ * * **default_date_format**: This option is used to specify a default date
+ *   format string for use with the
+ *   :ref:`worksheet: <Worksheet>`:func:`write_datetime()` method when an
+ *   explicit format isn't given. See :ref:`working_with_dates_and_time` for more
+ *   details:
+ *
+ * @code
+ *       xlsxwriter.Workbook(filename, {default_date_format = 'dd/mm/yy'});
+ *
+ * @endcode
+ *
+ * * **date_1904**: Excel for Windows uses a default epoch of 1900 and Excel for
+ *   Mac uses an epoch of 1904. However, Excel on either platform will convert
+ *   automatically between one system and the other. xlsxwriter stores dates in
+ *   the 1900 format by default. If you wish to change this you can use the
+ *   ``date_1904`` workbook option. This option is mainly for enhanced
+ *   compatibility with Excel and in general isn't required very often:
+ *
+ * @code
+ *       workbook = xlsxwriter.Workbook(filename, {date_1904 = True});
+ *
+ * @endcode
+ *
+ * When specifying a filename it is recommended that you use an ``.xlsx``
+ * extension or Excel will generate a warning when opening the file.
+ *
+ * It is possible to write files to in-memory strings using StringIO as follows:
+ *
+ * @code
+ *     output = StringIO();
+ *     workbook = xlsxwriter.Workbook(output);
+ *     worksheet = workbook:add_worksheet();
+ *
+ *     worksheet:write('A1', 'Hello');
+ *     workbook:close();
+ *
+ *     xlsx_data = output.getvalue();
+ *
+ * @endcode
+ *
+ * To avoid the use of any temporary files and keep the entire file in-memory use
+ * the ``in_memory`` constructor option shown above.
+ *
+ * See also :ref:`ex_http_server`.
+ *
+ *
+ * workbook:add_worksheet()
+ */
+
+ *
+/**
+ * @brief Add a new worksheet to a workbook:
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param sheetname Optional worksheet name, defaults to Sheet1, etc.
+ *    :rtype: A :ref:`worksheet <Worksheet>` object.
+ *
+ * The ``add_worksheet()`` method adds a new worksheet to a workbook:
+ *
+ * At least one worksheet should be added to a new workbook: The
+ * :ref:`Worksheet <worksheet>` object is used to write data and configure a
+ * worksheet in the workbook:
+ *
+ * The ``sheetname`` parameter is optional. If it is not specified the default
+ * Excel convention will be followed, i.e. Sheet1, Sheet2, etc.:
+ *
+ * @code
+ *     worksheet1 = workbook:add_worksheet();           // Sheet1
+ *     worksheet2 = workbook:add_worksheet('Foglio2');  // Foglio2
+ *     worksheet3 = workbook:add_worksheet('Data');     // Data
+ *     worksheet4 = workbook:add_worksheet();           // Sheet4
+ *
+ * @endcode
+ *
+ * @image html workbook02.png
+ *
+ * The worksheet name must be a valid Excel worksheet name, i.e. it cannot contain
+ * any of the characters ``' [ ] : * ? / \
+ * '`` and it must be less than 32 characters.
+ *
+ * In addition, you cannot use the same, case insensitive, ``sheetname`` for more
+ * than one worksheet:
+ *
+ * workbook:add_format()
+ */
+
+ *
+/**
+ * @brief Create a new Format object to formats cells in worksheets.
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @paramionary properties An optional dictionary of format properties.
+ *    :rtype: A :ref:`format <Format>` object.
+ *
+ * The ``add_format()`` method can be used to create new :ref:`Format <Format>`
+ * objects which are used to apply formatting to a cell. You can either define
+ * the properties at creation time via a dictionary of property values or later
+ * via method calls:
+ *
+ * @code
+ *     format1 = workbook:add_format(props); // Set properties at creation.
+ *     format2 = workbook:add_format();      // Set properties later.
+ *
+ * @endcode
+ *
+ * See the :ref:`format` and :ref:`working_with_formats` sections for more details
+ * about Format properties and how to set them.
+ *
+ *
+ * workbook:add_chart()
+ */
+
+ *
+/**
+ * @brief Create a chart object that can be added to a worksheet:
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @paramionary options An dictionary of chart type options.
+ *    :rtype: A :ref:`Chart <chart_class>` object.
+ *
+ * This method is use to create a new chart object that can be inserted into a
+ * worksheet via the :func:`insert_chart()` Worksheet method:
+ *
+ * @code
+ *     chart = workbook:add_chart({type = 'column'});
+ *
+ * @endcode
+ *
+ * The properties that can be set are:
+ *
+ * @code
+ *     type    (required);
+ *     subtype (optional);
+ *
+ * @endcode
+ *
+ * * ``type``
+ *
+ *   This is a required parameter. It defines the type of chart that will be
+ *   created:
+ *
+ * @code
+ *     chart = workbook:add_chart({type = 'line'});
+ *
+ *   The available types are:
+ *
+ * @code
+ *     area
+ *     bar
+ *     column
+ *     line
+ *     pie
+ *     radar
+ *     scatter
+ *     stock
+ *
+ * @endcode
+ *
+ * * ``subtype``
+ *
+ *   Used to define a chart subtype where available:
+ *
+ * @code
+ *     workbook:add_chart({type = 'bar', subtype = 'stacked'});
+ *
+ * @endcode
+ *
+ * See the :ref:`chart_class` for a list of available chart subtypes.
+ *
+ * See also :ref:`working_with_charts` and :ref:`chart_examples`.
+ *
+ * workbook:add_chartsheet()
+ */
+
+ *
+/**
+ * @brief Add a new add_chartsheet to a workbook:
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param sheetname Optional chartsheet name, defaults to Chart1, etc.
+ *    :rtype: A :ref:`chartsheet <Chartsheet>` object.
+ *
+ * The ``add_chartsheet()`` method adds a new chartsheet to a workbook:
+ *
+ * @image html chartsheet.png
+ *
+ * See :ref:`chartsheet` for details.
+ *
+ * The ``sheetname`` parameter is optional. If it is not specified the default
+ * Excel convention will be followed, i.e. Chart1, Chart2, etc.
+ *
+ * The chartsheet name must be a valid Excel worksheet name, i.e. it cannot
+ * contain any of the characters ``' [ ] : * ? / \
+ * '`` and it must be less than 32 characters.
+ *
+ * In addition, you cannot use the same, case insensitive, ``sheetname`` for more
+ * than one chartsheet.
+ *
+ *
+ * workbook:close()
+ */
+
+ *
+/**
+ * @brief Close the Workbook object and write the XLSX file.
+ *
+ *
+ * In general your Excel file will be closed automatically when your program ends
+ * or when the Workbook object goes out of scope, however the ``close()`` method
+ * can be used to explicitly close an Excel file:
+ *
+ * @code
+ *     workbook:close();
+ *
+ * @endcode
+ *
+ * An explicit ``close()`` is required if the file must be closed prior to
+ * performing some external action on it such as copying it, reading its size or
+ * attaching it to an email.
+ *
+ * In addition, ``close()`` may occasionally be required to prevent Python's
+ * garbage collector from disposing of the Workbook, Worksheet and Format objects
+ * in the wrong order.
+ *
+ *
+ * workbook:set_properties()
+ */
+
+ *
+/**
+ * @brief Set the document properties such as Title, Author etc.
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param properties Dictionary of document properties.
+ *
+ * The ``set_properties`` method can be used to set the document properties of the
+ * Excel file created by ``xlsxwriter``. These properties are visible when you
+ * use the ``Office Button -> Prepare -> Properties`` option in Excel and are
+ * also available to external applications that read or index windows files.
+ *
+ * The properties that can be set are:
+ *
+ * * ``title``
+ * * ``subject``
+ * * ``author``
+ * * ``manager``
+ * * ``company``
+ * * ``category``
+ * * ``keywords``
+ * * ``comments``
+ * * ``status``
+ *
+ * The properties are all optional and should be passed in dictionary format as
+ * follows:
+ *
+ * @code
+ *     workbook:set_properties({
+ *         title =    'This is an example spreadsheet',
+ *         subject =  'With document properties',
+ *         author =   'John McNamara',
+ *         manager =  'Dr. Heinz Doofenshmirtz',
+ *         company =  'of Wolves',
+ *         category = 'Example spreadsheets',
+ *         keywords = 'Sample, Example, Properties',
+ *         comments = 'Created with Python and xlsxwriter'});
+ *
+ * @endcode
+ *
+ * @image html doc_properties.png
+ *
+ * See also :ref:`ex_doc_properties`.
+ *
+ * workbook:define_name()
+ */
+
+ *
+/**
+ * @brief Create a defined name in the workbook to use as a variable.
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param name    The defined name.
+ * @param formula The cell or range that the defined name refers to.
+ *
+ * This method is used to defined a name that can be used to represent a value, a
+ * single cell or a range of cells in a workbook: These defined names can then be
+ * used in formulas:
+ *
+ * @code
+ *     workbook:define_name('Exchange_rate', '=0.96');
+ *     worksheet:write('B3', '=B2*Exchange_rate');
+ *
+ * @endcode
+ *
+ * As in Excel a name defined like this is "global" to the workbook and can be
+ * referred to from any worksheet:
+ *
+ * @code
+ *     // Global workbook name.
+ *     workbook:define_name('Sales',         '=Sheet1!$G$1:$H$10');
+ *
+ * @endcode
+ *
+ * It is also possible to define a local/worksheet name by prefixing it with the
+ * sheet name using the syntax ``'sheetname!definedname'``:
+ *
+ * @code
+ *     // Local worksheet name.
+ *     workbook:define_name('Sheet2!Sales', '=Sheet2!$G$1:$G$10');
+ *
+ * @endcode
+ *
+ * If the sheet name contains spaces or special characters you must follow the
+ * Excel convention and enclose it in single quotes:
+ *
+ * @code
+ *     workbook:define_name("'New Data'!Sales", '=Sheet2!$G$1:$G$10');
+ *
+ * @endcode
+ *
+ * See also the ``defined_name.py`` program in the examples directory.
+ *
+ *
+ * workbook:worksheets()
+ */
+
+ *
+/**
+ * @brief Return a list of the worksheet objects in the workbook:
+ *
+ *
+ *    :rtype: A list of :ref:`worksheet <Worksheet>` objects.
+ *
+ * The ``worksheets()`` method returns a list of the worksheets in a workbook:
+ * This is useful if you want to repeat an operation on each worksheet in a
+ * workbook:
+ *
+ * @code
+ *     for worksheet in workbook:worksheets():
+ *         worksheet:write('A1', 'Hello');
+ *
+ * @endcode
+ *
+ * workbook:set_calc_mode()
+ */
+
+ *
+/**
+ * @brief Set the Excel calculation mode for the workbook:
+ *
+ *
+ * @param self Pointer to lxw_format.
+ * @param mode The calculation mode string
+ *
+ * Set the calculation mode for formulas in the workbook: This is mainly of use
+ * for workbooks with slow formulas where you want to allow the user to calculate
+ * them manually.
+ *
+ * The ``mode`` parameter can be:
+ *
+ * * ``auto``: The default. Excel will re-calculate formulas when a formula or a
+ *   value affecting the formula changes.
+ *
+ * * ``auto_except_tables``: Excel will automatically re-calculate formulas
+ *   except for tables.
+ *
+ * * ``manual``: Only re-calculate formulas when the user requires it. Generally
+ *   by pressing F9.
+ *
+ *
+ * workbook:use_zip64()
+ */
+
+ *
+/**
+ * @brief Allow ZIP64 extensions when writing xlsx file zip container.
+ *
+ *
+ * Use ZIP64 extensions when writing the xlsx file zip container and allow files
+ * greater than 4 GB.
+ *
diff --git a/docs/src/cworksheet.dox b/docs/src/cworksheet.dox
new file mode 100644
index 00000000..dc3e0988
--- /dev/null
+++ b/docs/src/cworksheet.dox
@@ -0,0 +1,2247 @@
+/**
+ * .. _worksheet:
+ *
+ * The Worksheet Class
+ * ===================
+ *
+ * The worksheet class represents an Excel worksheet. It handles operations such
+ * as writing data to cells or formatting worksheet layout.
+ *
+ * A worksheet object isn't instantiated directly. Instead a new worksheet is
+ * created by calling the :func:`add_worksheet()` method from a Workbook()
+ * object:
+ *
+ * @code
+ *     workbook   = Workbook:new("filename.xlsx");
+ *
+ *     worksheet1 = workbook:add_worksheet();
+ *     worksheet2 = workbook:add_worksheet();
+ *
+ *     worksheet1.write(0, 0, 123);
+ *
+ * @endcode
+ *
+ * @image html worksheet00.png
+ *
+ *
+ * worksheet:write()
+ */
+
+ *
+/**
+ * @brief Write generic data to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param args        The additional args that are passed to the sub methods
+ *                        such as number, string and format.
+ *
+ * Excel makes a distinction between data types such as strings, numbers, blanks,
+ * formulas and hyperlinks. To simplify the process of writing data to an
+ * xlsxwriter.lua file the `write()` method acts as a general alias for several
+ * more specific methods:
+ *
+ * * :func:`worksheet_write_string()`
+ * * :func:`worksheet_write_number()`
+ * * :func:`worksheet_write_blank()`
+ * * :func:`worksheet_write_formula()`
+ * * :func:`worksheet_write_datetime()`
+ * * :func:`worksheet_write_boolean()`
+ * * :func:`worksheet_write_url()`
+ *
+ * The rules for handling data in `write()` are as follows:
+ *
+ * * Data types `float`, `int`, `long`, :class:`decimal.Decimal` and
+ *   :class:`fractions.Fraction`  are written using :func:`worksheet_write_number()`.
+ *
+ * * Data types :class:`datetime.datetime`, :class:`datetime.date` or
+ *   :class:`datetime.time`  are written using :func:`worksheet_write_datetime()` .
+ *
+ * * `None` and empty strings `""` are written using :func:`worksheet_write_blank()`.
+ *
+ * * Data type `bool` is written using :func:`worksheet_write_boolean()`.
+ *
+ * Strings are then handled as follows:
+ *
+ * * Strings that start with `"="` are take to match a formula and are written
+ *   using :func:`worksheet_write_formula()`. This can be overridden, see below.
+ *
+ * * Strings that match supported URL types are written using
+ *   :func:`worksheet_write_url()`. This can be overridden, see below.
+ *
+ * * When the Workbook() constructor `strings_to_numbers` option is
+ *   `true` strings that convert to numbers using :func:`float()` are written
+ *   using :func:`worksheet_write_number()` in order to avoid Excel warnings about "Numbers
+ *   Stored as Text". See the note below.
+ *
+ * * Strings that don't match any of the above criteria are written using
+ *   :func:`worksheet_write_string()`.
+ *
+ * If none of the above types are matched the value is evaluated with `float()`
+ * to see if it corresponds to a user defined float type. If it does then it is
+ * written using :func:`worksheet_write_number()`.
+ *
+ * If not then it is evaluated with `str()` to see if it corresponds to a user
+ * defined string type. If it does then it is written using
+ * :func:`worksheet_write_string()`.
+ *
+ * Finally, if none of these rules are matched then a `TypeError` exception is
+ * raised.
+ *
+ * Here are some examples:
+ *
+ * @code
+ *     worksheet:write(0, 0, "Hello");         // worksheet_write_string();
+ *     worksheet:write(1, 0, "World");         // worksheet_write_string();
+ *     worksheet:write(2, 0, 2);               // worksheet_write_number();
+ *     worksheet:write(3, 0, 3.00001);         // worksheet_write_number();
+ *     worksheet:write(4, 0, "=SIN(PI()/4)");  // worksheet_write_formula();
+ *     worksheet:write(5, 0, "");              // worksheet_write_blank();
+ *     worksheet:write(6, 0, None);            // worksheet_write_blank();
+ *
+ * @endcode
+ *
+ * This creates a worksheet like the following:
+ *
+ * @image html worksheet01.png
+ *
+ * .. note::
+ *
+ *    The Workbook() constructor option takes three optional arguments
+ *    that can be used to override string handling in the `write()` function.
+ *    These options are shown below with their default values:
+ *
+ * @code
+ *        Workbook:new(filename, {strings_to_numbers =  false,
+ *                                       strings_to_formulas = true,
+ *                                       strings_to_urls =     true});
+ *
+ * @endcode
+ *
+ * The `write()` method supports two forms of notation to designate the position
+ * of cells: **Row-column** notation and **A1** notation:
+ *
+ * @code
+ *     // These are equivalent.
+ *     worksheet:write(0, 0, "Hello");
+ *     worksheet:write(0, 0, "Hello");
+ *
+ * @endcode
+ *
+ * See :ref:`cell_notation` for more details.
+ *
+ * The `format` parameter in the sub `write` methods is used to apply
+ * formatting to the cell. This parameter is optional but when present it should
+ * be a valid :ref:`Format <format>` object:
+ *
+ * @code
+ *     format = workbook:add_format({bold = true, italic = true});
+ *
+ *     worksheet:write(0, 0, "Hello", format);  // Cell is bold and italic.
+ *
+ * @endcode
+ *
+ * worksheet:worksheet_write_string()
+ */
+
+ *
+/**
+ * @brief Write a string to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param string      String to write to cell.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_string()` method writes a string to the cell specified by `row`
+ * and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_string(0, 0, "Your text here");
+ *     worksheet:worksheet_write_string(1, 0, "or here");
+ *
+ * @endcode
+ *
+ * Both row-column and A1 style notation are supported. See :ref:`cell_notation`
+ * for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional but when present is should be a valid
+ * :ref:`Format <format>` object.
+ *
+ * Unicode strings are supported in UTF-8 encoding. This generally requires that
+ * your source file in also UTF-8 encoded:
+ *
+ * @code
+ *     // _*_ coding: utf-8
+ *
+ *     worksheet:write(0, 0, u"Some UTF-8 text");
+ *
+ * @endcode
+ *
+ * @image html worksheet02.png
+ *
+ * Alternatively, you can read data from an encoded file, convert it to UTF-8
+ * during reading and then write the data to an Excel file. There are several
+ * sample`unicode_\*.py` programs like this in the `examples` directory of the XlsxWriter source tree.
+ *
+ * The maximum string size supported by Excel is 32,767 characters. Strings longer
+ * than this will be truncated by `worksheet_write_string()`.
+ *
+ * .. note::
+ *
+ *    Even though Excel allows strings of 32,767 characters it can only
+ *    **display** 1000 in a cell. However, all 32,767 characters are displayed in the
+ *    formula bar.
+ *
+ *
+ * worksheet:worksheet_write_number()
+ */
+
+ *
+/**
+ * @brief Write a number to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param number      Number to write to cell.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_number()` method writes numeric types to the cell specified by
+ * `row` and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_number(0, 0, 123456);
+ *     worksheet:worksheet_write_number(1, 0, 2.3451);
+ *
+ * @endcode
+ *
+ * The numeric types supported are `float`, `int`, `long`,
+ * :class:`decimal.Decimal` and :class:`fractions.Fraction` or anything that can
+ * be converted via `float()`.
+ *
+ * When written to an Excel file numbers are converted to IEEE-754 64-bit
+ * double-precision floating point. This means that, in most cases, the maximum
+ * number of digits that can be stored in Excel without losing precision is 15.
+ *
+ * .. note::
+ *    NAN and INF are not supported and will raise a TypeError exception.
+ *
+ * Both row-column and A1 style notation are supported. See :ref:`cell_notation`
+ * for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional but when present is should be a valid
+ * :ref:`Format <format>` object.
+ *
+ *
+ * worksheet:worksheet_write_formula()
+ */
+
+ *
+/**
+ * @brief Write a formula to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param formula     Formula to write to cell.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_formula()` method writes a formula or function to the cell
+ * specified by `row` and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_formula(0, 0, "=B3 + B4");
+ *     worksheet:worksheet_write_formula(1, 0, "=SIN(PI()/4)");
+ *     worksheet:worksheet_write_formula(2, 0, "=SUM(B1:B5)");
+ *     worksheet:worksheet_write_formula(3, 0, "=IF(A3>1,"Yes", "No")");
+ *     worksheet:worksheet_write_formula("A5", "=AVERAGE(1, 2, 3, 4)");
+ *     worksheet:worksheet_write_formula("A6", "=DATEVALUE("1-Jan-2013")");
+ *
+ * @endcode
+ *
+ * Array formulas are also supported:
+ *
+ * @code
+ *     worksheet:worksheet_write_formula("A7", "{=SUM(A1:B1*A2:B2)}");
+ *
+ * @endcode
+ *
+ * See also the `worksheet_write_array_formula()` method below.
+ *
+ * Both row-column and A1 style notation are supported. See :ref:`cell_notation`
+ * for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional but when present is should be a valid
+ * :ref:`Format <format>` object.
+ *
+ * XlsxWriter doesn't calculate the value of a formula and instead stores the
+ * value 0 as the formula result. It then sets a global flag in the XLSX file to
+ * say that all formulas and functions should be recalculated when the file is
+ * opened. This is the method recommended in the Excel documentation and in
+ * general it works fine with spreadsheet applications. However, applications
+ * that don't have a facility to calculate formulas, such as Excel Viewer, or
+ * some mobile applications will only display the 0 results.
+ *
+ * If required, it is also possible to specify the calculated result of the
+ * formula using the options `value` parameter. This is occasionally necessary
+ * when working with non-Excel applications that don't calculate the value of the
+ * formula. The calculated `value` is added at the end of the argument list:
+ *
+ * @code
+ *     worksheet:write(0, 0, "=2+2", num_format, 4);
+ *
+ * @endcode
+ *
+ * Excel stores formulas in US style formatting regardless of the Locale or
+ * Language of the Excel version. Therefore all formula names written using
+ * XlsxWriter must be in English (use the following
+ * `formula translator <http://fr.excel-translator.de>`_ if necessary). Also,
+ * formulas must be written with the US style separator/range operator which is a
+ * comma (not semi-colon). Therefore a formula with multiple values should be
+ * written as follows:
+ *
+ * @code
+ *     worksheet:worksheet_write_formula(0, 0, "=SUM(1, 2, 3)"); // OK
+ *     worksheet:worksheet_write_formula(1, 0, "=SUM(1; 2; 3)"); // NO. Error on load.
+ *
+ * @endcode
+ *
+ * Excel 2010 and 2013 added functions which weren't defined in the original file
+ * specification. These functions are referred to as *future* functions. Examples
+ * of these functions are `ACOT`, `CHISQ.DIST.RT` , `CONFIDENCE.NORM`,
+ * `STDEV.P`, `STDEV.S` and `WORKDAY.INTL`. The full list is given in the
+ * `MS XLSX extensions documentation on future functions <http://msdn.microsoft.com/en-us/library/dd907480%28v=office.12%29.aspx>`_.
+ *
+ * When written using `worksheet_write_formula()` these functions need to be fully
+ * qualified with the `_xlfn.` prefix as they are shown in the MS XLSX
+ * documentation link above. For example:
+ *
+ * @code
+ *     worksheet:worksheet_write_formula(0, 0, "=_xlfn.STDEV.S(B1:B10)");
+ *
+ *
+ * @endcode
+ *
+ * worksheet:worksheet_write_array_formula()
+ */
+
+ *
+/**
+ * @brief  *
+ *    Write an array formula to a worksheet cell.
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ * @param formula     Array formula to write to cell.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_array_formula()` method write an array formula to a cell range. In
+ * Excel an array formula is a formula that performs a calculation on a set of
+ * values. It can return a single value or a range of values.
+ *
+ * An array formula is indicated by a pair of braces around the formula:
+ * `{=SUM(A1:B1*A2:B2)}`.
+ *
+ * For array formulas that return a range of values you must specify the range
+ * that the return values will be written to:
+ *
+ * @code
+ *     worksheet:worksheet_write_array_formula("A1:A3",    "{=TREND(C1:C3,B1:B3)}");
+ *     worksheet:worksheet_write_array_formula(0, 0, 2, 0, "{=TREND(C1:C3,B1:B3)}");
+ *
+ * @endcode
+ *
+ * If the array formula returns a single value then the `first_` and `last_`
+ * parameters should be the same:
+ *
+ * @code
+ *     worksheet:worksheet_write_array_formula("A1:A1", "{=SUM(B1:C1*B2:C2)}");
+ *
+ * @endcode
+ *
+ * It this case however it is easier to just use the `worksheet_write_formula()` or
+ * `write()` methods:
+ *
+ * @code
+ *     // Same as above but more concise.
+ *     worksheet:write(0, 0, "{=SUM(B1:C1*B2:C2)}");
+ *     worksheet:worksheet_write_formula(0, 0, "{=SUM(B1:C1*B2:C2)}");
+ *
+ * @endcode
+ *
+ * As shown above, both row-column and A1 style notation are supported. See
+ * :ref:`cell_notation` for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional but when present is should be a valid
+ * :ref:`Format <format>` object.
+ *
+ * If required, it is also possible to specify the calculated value of the
+ * formula. This is occasionally necessary when working with non-Excel
+ * applications that don't calculate the value of the formula. The calculated
+ * `value` is added at the end of the argument list:
+ *
+ * @code
+ *     worksheet:worksheet_write_array_formula("A1:A3", "{=TREND(C1:C3,B1:B3)}", format, 105);
+ *
+ * @endcode
+ *
+ * See also :ref:`ex_array_formula`.
+ *
+ *
+ * worksheet:worksheet_write_blank()
+ */
+
+ *
+/**
+ * @brief Write a blank worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param blank       None or empty string. The value is ignored.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * Write a blank cell specified by `row` and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_blank(0, 0, None, format);
+ *
+ * @endcode
+ *
+ * This method is used to add formatting to a cell which doesn't contain a string
+ * or number value.
+ *
+ * Excel differentiates between an "Empty" cell and a "Blank" cell. An "Empty"
+ * cell is a cell which doesn't contain data or formatting whilst a "Blank" cell
+ * doesn't contain data but does contain formatting. Excel stores "Blank" cells
+ * but ignores "Empty" cells.
+ *
+ * As such, if you write an empty cell without formatting it is ignored:
+ *
+ * @code
+ *     worksheet:write(0, 0, None, format); // worksheet_write_blank();
+ *     worksheet:write(1, 0, None);         // Ignored
+ *
+ * @endcode
+ *
+ * This seemingly uninteresting fact means that you can write arrays of data
+ * without special treatment for `None` or empty string values.
+ *
+ * As shown above, both row-column and A1 style notation are supported. See
+ * :ref:`cell_notation` for more details.
+ *
+ * worksheet:worksheet_write_boolean()
+ */
+
+ *
+/**
+ * @brief Write a boolean value to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param boolean     Boolean value to write to cell.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_boolean()` method writes a boolean value to the cell specified by
+ * `row` and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_boolean(0, 0, true);
+ *     worksheet:worksheet_write_boolean(1, 0, false);
+ *
+ * @endcode
+ *
+ * Both row-column and A1 style notation are supported. See :ref:`cell_notation`
+ * for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional but when present is should be a valid
+ * :ref:`Format <format>` object.
+ *
+ *
+ * worksheet:worksheet_write_datetime()
+ */
+
+ *
+/**
+ * @brief Write a date or time to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param datetime    A datetime.datetime, .date or .time object.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_datetime()` method can be used to write a date or time to the cell
+ * specified by `row` and `column`:
+ *
+ * @code
+ *     worksheet:worksheet_write_datetime(0, 0, datetime, date_format);
+ *
+ * @endcode
+ *
+ * The datetime should be a :class:`datetime.datetime`, :class:`datetime.date` or
+ * :class:`datetime.time` object. The :mod:`datetime` class is part of the
+ * standard Python libraries.
+ *
+ * There are many way to create datetime objects, for example the
+ * :meth:`datetime.datetime.strptime` method:
+ *
+ * @code
+ *     date_time = datetime.datetime.strptime("2013-01-23", "%Y-%m-%d");
+ *
+ * @endcode
+ *
+ * See the :mod:`datetime` documentation for other date/time creation methods.
+ *
+ * A date/time should have a `format` of type :ref:`Format <format>`,
+ * otherwise it will appear as a number:
+ *
+ * @code
+ *     date_format = workbook:add_format({num_format = "d mmmm yyyy"});
+ *
+ *     worksheet:worksheet_write_datetime(0, 0, date_time, date_format);
+ *
+ * @endcode
+ *
+ * If required, a default date format string can be set using the Workbook()
+ * constructor `default_date_format` option.
+ *
+ * See :ref:`working_with_dates_and_time` for more details.
+ *
+ *
+ * worksheet:worksheet_write_url()
+ */
+
+ *
+/**
+ * @brief Write a hyperlink to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param url         Hyperlink url.
+ * @param format      Optional Format object. Defaults to blue underline.
+ * @param string      An optional display string for the hyperlink.
+ * @param tip         An optional tooltip.
+ *
+ * The `worksheet_write_url()` method is used to write a hyperlink in a worksheet cell.
+ * The url is comprised of two elements: the displayed string and the
+ * non-displayed link. The displayed string is the same as the link unless an
+ * alternative string is specified.
+ *
+ * Both row-column and A1 style notation are supported. See :ref:`cell_notation`
+ * for more details.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter is optional. Since a hyperlink without a format doesn't look like a
+ * link the following default :ref:`Format <format>` is used:
+ *
+ * @code
+ *     workbook:add_format({color = "blue", underline = 1});
+ *
+ * @endcode
+ *
+ * Therefore the following are equivalent:
+ *
+ * @code
+ *     link_format = workbook:add_format({color = "blue", underline = 1});
+ *     worksheet:worksheet_write_url(0, 0, "ftp://www.python.org/", link_format);
+ *
+ *     // Same as:
+ *     worksheet:worksheet_write_url(0, 0, "ftp://www.python.org/"); // Default format.
+ *
+ * @endcode
+ *
+ * Four web style URI's are supported: `http://`, `https://`, `ftp://` and
+ * `mailto:`:
+ *
+ * @code
+ *     worksheet:worksheet_write_url(0, 0, "ftp://www.python.org/");
+ *     worksheet:worksheet_write_url(1, 0, "http://www.python.org/");
+ *     worksheet:worksheet_write_url(2, 0, "https://www.python.org/");
+ *     worksheet:worksheet_write_url(3, 0, "mailto:jmcnamaracpan.org");
+ *
+ * @endcode
+ *
+ * All of the these URI types are recognised by the :func:`write()` method, so the
+ * following are equivalent:
+ *
+ * @code
+ *     worksheet:worksheet_write_url(1, 0, "http://www.python.org/");
+ *     worksheet:write    (1, 0, "http://www.python.org/"); // Same.
+ *
+ * @endcode
+ *
+ * You can display an alternative string using the `string` parameter:
+ *
+ * @code
+ *     worksheet:worksheet_write_url(0, 0, "http://www.python.org", link_format, "Python");
+ *
+ * @endcode
+ *
+ * .. Note::
+ *
+ *   If you wish to have some other cell data such as a number or a formula you
+ *   can overwrite the cell using another call to `worksheet_write_*()`:
+ *
+ * @code
+ *     worksheet:worksheet_write_url(0, 0, "http://www.python.org/", link_format);
+ *
+ *     // Overwrite the URL string with a formula. The cell is still a link.
+ *     worksheet:worksheet_write_formula(0, 0, "=1+1", link_format);
+ *
+ * @endcode
+ *
+ * There are two local URIs supported: `internal:` and `external:`. These are
+ * used for hyperlinks to internal worksheet references or external workbook and
+ * worksheet references:
+ *
+ * @code
+ *     worksheet:worksheet_write_url(0, 0,  "internal:Sheet2!A1");
+ *     worksheet:worksheet_write_url(1, 0,  "internal:Sheet2!A1");
+ *     worksheet:worksheet_write_url(2, 0,  "internal:Sheet2!A1:B2");
+ *     worksheet:worksheet_write_url(3, 0,  "internal:'Sales Data'!A1");
+ *     worksheet:worksheet_write_url("A5", r"external:c:\temp\foo.xlsx");
+ *     worksheet:worksheet_write_url("A6", r"external:c:\foo.xlsx#Sheet2!A1");
+ *     worksheet:worksheet_write_url("A7", r"external:..\foo.xlsx");
+ *     worksheet:worksheet_write_url("A8", r"external:..\foo.xlsx#Sheet2!A1");
+ *     worksheet:worksheet_write_url("A9", r"external:\\NET\share\foo.xlsx");
+ *
+ * @endcode
+ *
+ * Worksheet references are typically of the form `Sheet1!A1`. You can also link
+ * to a worksheet range using the standard Excel notation: `Sheet1!A1:B2`.
+ *
+ * In external links the workbook and worksheet name must be separated by the
+ * `#` character: `external:Workbook:xlsx#Sheet1!A1'`.
+ *
+ * You can also link to a named range in the target worksheet: For example say you
+ * have a named range called `my_name` in the workbook `c:\temp\foo.xlsx` you
+ * could link to it as follows:
+ *
+ * @code
+ *     worksheet:worksheet_write_url("A14", r"external:c:\temp\foo.xlsx#my_name");
+ *
+ * @endcode
+ *
+ * Excel requires that worksheet names containing spaces or non alphanumeric
+ * characters are single quoted as follows `'Sales Data'!A1`.
+ *
+ * Links to network files are also supported. Network files normally begin with
+ * two back slashes as follows `\\NETWORK\etc`. In order to generate this in a
+ * single or double quoted string you will have to escape the backslashes,
+ * `'\\\\NETWORK\\etc'` or use a raw string `r'\\NETWORK\etc'`.
+ *
+ * Alternatively, you can avoid most of these quoting problems by using forward
+ * slashes. These are translated internally to backslashes:
+ *
+ * @code
+ *     worksheet:worksheet_write_url("A14", "external:c:/temp/foo.xlsx");
+ *     worksheet:worksheet_write_url("A15", "external://NETWORK/share/foo.xlsx");
+ *
+ * @endcode
+ *
+ * See also :ref:`ex_hyperlink`.
+ *
+ * .. note::
+ *    XlsxWriter will escape the following characters in URLs as required
+ *    by Excel: `\s " < > \ [ ] ` ^ { }` unless the URL already contains `%xx`
+ *    style escapes. In which case it is assumed that the URL was escaped
+ *    correctly by the user and will by passed directly to Excel.
+ *
+ *
+ * worksheet:worksheet_write_rich_string()
+ */
+
+ *
+/**
+ * @brief Write a "rich" string with multiple formats to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row        The zero indexed row number.
+ * @param col        The zero indexed column number.
+ * @param string_parts String and format pairs.
+ * @param format       Optional Format object. :ref:`Format <format>`
+ *
+ *
+ * The `worksheet_write_rich_string()` method is used to write strings with multiple
+ * formats. For example to write the string "This is **bold** and this is
+ * *italic*" you would use the following:
+ *
+ * @code
+ *     bold   = workbook:add_format({bold = true});
+ *     italic = workbook:add_format({italic = true});
+ *
+ *     worksheet:worksheet_write_rich_string(0, 0,
+ *                                 "This is ",
+ *                                 bold, "bold",
+ *                                 " and this is ",
+ *                                 italic, "italic");
+ *
+ * @endcode
+ *
+ * @image html rich_strings_small.png
+ *
+ * The basic rule is to break the string into fragments and put a
+ * :func:`Format <format>` object before the fragment that you want to format.
+ * For example:
+ *
+ * @code
+ *     // Unformatted string.
+ *     "This is an example string"
+ *
+ *     // Break it into fragments.
+ *     "This is an ", "example", " string"
+ *
+ *     // Add formatting before the fragments you want formatted.
+ *     "This is an ", format, "example", " string"
+ *
+ *     // In XlsxWriter.
+ *     worksheet:worksheet_write_rich_string(0, 0,
+ *                                 "This is an ", format, "example", " string");
+ *
+ * @endcode
+ *
+ * String fragments that don't have a format are given a default format. So for
+ * example when writing the string "Some **bold** text" you would use the first
+ * example below but it would be equivalent to the second:
+ *
+ * @code
+ *     // Some bold format and a default format.
+ *     bold    = workbook:add_format({bold = true});
+ *     default = workbook:add_format();
+ *
+ *     // With default formatting:
+ *     worksheet:worksheet_write_rich_string(0, 0,
+ *                                 "Some ",
+ *                                 bold, "bold",
+ *                                 " text");
+ *
+ *     // Or more explicitly:
+ *     worksheet:worksheet_write_rich_string(0, 0,
+ *                                  default, "Some ",
+ *                                  bold,    "bold",
+ *                                  default, " text");
+ *
+ * @endcode
+ *
+ * In Excel only the font properties of the format such as font name, style, size,
+ * underline, color and effects are applied to the string fragments in a rich
+ * string. Other features such as border, background, text wrap and alignment
+ * must be applied to the cell.
+ *
+ * The `worksheet_write_rich_string()` method allows you to do this by using the last
+ * argument as a cell format (if it is a format object). The following example
+ * centers a rich string in the cell:
+ *
+ * @code
+ *     bold   = workbook:add_format({bold = true});
+ *     center = workbook:add_format({align = "center"});
+ *
+ *     worksheet:worksheet_write_rich_string("A5",
+ *                                 "Some ",
+ *                                 bold, "bold text",
+ *                                 " centered",
+ *                                 center);
+ *
+ *
+ * @endcode
+ *
+ * See also :ref:`ex_rich_strings` and :ref:`ex_merge_rich`.
+ *
+ * worksheet:worksheet_write_row()
+ */
+
+ *
+/**
+ * @brief Write a row of data starting from (row, col).
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param data        Cell data to write. Variable types.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_row()` method can be used to write a list of data in one go. This
+ * is useful for converting the results of a database query into an Excel
+ * worksheet: The :func:`write()` method is  called for each element of the data.
+ * For example:
+ *
+ * @code
+ *     // Some sample data.
+ *     data = ("Foo", "Bar", "Baz");
+ *
+ *     // Write the data to a sequence of cells.
+ *     worksheet:worksheet_write_row(0, 0, data);
+ *
+ *     // The above example is equivalent to:
+ *     worksheet:write(0, 0, data[0]);
+ *     worksheet:write("B1", data[1]);
+ *     worksheet:write("C1", data[2]);
+ *
+ *
+ * @endcode
+ *
+ * worksheet:worksheet_write_column()
+ */
+
+ *
+/**
+ * @brief Write a column of data starting from (row, col).
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param data        Cell data to write. Variable types.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ * The `worksheet_write_column()` method can be used to write a list of data in one go.
+ * This is useful for converting the results of a database query into an Excel
+ * worksheet: The :func:`write()` method is  called for each element of the data.
+ * For example:
+ *
+ * @code
+ *     // Some sample data.
+ *     data = ("Foo", "Bar", "Baz");
+ *
+ *     // Write the data to a sequence of cells.
+ *     worksheet:worksheet_write_column(0, 0, data);
+ *
+ *     // The above example is equivalent to:
+ *     worksheet:write(0, 0, data[0]);
+ *     worksheet:write(1, 0, data[1]);
+ *     worksheet:write(2, 0, data[2]);
+ *
+ *
+ * @endcode
+ *
+ * worksheet:set_row()
+ */
+
+ *
+/**
+ * @brief Set properties for a row of cells.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int row      The worksheet row (zero indexed).
+ * @param float height The row height.
+ * @param format       Optional Format object. :ref:`Format <format>`
+ * @param dict options Optional row parameters: hidden, level, collapsed.
+ *
+ * The `set_row()` method is used to change the default properties of a row. The
+ * most common use for this method is to change the height of a row:
+ *
+ * @code
+ *     worksheet:set_row(0, 20); // Set the height of Row 1 to 20.
+ *
+ * @endcode
+ *
+ * The other common use for `set_row()` is to set the :ref:`Format <format>` for
+ * all cells in the row:
+ *
+ * @code
+ *     format = workbook:add_format({bold = true});
+ *
+ *     worksheet:set_row(0, 20, format);
+ *
+ * @endcode
+ *
+ * If you wish to set the format of a row without changing the height you can pass
+ * `None` as the height parameter or use the default row height of 15:
+ *
+ * @code
+ *     worksheet:set_row(1, None, format);
+ *     worksheet:set_row(1, 15,   format); // Same as above.
+ *
+ * @endcode
+ *
+ * The `format` parameter will be applied to any cells in the row that
+ * don't have a format. As with Excel it is overridden by an explicit cell
+ * format. For example:
+ *
+ * @code
+ *     worksheet:set_row(0, None, format1);     // Row 1 has format1.
+ *
+ *     worksheet:write(0, 0, "Hello");          // Cell A1 defaults to format1.
+ *     worksheet:write("B1", "Hello", format2); // Cell B1 keeps format2.
+ *
+ * @endcode
+ *
+ * The `options` parameter is a dictionary with the following possible keys:
+ *
+ * * `"hidden"`
+ * * `"level"`
+ * * `"collapsed"`
+ *
+ * Options can be set as follows:
+ *
+ * @code
+ *     worksheet:set_row(0, 20, format, {hidden = true});
+ *
+ *     // Or use defaults for other properties and set the options only.
+ *     worksheet:set_row(0, None, None, {hidden = true});
+ *
+ * @endcode
+ *
+ * The `"hidden"` option is used to hide a row. This can be used, for example,
+ * to hide intermediary steps in a complicated calculation:
+ *
+ * @code
+ *     worksheet:set_row(0, 20, format, {hidden = true});
+ *
+ * @endcode
+ *
+ * The `"level"` parameter is used to set the outline level of the row. Outlines
+ * are described in :ref:`outlines`. Adjacent rows with the same outline level
+ * are grouped together into a single outline.
+ *
+ * The following example sets an outline level of 1 for some rows:
+ *
+ * @code
+ *     worksheet:set_row(0, None, None, {level = 1});
+ *     worksheet:set_row(1, None, None, {level = 1});
+ *     worksheet:set_row(2, None, None, {level = 1});
+ *
+ * @endcode
+ *
+ * Excel allows up to 7 outline levels. The `"level"` parameter should be in the
+ * range `0 <= level <= 7`.
+ *
+ * The `"hidden"` parameter can also be used to hide collapsed outlined rows
+ * when used in conjunction with the `"level"` parameter:
+ *
+ * @code
+ *     worksheet:set_row(1, None, None, {hidden = 1, level = 1});
+ *     worksheet:set_row(2, None, None, {hidden = 1, level = 1});
+ *
+ * @endcode
+ *
+ * The `"collapsed"` parameter is used in collapsed outlines to indicate which
+ * row has the collapsed `'+'` symbol:
+ *
+ * @code
+ *     worksheet:set_row(3, None, None, {collapsed = 1});
+ *
+ *
+ * @endcode
+ *
+ * worksheet:set_column()
+ */
+
+ *
+/**
+ * @brief Set properties for one or more columns of cells.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int first_col First column (zero-indexed).
+ * @param int last_col  Last column (zero-indexed). Can be same as firstcol.
+ * @param float width   The width of the column(s).
+ * @param format        Optional Format object. :ref:`Format <format>`
+ * @param dict options  Optional parameters: hidden, level, collapsed.
+ *
+ * The `set_column()`  method can be used to change the default properties of a
+ * single column or a range of columns:
+ *
+ * @code
+ *     worksheet:set_column(1, 3, 30); // Width of columns B:D set to 30.
+ *
+ * @endcode
+ *
+ * If `set_column()` is applied to a single column the value of `first_col`
+ * and `last_col` should be the same:
+ *
+ * @code
+ *     worksheet:set_column(1, 1, 30); // Width of column B set to 30.
+ *
+ * @endcode
+ *
+ * It is also possible, and generally clearer, to specify a column range using the
+ * form of A1 notation used for columns. See :ref:`cell_notation` for more
+ * details.
+ *
+ * Examples:
+ *
+ * @code
+ *     worksheet:set_column(0, 0, 20);  // Column  A   width set to 20.
+ *     worksheet:set_column(1, 3, 30);  // Columns B-D width set to 30.
+ *     worksheet:set_column("E:E", 20); // Column  E   width set to 20.
+ *     worksheet:set_column("F:H", 30); // Columns F-H width set to 30.
+ *
+ * @endcode
+ *
+ * The width corresponds to the column width value that is specified in Excel. It
+ * is approximately equal to the length of a string in the default font of
+ * Calibri 11. Unfortunately, there is no way to specify "AutoFit" for a column
+ * in the Excel file format. This feature is only available at runtime from
+ * within Excel. It is possible to simulate "AutoFit" by tracking the width of
+ * the data in the column as your write it.
+ *
+ * As usual the `format` :ref:`Format <format>`  parameter is optional. If
+ * you wish to set the format without changing the width you can pass `None` as
+ * the width parameter:
+ *
+ * @code
+ *     format = workbook:add_format({bold = true});
+ *
+ *     worksheet:set_column(0, 0, None, format);
+ *
+ * @endcode
+ *
+ * The `format` parameter will be applied to any cells in the column that
+ * don't have a format. For example:
+ *
+ * @code
+ *     worksheet:set_column("A:A", None, format1); // Col 1 has format1.
+ *
+ *     worksheet:write(0, 0, "Hello");             // Cell A1 defaults to format1.
+ *     worksheet:write(1, 0, "Hello", format2);    // Cell A2 keeps format2.
+ *
+ * @endcode
+ *
+ * A  row format takes precedence over a default column format:
+ *
+ * @code
+ *     worksheet:set_row(0, None, format1);        // Set format for row 1.
+ *     worksheet:set_column("A:A", None, format2); // Set format for col 1.
+ *
+ *     worksheet:write(0, 0, "Hello");             // Defaults to format1
+ *     worksheet:write(1, 0, "Hello");             // Defaults to format2
+ *
+ * @endcode
+ *
+ * The `options` parameter is a dictionary with the following possible keys:
+ *
+ * * `"hidden"`
+ * * `"level"`
+ * * `"collapsed"`
+ *
+ * Options can be set as follows:
+ *
+ * @code
+ *     worksheet:set_column("D:D", 20, format, {hidden = 1});
+ *
+ *     // Or use defaults for other properties and set the options only.
+ *     worksheet:set_column("E:E", None, None, {hidden = 1});
+ *
+ * @endcode
+ *
+ * The `"hidden"` option is used to hide a column. This can be used, for
+ * example, to hide intermediary steps in a complicated calculation:
+ *
+ * @code
+ *     worksheet:set_column("D:D", 20,  format, {hidden = 1});
+ *
+ * @endcode
+ *
+ * The `"level"` parameter is used to set the outline level of the column.
+ * Outlines are described in :ref:`outlines`. Adjacent columns with the same
+ * outline level are grouped together into a single outline.
+ *
+ * The following example sets an outline level of 1 for columns B to G:
+ *
+ * @code
+ *     worksheet:set_column("B:G", None, None, {level = 1});
+ *
+ * @endcode
+ *
+ * Excel allows up to 7 outline levels. The `"level"` parameter should be in the
+ * range `0 <= level <= 7`.
+ *
+ * The `"hidden"` parameter can also be used to hide collapsed outlined columns
+ * when used in conjunction with the `"level"` parameter:
+ *
+ * @code
+ *     worksheet:set_column("B:G", None, None, {hidden = 1, level = 1});
+ *
+ * @endcode
+ *
+ * The `"collapsed"` parameter is used in collapsed outlines to indicate which
+ * column has the collapsed `'+'` symbol:
+ *
+ * @code
+ *     worksheet:set_column("H:H", None, None, {collapsed = 1});
+ *
+ * @endcode
+ *
+ * worksheet:insert_image()
+ */
+
+ *
+/**
+ * @brief Write a string to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param image       Image filename (with path if required).
+ * @param options     Optional parameters for image position, scale and url.
+ *
+ * This method can be used to insert a image into a worksheet: The image can be in
+ * PNG, JPEG or BMP format:
+ *
+ * @code
+ *     worksheet:insert_image("B2", "python.png");
+ *
+ * @endcode
+ *
+ * @image html insert_image.png
+ *
+ * A file path can be specified with the image name:
+ *
+ * @code
+ *     worksheet1.insert_image("B10", "../images/python.png");
+ *     worksheet2.insert_image("B20", r"c:\images\python.png");
+ *
+ * @endcode
+ *
+ * The `insert_image()` method takes optional parameters in a dictionary to
+ * position and scale the image. The available parameters with their default
+ * values are:
+ *
+ * @code
+ *     {
+ *         x_offset = 0,
+ *         y_offset = 0,
+ *         x_scale =  1,
+ *         y_scale =  1,
+ *         url =      None,
+ *         tip =      None,
+ *     }
+ *
+ * @endcode
+ *
+ * The offset values are in pixels:
+ *
+ * @code
+ *     worksheet1.insert_image("B2", "python.png", {x_offset = 15, y_offset = 10});
+ *
+ * @endcode
+ *
+ * The offsets can be greater than the width or height of the underlying cell.
+ * This can be occasionally useful if you wish to align two or more images
+ * relative to the same cell.
+ *
+ * The `x_scale` and `y_scale` parameters can be used to scale the image
+ * horizontally and vertically:
+ *
+ * @code
+ *     worksheet:insert_image("B3", "python.png", {x_scale = 0.5, y_scale = 0.5});
+ *
+ * @endcode
+ *
+ * The `url` parameter can used to add a hyperlink/url to the image. The `tip`
+ * parameter gives an option mouseover tooltip for images with hyperlinks:
+ *
+ * @code
+ *     worksheet:insert_image("By", "python.png", {url = "http://python.org"});
+ *
+ * @endcode
+ *
+ * See also worksheet_write_url() for details on supported URIs.
+ *
+ * .. Note::
+ *   The scaling of a image may be affected if is crosses a row that has its
+ *   default height changed due to a font that is larger than the default font
+ *   size or that has text wrapping turned on. To avoid this you should
+ *   explicitly set the height of the row using `set_row()` if it crosses an
+ *   inserted image.
+ *
+ * Inserting images into headers or a footers isn't supported.
+ *
+ * BMP images are only supported for backward compatibility. In general it is best
+ * to avoid BMP images since they aren't compressed. If used, BMP images must be
+ * 24 bit, true colour, bitmaps.
+ *
+ * See also :ref:`ex_insert_image`.
+ *
+ * worksheet:insert_chart()
+ */
+
+ *
+/**
+ * @brief Write a string to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param chart       A chart object.
+ * @param options     Optional parameters to position and scale the chart.
+ *
+ * This method can be used to insert a chart into a worksheet: A chart object is
+ * created via the Workbook :func:`add_chart()` method where the chart type is
+ * specified:
+ *
+ * @code
+ *     chart = workbook:add_chart({type, "column"});
+ *
+ * @endcode
+ *
+ * It is then inserted into a worksheet as an embedded chart:
+ *
+ * @code
+ *     worksheet:insert_chart("B5", chart);
+ *
+ * @endcode
+ *
+ * @image html chart_simple.png
+ *    :scale: 75 %
+ *
+ * See :ref:`chart_class`, :ref:`working_with_charts` and :ref:`chart_examples`.
+ *
+ * The `insert_chart()` method takes optional parameters in a dictionary to
+ * position and scale the chart. The available parameters with their default
+ * values are:
+ *
+ * @code
+ *     {
+ *         x_offset = 0,
+ *         y_offset = 0,
+ *         x_scale =  1,
+ *         y_scale =  1,
+ *     }
+ *
+ * @endcode
+ *
+ * The offset values are in pixels:
+ *
+ * @code
+ *     worksheet:insert_chart("B5", chart, {x_offset = 25, y_offset = 10});
+ *
+ * @endcode
+ *
+ * The `x_scale` and `y_scale` parameters can be used to scale the chart
+ * horizontally and vertically:
+ *
+ * @code
+ *     worksheet:insert_chart("B5", chart, {x_scale = 0.5, y_scale = 0.5});
+ *
+ * @endcode
+ *
+ * These properties can also be set via the Chart set_size() method.
+ *
+ * .. Note::
+ *   The scaling of a chart may be affected if is crosses a row that has its
+ *   default height changed due to a font that is larger than the default font
+ *   size or that has text wrapping turned on. To avoid this you should
+ *   explicitly set the height of the row using `set_row()` if it crosses an
+ *   inserted chart.
+ *
+ *
+ * worksheet:data_validation()
+ */
+
+ *
+/**
+ * @brief  *
+ *    Write a conditional format to range of cells.
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ * @param options     Data validation options.
+ *
+ *
+ * The `data_validation()` method is used to construct an Excel data validation
+ * or to limit the user input to a dropdown list of values:
+ *
+ * @code
+ *     worksheet:data_validation("B3", {validate = "integer",
+ *                                      criteria = "between",
+ *                                      minimum = 1,
+ *                                      maximum = 10});
+ *
+ *
+ *     worksheet:data_validation("B13", {validate = "list",
+ *                                       source = ["open", "high", "close"]});
+ *
+ * @endcode
+ *
+ * @image html data_validate1.png
+ *
+ * The data validation can be applied to a single cell or a range of cells. As
+ * usual you can use A1 or Row/Column notation, see :ref:`cell_notation`.
+ *
+ * With Row/Column notation you must specify all four cells in the range:
+ * `(first_row, first_col, last_row, last_col)`. If you need to refer to a
+ * single cell set the `last_` values equal to the `first_` values. With A1
+ * notation you can refer to a single cell or a range of cells:
+ *
+ * @code
+ *     worksheet:data_validation(0, 0, 4, 1, {...});
+ *     worksheet:data_validation("B1",       {...});
+ *     worksheet:data_validation("C1:E5",    {...});
+ *
+ *
+ * @endcode
+ *
+ * The options parameter in `data_validation()` must be a dictionary containing
+ * the parameters that describe the type and style of the data validation. There
+ * are a lot of available options which are described in detail in a separate
+ * section: :ref:`working_with_data_validation`. See also :ref:`ex_data_valid`.
+ *
+ *
+ *
+ * worksheet:conditional_format()
+ */
+
+ *
+/**
+ * @brief  *
+ *    Write a conditional format to range of cells.
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ * @param options     Conditional formatting options.
+ *
+ * The `conditional_format()` method is used to add formatting to a cell or
+ * range of cells based on user defined criteria:
+ *
+ * @code
+ *     worksheet:conditional_format("B3:K12", {type =     "cell",
+ *                                             criteria = ">=",
+ *                                             value =    50,
+ *                                             format =   format1});
+ *
+ * @endcode
+ *
+ * @image html conditional_format1.png
+ *
+ * The conditional format can be applied to a single cell or a range of cells. As
+ * usual you can use A1 or Row/Column notation, see :ref:`cell_notation`.
+ *
+ * With Row/Column notation you must specify all four cells in the range:
+ * `(first_row, first_col, last_row, last_col)`. If you need to refer to a
+ * single cell set the `last_` values equal to the `first_` values. With A1
+ * notation you can refer to a single cell or a range of cells:
+ *
+ * @code
+ *     worksheet:conditional_format(0, 0, 4, 1, {...});
+ *     worksheet:conditional_format("B1",       {...});
+ *     worksheet:conditional_format("C1:E5",    {...});
+ *
+ *
+ * @endcode
+ *
+ * The options parameter in `conditional_format()` must be a dictionary
+ * containing the parameters that describe the type and style of the conditional
+ * format. There are a lot of available options which are described in detail in
+ * a separate section: :ref:`working_with_conditional_formats`. See also
+ * :ref:`ex_cond_format`.
+ *
+ *
+ * worksheet:add_table()
+ */
+
+ *
+/**
+ * @brief Add an Excel table to a worksheet:
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ * @param options     Table formatting options. (Optional)
+ *
+ *
+ * The `add_table()` method is used to group a range of cells into an Excel
+ * Table:
+ *
+ * @code
+ *     worksheet:add_table("B3:F7", { ... });
+ *
+ * @endcode
+ *
+ * This method contains a lot of parameters and is described in :ref:`tables`.
+ *
+ * See also :ref:`ex_tables`.
+ *
+ *
+ * worksheet:add_sparkline()
+ */
+
+ *
+/**
+ * @brief Add sparklines to a worksheet:
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int row    The zero indexed row number.
+ * @param int col    The zero indexed column number.
+ * @param dict options Sparkline formatting options.
+ *
+ *
+ * Sparklines are small charts that fit in a single cell and are used to show
+ * trends in data.
+ *
+ * @image html sparklines1.png
+ *
+ * The `add_sparkline()` worksheet method is used to add sparklines to a cell or
+ * a range of cells:
+ *
+ * @code
+ *     worksheet:add_sparkline("F1", {range = "A1:E1"});
+ *
+ * @endcode
+ *
+ * This method contains a lot of parameters and is described in detail in
+ * :ref:`sparklines`.
+ *
+ *
+ *
+ * See also :ref:`ex_sparklines1` and :ref:`ex_sparklines2`.
+ *
+ * .. Note::
+ *    Sparklines are a feature of Excel 2010+ only. You can write them to
+ *    an XLSX file that can be read by Excel 2007 but they won't be displayed.
+ *
+ *
+ * worksheet:worksheet_write_comment()
+ */
+
+ *
+/**
+ * @brief Write a comment to a worksheet cell.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param comment     String to write to cell.
+ * @param options     Comment formatting options..
+ *
+ * The `worksheet_write_comment()` method is used to add a comment to a cell. A comment is
+ * indicated in Excel by a small red triangle in the upper right-hand corner of
+ * the cell. Moving the cursor over the red triangle will reveal the comment.
+ *
+ * The following example shows how to add a comment to a cell:
+ *
+ * @code
+ *     worksheet:write(0, 0, "Hello");
+ *     worksheet:worksheet_write_comment(0, 0, "This is a comment");
+ *
+ * @endcode
+ *
+ * @image html comments1.png
+ *
+ * As usual you can replace the `row` and `col` parameters with an `A1` cell
+ * reference. See :ref:`cell_notation` for more details.
+ *
+ * The properties of the cell comment can be modified by passing an optional
+ * dictionary of key/value pairs to control the format of the comment. For
+ * example:
+ *
+ * @code
+ *     worksheet:worksheet_write_comment("C3", "Hello", {x_scale = 1.2, y_scale = 0.8});
+ *
+ * @endcode
+ *
+ * Most of these options are quite specific and in general the default comment
+ * behaviour will be all that you need. However, should you need greater control
+ * over the format of the cell comment the following options are available:
+ *
+ * @code
+ *     author
+ *     visible
+ *     x_scale
+ *     width
+ *     y_scale
+ *     height
+ *     color
+ *     start_cell
+ *     start_row
+ *     start_col
+ *     x_offset
+ *     y_offset
+ *
+ * @endcode
+ *
+ * For more details see :ref:`cell_comments` and :ref:`ex_comments2` .
+ *
+ * worksheet:show_comments()
+ */
+
+ *
+/**
+ * @brief Make any comments in the worksheet visible.
+ *
+ *
+ * This method is used to make all cell comments visible when a worksheet is
+ * opened:
+ *
+ * @code
+ *     worksheet:show_comments();
+ *
+ * @endcode
+ *
+ * Individual comments can be made visible using the `visible` parameter of the
+ * `worksheet_write_comment` method (see above):
+ *
+ * @code
+ *     worksheet:worksheet_write_comment("C3", "Hello", {visible = true});
+ *
+ * @endcode
+ *
+ * If all of the cell comments have been made visible you can hide individual
+ * comments as follows:
+ *
+ * @code
+ *     worksheet:show_comments();
+ *     worksheet:worksheet_write_comment("C3", "Hello", {visible = false});
+ *
+ * @endcode
+ *
+ * For more details see :ref:`cell_comments` and :ref:`ex_comments2` .
+ *
+ *
+ * worksheet:set_comments_author()
+ */
+
+ *
+/**
+ * @brief Set the default author of the cell comments.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param string author Comment author.
+ *
+ * This method is used to set the default author of all cell comments:
+ *
+ * @code
+ *     worksheet:set_comments_author("John Smith");
+ *
+ * @endcode
+ *
+ * Individual comment authors can be set using the `author` parameter of the
+ * `worksheet_write_comment` method (see above).
+ *
+ * If no author is specified the default comment author name is an empty string.
+ *
+ * For more details see :ref:`cell_comments` and :ref:`ex_comments2` .
+ *
+ *
+ * worksheet:get_name()
+ */
+
+ *
+/**
+ * @brief Retrieve the worksheet name.
+ *
+ *
+ * The `get_name()` method is used to retrieve the name of a worksheet: This is
+ * something useful for debugging or logging:
+ *
+ * @code
+ *     for worksheet in workbook:worksheets():
+ *         print worksheet:get_name();
+ *
+ * @endcode
+ *
+ * There is no `set_name()` method. The only safe way to set the worksheet name
+ * is via the `add_worksheet()` method.
+ *
+ *
+ * worksheet:activate()
+ */
+
+ *
+/**
+ * @brief Make a worksheet the active, i.e., visible worksheet:
+ *
+ *
+ * The `activate()` method is used to specify which worksheet is initially
+ * visible in a multi-sheet workbook:
+ *
+ * @code
+ *     worksheet1 = workbook:add_worksheet();
+ *     worksheet2 = workbook:add_worksheet();
+ *     worksheet3 = workbook:add_worksheet();
+ *
+ *     worksheet3.activate();
+ *
+ * @endcode
+ *
+ * @image html worksheet_activate.png
+ *
+ * More than one worksheet can be selected via the `select()` method, see below,
+ * however only one worksheet can be active.
+ *
+ * The default active worksheet is the first worksheet:
+ *
+ *
+ * worksheet:select()
+ */
+
+ *
+/**
+ * @brief Set a worksheet tab as selected.
+ *
+ *
+ * The `select()` method is used to indicate that a worksheet is selected in a
+ * multi-sheet workbook:
+ *
+ * @code
+ *     worksheet1.activate();
+ *     worksheet2.select();
+ *     worksheet3.select();
+ *
+ * @endcode
+ *
+ * A selected worksheet has its tab highlighted. Selecting worksheets is a way of
+ * grouping them together so that, for example, several worksheets could be
+ * printed in one go. A worksheet that has been activated via the `activate()`
+ * method will also appear as selected.
+ *
+ *
+ * worksheet:hide()
+ */
+
+ *
+/**
+ * @brief Hide the current worksheet:
+ *
+ *
+ * The `hide()` method is used to hide a worksheet:
+ *
+ * @code
+ *     worksheet2.hide();
+ *
+ * @endcode
+ *
+ * You may wish to hide a worksheet in order to avoid confusing a user with
+ * intermediate data or calculations.
+ *
+ * @image html hide_sheet.png
+ *
+ * A hidden worksheet can not be activated or selected so this method is mutually
+ * exclusive with the :func:`activate()` and :func:`select()` methods. In
+ * addition, since the first worksheet will default to being the active
+ * worksheet, you cannot hide the first worksheet without activating another
+ * sheet:
+ *
+ * @code
+ *     worksheet2.activate();
+ *     worksheet1.hide();
+ *
+ * @endcode
+ *
+ * See :ref:`ex_hide_sheet` for more details.
+ *
+ * worksheet:set_first_sheet()
+ */
+
+ *
+/**
+ * @brief Set current worksheet as the first visible sheet tab.
+ *
+ *
+ * The :func:`activate()` method determines which worksheet is initially selected.
+ * However, if there are a large number of worksheets the selected worksheet may
+ * not appear on the screen. To avoid this you can select which is the leftmost
+ * visible worksheet tab using `set_first_sheet()`:
+ *
+ * @code
+ *     for in range(1, 21):
+ *         workbook:add_worksheet
+ *
+ *     worksheet19.set_first_sheet(); // First visible worksheet tab.
+ *     worksheet20.activate();        // First visible worksheet:
+ *
+ * @endcode
+ *
+ * This method is not required very often. The default value is the first
+ * worksheet:
+ *
+ *
+ * worksheet:merge_range()
+ */
+
+ *
+/**
+ * @brief  *
+ *    Merge a range of cells.
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ * @param data        Cell data to write. Variable types.
+ * @param format      Optional Format object. :ref:`Format <format>`
+ *
+ *
+ * The `merge_range()` method allows cells to be merged together so that they
+ * act as a single area.
+ *
+ * Excel generally merges and centers cells at same time. To get similar behaviour
+ * with XlsxWriter you need to apply a :ref:`Format <format>`:
+ *
+ * @code
+ *     merge_format = workbook:add_format({align = "center"});
+ *
+ *     worksheet:merge_range("B3:D4", "Merged Cells", merge_format);
+ *
+ * @endcode
+ *
+ * It is possible to apply other formatting to the merged cells as well:
+ *
+ * @code
+ *     merge_format = workbook:add_format({
+ *         bold =     true,
+ *         border =   6,
+ *         align =    "center",
+ *         valign =   "vcenter",
+ *         fg_color = "#D7E4BC",
+ *     });
+ *
+ *     worksheet:merge_range("B3:D4", "Merged Cells", merge_format);
+ *
+ * @endcode
+ *
+ * @image html merge_range.png
+ *
+ * See :ref:`ex_merge1` for more details.
+ *
+ * The `merge_range()` method writes its `data` argument using
+ * :func:`write()`. Therefore it will handle numbers, strings and formulas as
+ * usual. If this doesn't handle your data correctly then you can overwrite the
+ * first cell with a call to one of the other
+ * `worksheet_write_*()` methods using the same :ref:`Format
+ * <format>` as in the merged cells. See :ref:`ex_merge_rich`.
+ *
+ * @image html merge_rich.png
+ *
+ *
+ * worksheet:autofilter()
+ */
+
+ *
+/**
+ * @brief Set the autofilter area in the worksheet:
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ *
+ * The `autofilter()` method allows an autofilter to be added to a worksheet: An
+ * autofilter is a way of adding drop down lists to the headers of a 2D range of
+ * worksheet data. This allows users to filter the data based on simple criteria
+ * so that some data is shown and some is hidden.
+ *
+ * @image html autofilter3.png
+ *
+ * To add an autofilter to a worksheet:
+ *
+ * @code
+ *     worksheet:autofilter("A1:D11");
+ *     worksheet:autofilter(0, 0, 10, 3)// Same as above.
+ *
+ * @endcode
+ *
+ * Filter conditions can be applied using the :func:`filter_column()` or
+ * :func:`filter_column_list()` methods.
+ *
+ * See :ref:`working_with_autofilters` for more details.
+ *
+ *
+ * worksheet:filter_column()
+ */
+
+ *
+/**
+ * @brief Set the column filter criteria.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int col          Filter column (zero-indexed).
+ * @param string criteria  Filter criteria.
+ *
+ *
+ * The `filter_column` method can be used to filter columns in a autofilter
+ * range based on simple conditions.
+ *
+ *
+ * The conditions for the filter are specified using simple expressions:
+ *
+ * @code
+ *     worksheet:filter_column("A", "x > 2000");
+ *     worksheet:filter_column("B", "x > 2000 and x < 5000");
+ *
+ * @endcode
+ *
+ * The `col` parameter can either be a zero indexed column number or a string
+ * column name.
+ *
+ * It isn't sufficient to just specify the filter condition. You must also hide
+ * any rows that don't match the filter condition. See
+ * :ref:`working_with_autofilters` for more details.
+ *
+ *
+ * worksheet:filter_column_list()
+ */
+
+ *
+/**
+ * @brief Set the column filter criteria in Excel 2007 list style.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int col       Filter column (zero-indexed).
+ * @param list filters  List of filter criteria to match.
+ *
+ * The `filter_column_list()` method can be used to represent filters with
+ * multiple selected criteria:
+ *
+ * @code
+ *     worksheet:filter_column_list("A", "March", "April", "May");
+ *
+ * @endcode
+ *
+ * The `col` parameter can either be a zero indexed column number or a string
+ * column name.
+ *
+ * One or more criteria can be selected:
+ *
+ * @code
+ *     worksheet:filter_column_list("A", "March");
+ *     worksheet:filter_column_list("C", 100, 110, 120, 130);
+ *
+ * @endcode
+ *
+ * It isn't sufficient to just specify filters. You must also hide any rows that
+ * don't match the filter condition. See :ref:`working_with_autofilters` for more
+ * details.
+ *
+ *
+ * worksheet:set_selection()
+ */
+
+/**
+ * @brief Set the selected cell or cells in a worksheet:
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param first_row   The first row of the range. (All zero indexed.)
+ * @param first_col   The first column of the range.
+ * @param last_row    The last row of the range.
+ * @param last_col    The last col of the range.
+ *
+ *
+ * The `set_selection()` method can be used to specify which cell or range of
+ * cells is selected in a worksheet: The most common requirement is to select a
+ * single cell, in which case the `first_` and `last_` parameters should be
+ * the same.
+ *
+ * The active cell within a selected range is determined by the order in which
+ * `first_` and `last_` are specified.
+ *
+ * Examples:
+ *
+ * @code
+ *     worksheet1.set_selection(3, 3, 3, 3); // 1. Cell D4.
+ *     worksheet2.set_selection(3, 3, 6, 6); // 2. Cells D4 to G7.
+ *     worksheet3.set_selection(6, 6, 3, 3); // 3. Cells G7 to D4.
+ *     worksheet4.set_selection("D4");       // Same as 1.
+ *     worksheet5.set_selection("D4:G7");    // Same as 2.
+ *     worksheet6.set_selection("G7:D4");    // Same as 3.
+ *
+ * @endcode
+ *
+ * As shown above, both row-column and A1 style notation are supported. See
+ * :ref:`cell_notation` for more details. The default cell selection is
+ * `(0, 0)`, `0, 0`.
+ *
+ *
+ *
+ * worksheet:freeze_panes()
+ */
+
+ *
+/**
+ * @brief Create worksheet panes and mark them as frozen.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int row    The zero indexed row number.
+ * @param int col    The zero indexed column number.
+ * @param int top_row  Topmost visible row in scrolling region of pane.
+ * @param int left_col Leftmost visible row in scrolling region of pane.
+ *
+ * This `freeze_panes` method can be used to divide a worksheet into horizontal
+ * or vertical regions known as panes and to "freeze" these panes so that the
+ * splitter bars are not visible.
+ *
+ * The parameters `row` and `col` are used to specify the location of the
+ * split. It should be noted that the split is specified at the top or left of a
+ * cell and that the method uses zero based indexing. Therefore to freeze the
+ * first row of a worksheet it is necessary to specify the split at row 2 (which
+ * is 1 as the zero-based index).
+ *
+ * You can set one of the `row` and `col` parameters as zero if you do not
+ * want either a vertical or horizontal split.
+ *
+ * Examples:
+ *
+ * @code
+ *     worksheet:freeze_panes(1, 0); // Freeze the first row.
+ *     worksheet:freeze_panes(1, 0); // Same using A1 notation.
+ *     worksheet:freeze_panes(0, 1); // Freeze the first column.
+ *     worksheet:freeze_panes("B1"); // Same using A1 notation.
+ *     worksheet:freeze_panes(1, 2); // Freeze first row and first 2 columns.
+ *     worksheet:freeze_panes("C2"); // Same using A1 notation.
+ *
+ * @endcode
+ *
+ * The parameters `top_row` and `left_col` are optional. They are used to
+ * specify the top-most or left-most visible row or column in the scrolling
+ * region of the panes. For example to freeze the first row and to have the
+ * scrolling region begin at row twenty:
+ *
+ * @code
+ *     worksheet:freeze_panes(1, 0, 20, 0);
+ *
+ * @endcode
+ *
+ * You cannot use A1 notation for the `top_row` and `left_col` parameters.
+ *
+ * See :ref:`ex_panes` for more details.
+ *
+ *
+ * worksheet:split_panes()
+ */
+
+ *
+/**
+ * @brief Create worksheet panes and mark them as split.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param float x      The position for the vertical split.
+ * @param float y      The position for the horizontal split.
+ * @param int top_row  Topmost visible row in scrolling region of pane.
+ * @param int left_col Leftmost visible row in scrolling region of pane.
+ *
+ * The `split_panes`  method can be used to divide a worksheet into horizontal
+ * or vertical regions known as panes. This method is different from the
+ * `freeze_panes()` method in that the splits between the panes will be visible
+ * to the user and each pane will have its own scroll bars.
+ *
+ * The parameters `y` and `x` are used to specify the vertical and horizontal
+ * position of the split. The units for `y` and `x` are the same as those
+ * used by Excel to specify row height and column width. However, the vertical
+ * and horizontal units are different from each other. Therefore you must specify
+ * the `y` and `x` parameters in terms of the row heights and column widths
+ * that you have set or the default values which are `15` for a row and
+ * `8.43` for a column.
+ *
+ * You can set one of the `y` and `x` parameters as zero if you do not want
+ * either a vertical or horizontal split. The parameters `top_row` and
+ * `left_col` are optional. They are used to specify the top-most or left-most
+ * visible row or column in the bottom-right pane.
+ *
+ * Example:
+ *
+ * @code
+ *     worksheet:split_panes(15, 0);    // First row.
+ *     worksheet:split_panes(0, 8.43);  // First column.
+ *     worksheet:split_panes(15, 8.43); // First row and column.
+ *
+ * @endcode
+ *
+ * You cannot use A1 notation with this method.
+ *
+ * See :ref:`ex_panes` for more details.
+ *
+ *
+ * worksheet:set_zoom()
+ */
+
+ *
+/**
+ * @brief Set the worksheet zoom factor.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param int zoom Worksheet zoom factor.
+ *
+ * Set the worksheet zoom factor in the range `10 <= zoom <= 400`:
+ *
+ * @code
+ *     worksheet1.set_zoom(50);
+ *     worksheet2.set_zoom(75);
+ *     worksheet3.set_zoom(300);
+ *     worksheet4.set_zoom(400);
+ *
+ * @endcode
+ *
+ * The default zoom factor is 100. It isn't possible to set the zoom to
+ * "Selection" because it is calculated by Excel at run-time.
+ *
+ * Note, `set_zoom()` does not affect the scale of the printed page. For that
+ * you should use :func:`set_print_scale()`.
+ *
+ *
+ * worksheet:right_to_left()
+ */
+
+ *
+/**
+ * @brief Display the worksheet cells from right to left for some versions of Excel.
+ *
+ *
+ * The `right_to_left()` method is used to change the default direction of the
+ * worksheet from left-to-right, with the A1 cell in the top left, to
+ * right-to-left, with the A1 cell in the top right.
+ *
+ *     worksheet:right_to_left()
+ *
+ * This is useful when creating Arabic, Hebrew or other near or far eastern
+ * worksheets that use right-to-left as the default direction.
+ *
+ *
+ * worksheet:hide_zero()
+ */
+
+ *
+/**
+ * @brief Hide zero values in worksheet cells.
+ *
+ *
+ * The `hide_zero()` method is used to hide any zero values that appear in
+ * cells:
+ *
+ * @code
+ *     worksheet:hide_zero();
+ *
+ *
+ * @endcode
+ *
+ * worksheet:set_tab_color()
+ */
+
+ *
+/**
+ * @brief Set the colour of the worksheet tab.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param string color The tab color.
+ *
+ * The `set_tab_color()` method is used to change the colour of the worksheet
+ * tab:
+ *
+ * @code
+ *     worksheet1.set_tab_color("red");
+ *     worksheet2.set_tab_color("#FF9900"); // Orange
+ *
+ * @endcode
+ *
+ * The colour can be a Html style `#RRGGBB` string or a limited number named
+ * colours, see :ref:`colors`.
+ *
+ * See :ref:`ex_tab_colors` for more details.
+ *
+ *
+ * worksheet:protect()
+ */
+
+ *
+/**
+ * @brief Set the colour of the worksheet tab.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param string password A worksheet password.
+ * @param dict   options  A dictionary of worksheet options to protect.
+ *
+ *
+ * The `protect()` method is used to protect a worksheet from modification:
+ *
+ * @code
+ *     worksheet:protect();
+ *
+ * @endcode
+ *
+ * The `protect()` method also has the effect of enabling a cell's `locked`
+ * and `hidden` properties if they have been set. A *locked* cell cannot be
+ * edited and this property is on by default for all cells. A *hidden* cell will
+ * display the results of a formula but not the formula itself. These properties
+ * can be set using the set_locked() and set_hidden() format methods.
+ *
+ * You can optionally add a password to the worksheet protection:
+ *
+ * @code
+ *     worksheet:protect("abc123");
+ *
+ * @endcode
+ *
+ * Passing the empty string `""` is the same as turning on protection without a
+ * password.
+ *
+ * You can specify which worksheet elements you wish to protect by passing a
+ * dictionary in the `options` argument with any or all of the following keys:
+ *
+ * @code
+ *     // Default values shown.
+ *     options = {
+ *         objects =               false,
+ *         scenarios =             false,
+ *         format_cells =          false,
+ *         format_columns =        false,
+ *         format_rows =           false,
+ *         insert_columns =        false,
+ *         insert_rows =           false,
+ *         insert_hyperlinks =     false,
+ *         delete_columns =        false,
+ *         delete_rows =           false,
+ *         select_locked_cells =   true,
+ *         sort =                  false,
+ *         autofilter =            false,
+ *         pivot_tables =          false,
+ *         select_unlocked_cells = true,
+ *     }
+ *
+ * @endcode
+ *
+ * The default boolean values are shown above. Individual elements can be
+ * protected as follows:
+ *
+ * @code
+ *     worksheet:protect("acb123", { insert_rows = 1 });
+ *
+ * @endcode
+ *
+ * See also the set_locked() and set_hidden() format methods and
+ * :ref:`ex_protection`.
+ *
+ * .. Note::
+ *    Worksheet level passwords in Excel offer very weak protection. They not
+ *    encrypt your data and are very easy to deactivate. Full workbook encryption
+ *    is not supported by `XlsxWriter` since it requires a completely different
+ *    file format and would take several man months to implement.
+ *
+ *
+ * worksheet:set_default_row()
+ */
+
+ *
+/**
+ * @brief Set the default row properties.
+ *
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param float height          Default height. Optional, defaults to 15.
+ * @param bool hide_unused_rows Hide unused rows. Optional, defaults to false.
+ *
+ *
+ * The `set_default_row()` method is used to set the limited number of default
+ * row properties allowed by Excel which are the default height and the option to
+ * hide unused rows. These parameters are an optimisation used by Excel to set
+ * row properties without generating a very large file with an entry for each row.
+ *
+ * To set the default row height:
+ *
+ * @code
+ *     worksheet:set_default_row(24);
+ *
+ * @endcode
+ *
+ * To hide unused rows:
+ *
+ * @code
+ *     worksheet:set_default_row(hide_unused_rows=true);
+ *
+ * @endcode
+ *
+ * See :ref:`ex_hide_row_col` for more details.
+ *
+ * worksheet:outline_settings()
+ */
+
+ *
+/**
+ * @brief  *
+ *    Control outline settings.
+ *
+ * @param worksheet Pointer to a lxw_worksheet instance..
+ * @param bool visible       Outlines are visible. Optional, defaults to true.
+ * @param bool symbols_below Show row outline symbols below the outline bar.
+ *                               Optional, defaults to true.
+ * @param bool symbols_right Show column outline symbols to the right of the
+ *                               outline bar. Optional, defaults to true.
+ * @param bool auto_style    Use Automatic style. Optional, defaults to false.
+ *
+ *
+ * The `outline_settings()` method is used to control the appearance of outlines
+ * in Excel. Outlines are described in :ref:`outlines`:
+ *
+ * @code
+ *         worksheet1.outline_settings(false, false, false, true);
+ *
+ * @endcode
+ *
+ * The `"visible"` parameter is used to control whether or not outlines are
+ * visible. Setting this parameter to `false` will cause all outlines on the
+ * worksheet to be hidden. They can be un-hidden in Excel by means of the "Show
+ * Outline Symbols" command button. The default setting is `true` for visible
+ * outlines.
+ *
+ * The `"symbols_below"` parameter is used to control whether the row outline
+ * symbol will appear above or below the outline level bar. The default setting
+ * is `true` for symbols to appear below the outline level bar.
+ *
+ * The `"symbols_right"` parameter is used to control whether the column outline
+ * symbol will appear to the left or the right of the outline level bar. The
+ * default setting is `true` for symbols to appear to the right of the outline
+ * level bar.
+ *
+ * The `"auto_style"` parameter is used to control whether the automatic outline
+ * generator in Excel uses automatic styles when creating an outline. This has no
+ * effect on a file generated by `XlsxWriter` but it does have an effect on how
+ * the worksheet behaves after it is created. The default setting is `false`
+ * for "Automatic Styles" to be turned off.
+ *
+ * The default settings for all of these parameters correspond to Excel's default
+ * parameters.
+ *
+ * The worksheet parameters controlled by `outline_settings()` are rarely used.
+ *
+ *
+ *
+ *
diff --git a/docs/src/examples.dox b/docs/src/examples.dox
new file mode 100644
index 00000000..3b6fd7c5
--- /dev/null
+++ b/docs/src/examples.dox
@@ -0,0 +1,95 @@
+/**
+@page examples Example Programs
+
+
+@example hello.c
+The simplest possible program and spreadsheet. This is a good place to
+start to see if the libxlsxwriter library is installed and working
+correctly.
+
+Next example: @ref anatomy.c
+@image html hello01.png
+
+
+@example anatomy.c
+Anatomy of a simple libxlsxwriter program.
+
+Next example: @ref demo.c
+@image html anatomy.png
+
+
+@example demo.c
+A simple example of some of the features of the libxlsxwriter library.
+
+Next example: @ref format_font.c
+@image html demo.png
+
+
+@example format_font.c
+Example of writing some data with font formatting to a simple Excel
+file using libxlsxwriter.
+
+Next example: @ref format_num_format.c
+@image html format_font.png
+
+
+@example format_num_format.c
+Example of writing some data with numeric formatting to a simple Excel
+file using libxlsxwriter.
+
+Next example: @ref tutorial1.c
+@image html format_set_num_format.png
+
+
+@example tutorial1.c
+A tutorial program which is shown, with explanations, in @ref tutorial01.
+
+Next example: @ref tutorial2.c
+@image html tutorial01.png
+
+
+@example tutorial2.c
+A tutorial program which is shown, with explanations, in @ref tutorial02.
+
+Next example: @ref tutorial3.c
+@image html tutorial02.png
+
+
+@example tutorial3.c
+A tutorial program which is shown, with explanations, in @ref tutorial03.
+
+Next example: @ref dates_and_times01.c
+@image html tutorial03.png
+
+
+@example dates_and_times01.c Example of writing a dates and time in Excel
+using a number with date formatting. This demonstrates that dates and times in
+Excel are just formatted real numbers. An easier approach using a lxw_datetime
+struct is shown in the next example.
+
+Next example: @ref dates_and_times02.c.
+@image html date_example01.png
+
+
+@example dates_and_times02.c
+Example of writing dates and times in Excel using an lxw_datetime struct and
+date formatting.
+
+Next example: @ref dates_and_times03.c
+@image html date_example02.png
+
+
+@example dates_and_times03.c
+Example of writing dates and times in Excel using different date formats.
+
+Next example: @ref utf8.c
+@image html date_example03.png
+
+
+@example utf8.c
+A simple Unicode UTF-8 example. Note, the source file is UTF-8 encoded.
+
+
+@image html utf8.png
+
+*/
diff --git a/docs/src/faq.dox b/docs/src/faq.dox
new file mode 100644
index 00000000..f47d9289
--- /dev/null
+++ b/docs/src/faq.dox
@@ -0,0 +1,67 @@
+/**
+
+@page faq Frequently Asked Questions
+
+The section outlines some answers to some frequently asked questions.
+
+### Q. Can Libxlsxwriter use an existing Excel file as a template?
+
+No.
+
+Libxlsxwriter is designed only as a file *writer*. It cannot read or modify
+an existing Excel file.
+
+### Q. Why do my formulas show a zero result in some, non-Excel applications?
+
+Due to wide range of possible formulas and inter-dependencies between them
+`libxlsxwriter` doesn't, and realistically cannot, calculate the result of a
+formula when it is written to an XLSX file. Instead, it stores the value 0 as
+the formula result. It then sets a global flag in the XLSX file to say that
+all formulas and functions should be recalculated when the file is opened.
+
+This is the method recommended in the Excel documentation and in general it
+works fine with spreadsheet applications. However, applications that don't
+have a facility to calculate formulas, such as Excel Viewer, or several mobile
+applications, will only display the 0 results.
+
+If required, it is also possible to specify the calculated result of the
+formula using the worksheet_write_formula_num() function.
+
+
+### Q. Can I apply a format to a range of cells in one go?
+
+Currently no. However, it is a planned features to allow cell formats
+and data to be written separately.
+
+
+### Q. Is Visual C++ on Windows supported?
+
+There is currently no supplied MSVC project files to build the `libxlsxwriter`
+library. However, the source code is ANSI C so it should work with current and
+older versions of MSVC with very minor modifications. (Building the `zlib`
+dependency should also be possible).
+
+If you would like to add MSVC support to libxlsxwriter then open a GitHub
+issue to get a discussion going and send a Pull Request.
+
+
+### Q. Is feature X supported or will it be supported?
+
+All supported features are documented. In time the feature set may expand to
+include more of the functionality of the [Python
+XlsxWriter](http://xlsxwriter.readthedocs.org) module.
+
+### Q. Is there an "AutoFit" option for columns?
+
+Unfortunately, there is no way to specify "AutoFit" for a column in the
+Excel file format. This feature is only available at runtime from within
+Excel. It is possible to simulate "AutoFit" by tracking the width of the
+data in the column as your write it.
+
+### Q. Do people actually ask these questions frequently, or at all?
+
+Apart from this question, yes.
+
+Next: @ref bugs
+
+*/
diff --git a/docs/src/getting_started.dox b/docs/src/getting_started.dox
new file mode 100644
index 00000000..e87469f5
--- /dev/null
+++ b/docs/src/getting_started.dox
@@ -0,0 +1,146 @@
+/**
+@page getting_started Getting Started with libxlsxwriter
+
+
+Here are some instructions to get you up and running with the libxlsxwriter
+library on a Unix system.
+
+For Windows see the @ref faq "FAQ".
+
+
+## Installation
+
+### Install the dependencies
+
+There is only one (non-testing) dependency: `zlib`.
+
+[Zlib](http://www.zlib.net) is required for its shared objects and header
+files. On a Debian Linux system you can install them using `apt-get` as
+follows:
+
+    sudo apt-get install -y zlib1g-dev
+
+On systems without a package manager the following should work:
+
+    curl -O -L  http://zlib.net/zlib-1.2.8.tar.gz
+    tar zxf zlib-1.2.8.tar.gz
+    cd zlib-1.2.8
+
+    ./configure
+    make
+
+    sudo make install
+
+### Clone the libxlsxwriter repository
+
+
+Clone the libxlsxwriter source code repository from GitHub as follows (or
+using your preferred protocol):
+
+    git clone https://github.com/jmcnamara/libxlsxwriter.git
+
+If you prefer you can get a tarball of the latest code:
+
+    curl -O -L http://github.com/jmcnamara/libxlsxwriter/archive/master.tar.gz
+
+### Build the source code
+
+Build the source code as follows:
+
+    cd libxlsxwriter
+    make
+
+This will create a static and dynamic library in the local `./lib` directory:
+
+    ls lib
+    libxlsxwriter.a     libxlsxwriter.so
+
+
+### Try an example
+
+If there weren't any warnings or errors in the previous step (and there
+shouldn't have been) then you can build the programs in the `examples`
+directory and try one of them out:
+
+    make examples
+    ./examples/hello
+
+This will create a `hello_world.xlsx` file in your current directory. Open the
+file as follows, or directly from a spreadsheet application:
+
+     xdg-open hello_world.xlsx  # Linux. Usually.
+     open hello_world.xlsx      # Mac OS X if Excel is installed.
+
+The output should look like this: @image html hello01.png
+
+There is a large range of tests that you can run but they have some additional
+dependencies. If you are interested see @ref running_the_tests.
+
+
+### Install the library
+
+Libxlsxwriter supports a simplified installation scheme for a static and
+dynamic/shared library and header files. The installation has been tested on
+Linux and OS X:
+
+    sudo make install
+
+This isn't fool proof but if it fails on your system you will probably know
+exactly how to fix it or have no idea how to fix it. I'm hoping for the
+former.
+
+## TL;DR
+
+If you prefer to assemble Ikea furniture first and read the instructions later
+then the following minimal set of commands should get you up and going on a
+Debian like system:
+
+    sudo apt-get install -y zlib1g-dev
+    git clone https://github.com/jmcnamara/libxlsxwriter.git
+    cd libxlsxwriter
+    make
+    sudo make install
+
+# Using the library
+
+Using you favourite editor Emacs create a file like the following called
+`myexcel.c`:
+
+@code
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("myexcel.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    int row = 0;
+    int col = 0;
+
+    worksheet_write_string(worksheet, row, col, "Hello me!", NULL);
+
+    return workbook_close(workbook);
+}
+@endcode
+
+If you executed the `"make install"` command in the previous section then you
+should be able to compile the program as follows:
+
+    cc myexcel.c -o myexcel -lxlsxwriter
+
+This will create an executable that you can run to generate an Excel spreadsheet:
+
+    ./myexcel
+    xdg-open myexcel.xlsx
+
+If the installation didn't work for you then you can link against the static
+library you created in the "Build the source code" step:
+
+    cc myexcel.c -o myexcel -I /path/to/libxlsxwriter/include /path/to/libxlsxwriter/lib/libxlsxwriter.a -lz
+
+And that's it! In the next sections we will look at some more detailed
+examples.
+
+Next: @ref tutorial01
+
+
+*/
diff --git a/docs/src/introduction.dox b/docs/src/introduction.dox
new file mode 100644
index 00000000..4973125e
--- /dev/null
+++ b/docs/src/introduction.dox
@@ -0,0 +1,37 @@
+/**
+
+@page introduction Introduction
+
+<b>libxlsxwriter</b> is a C library for writing files in the Excel 2007+ XLSX
+file format.
+
+It can be used to write text, numbers, and formulas to multiple
+worksheets and it supports features such as formatting.
+
+The main advantages of using `libxlsxwriter` are:
+
+-   It has a high degree of fidelity with files produced by Excel. In
+    most cases the files produced are 100% equivalent to files
+    produced by Excel.
+-   It has extensive documentation, example files and tests.
+
+However:
+
+-   It can only create **new files**. It cannot read or modify
+    existing files.
+
+Libxlsxwriter is a C port of the Perl
+[Excel::Writer::XLSX](http://search.cpan.org/~jmcnamara/Excel-Writer-XLSX/)
+module and the Python [XlsxWriter](http://xlsxwriter.readthedocs.org) module
+and is licensed under a FreeBSD @ref license.
+
+
+@note
+
+The 0.0.1 version of libxlsxwriter should be considered as a beta. In
+particular it has some known performance/memory limitations that will be fixed
+in the next releases.
+
+Next: @ref getting_started
+
+*/
diff --git a/docs/src/license.dox b/docs/src/license.dox
new file mode 100644
index 00000000..8bc8f61c
--- /dev/null
+++ b/docs/src/license.dox
@@ -0,0 +1,94 @@
+/**
+
+@page license License
+
+Libxlsxwriter is released under a FreeBSD license:
+
+    Copyright (c) 2013, John McNamara <jmcnamara@cpan.org>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    The views and conclusions contained in the software and documentation are those
+    of the authors and should not be interpreted as representing official policies,
+    either expressed or implied, of the FreeBSD Project.
+
+
+Libxlsxwriter includes `queue.h` from FreeBSD and the `minizip` component of
+`zlib` which have the following licenses:
+
+
+Queue.h from FreeBSD:
+
+    Copyright (c) 1991, 1993
+     The Regents of the University of California.  All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    4. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+
+Zlib has the following License/Copyright:
+
+    (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+       claim that you wrote the original software. If you use this software
+       in a product, an acknowledgment in the product documentation would be
+       appreciated but is not required.
+    2. Altered source versions must be plainly marked as such, and must not be
+       misrepresented as being the original software.
+    3. This notice may not be removed or altered from any source distribution.
+
+    Jean-loup Gailly        Mark Adler
+    jloup@gzip.org          madler@alumni.caltech.edu
+
+
+Next: @ref changes
+*/
diff --git a/docs/src/mainpage.dox b/docs/src/mainpage.dox
new file mode 100644
index 00000000..2e851297
--- /dev/null
+++ b/docs/src/mainpage.dox
@@ -0,0 +1,43 @@
+/**
+@mainpage Creating Excel files with C and libxlsxwriter
+
+<b>Libxlsxwriter</b> is a C library for creating Excel XLSX files.
+
+@image html demo.png
+
+@ref demo.c "(Sample code to create the above spreadsheet.)"
+
+@section mainpage_intro libxlsxwriter
+
+Libxlsxwriter is a C library that can be used to write text, numbers and
+formulas to multiple worksheets in an Excel 2007+ XLSX file. It supports
+features such as:
+
+- 100% compatible Excel XLSX files
+- Full formatting
+- Source code available on [GitHub](https://github.com/jmcnamara/libxlsxwriter)
+- FreeBSD @ref license
+- ANSI C
+- Works with GCC 4.4, 4.6, 4.7, 4.8, tcc and clang
+- Works on Linux and OS X.
+- The only dependency is on `zlib`
+
+This document explains how to use the libxlsxwriter library. See the
+following sections for more information:
+
+- @ref introduction
+- @ref getting_started
+- @ref tutorial01
+- @ref tutorial02
+- @ref tutorial03
+- @ref workbook.h  "The Workbook object"
+- @ref worksheet.h "The Worksheet object"
+- @ref format.h    "The Format object"
+- @ref working_with_colors
+- @ref working_with_dates
+- @ref examples
+- @ref author
+- @ref license
+- @ref changes
+
+*/
diff --git a/docs/src/running_the_tests.dox b/docs/src/running_the_tests.dox
new file mode 100644
index 00000000..1dead2c8
--- /dev/null
+++ b/docs/src/running_the_tests.dox
@@ -0,0 +1,113 @@
+///
+///@page running_the_tests Running the Test Suite
+///
+///
+///This section shows how to set up and run the test suite for libxlsxwriter.
+///
+///## Functional Tests
+///
+///The functional tests compare the output from libxlsxwriter against xlsx files
+///created in Excel.
+///
+///
+///The functional tests use the Python module [pytest](http://pytest.org/) as a
+///test runner.
+///
+///Install the `pytest` module using one of the following methods:
+///
+///    sudo apt-get install -y python-pytest
+///    # or
+///    sudo easy_install pytest
+///    # or
+///    sudo pip install pytest
+///
+///The functional tests can then be run:
+///
+///    $ cd libxlsxwriter
+///
+///    $ make test_functional
+///
+///    =========================== test session starts ===========================
+///    collected 14 items
+///
+///    test/functional/test_formatting.py:16: TestCompareXLSXFiles.test_format01 PASSED
+///    test/functional/test_formatting.py:19: TestCompareXLSXFiles.test_format02 PASSED
+///    test/functional/test_formatting.py:24: TestCompareXLSXFiles.test_format06 PASSED
+///    ...
+///    test/functional/test_write_data.py:25: TestCompareXLSXFiles.test_data04 PASSED
+///    test/functional/test_write_data.py:28: TestCompareXLSXFiles.test_data05 PASSED
+///    test/functional/test_write_data.py:31: TestCompareXLSXFiles.test_data06 PASSED
+///    test/functional/test_write_data.py:34: TestCompareXLSXFiles.test_data07 PASSED
+///    =========================== 14 passed in 0.41 seconds =====================
+///
+///
+///## Unit Tests
+///
+///The unit tests test the components of the library at the level of individual
+///functions or compilation units.
+///
+///The unit tests require the [googletest](https://code.google.com/p/googletest/)
+///test framework. There isn't a default installation method for `googletest` but
+///the following method from
+///[StackOverflow](http://stackoverflow.com/questions/13513905/how-to-properly-setup-googletest-on-linux)
+///works on Linux and OS X:
+///
+///    wget http://googletest.googlecode.com/files/gtest-1.7.0.zip
+///    unzip gtest-1.7.0.zip
+///    cd gtest-1.7.0
+///    ./configure
+///    make
+///
+///    sudo cp -a include/gtest /usr/include
+///    sudo cp -a lib/.libs/* /usr/lib/
+///
+///The unit tests can then be run as follows. Note, the compilation of the unit tests can take some time:
+///
+///    $ make test_unit
+///
+///    Compiling unit tests ...
+///    Running main() from gtest_main.cc
+///    [==========] Running 146 tests from 10 test cases.
+///    [----------] Global test environment set-up.
+///    [----------] 9 tests from utility
+///    [ RUN      ] utility._datetime_date_and_time
+///    [       OK ] utility._datetime_date_and_time (0 ms)
+///    [ RUN      ] utility._datetime_date_only
+///    [       OK ] utility._datetime_date_only (0 ms)
+///    ...
+///    [ RUN      ] styles.write_xf33
+///    [       OK ] styles.write_xf33 (0 ms)
+///    [ RUN      ] styles.write_xf34
+///    [       OK ] styles.write_xf34 (1 ms)
+///    [ RUN      ] styles.write_xf35
+///    [       OK ] styles.write_xf35 (0 ms)
+///    [ RUN      ] styles.write_xf36
+///    [       OK ] styles.write_xf36 (0 ms)
+///    [ RUN      ] styles.xml_declaration
+///    [       OK ] styles.xml_declaration (0 ms)
+///    [----------] 74 tests from styles (17 ms total)
+///
+///    [----------] Global test environment tear-down
+///    [==========] 146 tests from 10 test cases ran. (33 ms total)
+///    [  PASSED  ] 146 tests.
+///
+///
+///Both functional and unit test can be run together:
+///
+///    $ make test
+///
+///
+///## Valgrind Tests
+///
+///The functional tests and examples can be run under
+///[Valgrind](http://valgrind.org) to verify that there are no memory leaks.
+///
+///Install `valgrind` as follows:
+///
+///    apt-get install -y valgrind
+///
+///Then run the tests:
+///
+///    make test_valgrind
+///
+/// Next: @ref faq
diff --git a/docs/src/tutorial01.dox b/docs/src/tutorial01.dox
new file mode 100644
index 00000000..1a7959b5
--- /dev/null
+++ b/docs/src/tutorial01.dox
@@ -0,0 +1,112 @@
+/**
+@page tutorial01 Tutorial 1: Create a simple XLSX file
+
+
+Let's start by creating a simple spreadsheet using C and the
+@c libxlsxwriter library.
+
+Say that we have some data on monthly outgoings that we want to convert
+into an Excel XLSX file:
+
+Item  | Cost
+----- | ---:
+Rent  | 1000
+Gas   |  100
+Food  |  300
+Gym   |   50
+
+To do that we can start with a small program like the following:
+
+@dontinclude tutorial1.c
+@skip include
+@until };
+@until };
+@until }
+@until }
+
+
+If we run this program we should get a spreadsheet that looks like this:
+
+@image html tutorial01.png
+
+This is a simple example but the steps involved are representative of
+all programs that use @c libxlsxwriter, so let's break it down into separate
+parts.
+
+The first step is to include the header for the library:
+
+@dontinclude tutorial1.c
+@skipline include
+
+Then we need some data to add to the spreadsheet. For the sake of this example
+we create and initialise some simple data structures. In a real application
+the input data might come from a database or a file.
+
+@dontinclude tutorial1.c
+@skipline struct
+@until };
+@until };
+
+
+The next step is to create a workbook object in a @c main block or
+function using the new_workbook() function which takes the filename
+that we want to create:
+
+@dontinclude tutorial1.c
+@skipline new_workbook
+
+
+The workbook object is then used to add a new worksheet via the
+workbook_add_worksheet() function:
+
+@dontinclude tutorial1.c
+@skipline add_worksheet
+
+If a `NULL` pointer is used for the worksheet name then a default name will be
+supplied using the Excel convention of `Sheet1`, `Sheet2`, etc. However we can
+also specify a name:
+
+@code
+    worksheet = workbook_add_worksheet(workbook, NULL  );  // Defaults to Sheet1.
+    worksheet = workbook_add_worksheet(workbook, "Data");  // Data.
+    worksheet = workbook_add_worksheet(workbook, NULL  );  // Defaults to Sheet3.
+@endcode
+
+We can then use the worksheet object to write data via the
+worksheet_write_string() and worksheet_write_number() functions:
+
+@code
+    worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
+    worksheet_write_number(worksheet, 1, 0, 1234.56, NULL);
+@endcode
+
+@note
+Rows and columns are zero indexed throughout the libxlsxwriter API. Thus, the
+first cell in a worksheet, `A1`, is equivalent to `(0, 0)`.
+
+So in our example we iterate over our data and write it out as follows:
+
+@dontinclude tutorial1.c
+@skipline for
+@until }
+
+We then add a formula to calculate the total of the items in the second
+column:
+
+@dontinclude tutorial1.c
+@skipline write_formula
+
+Finally, we close the Excel file via the close method:
+
+@dontinclude tutorial1.c
+@skipline close
+
+And that's it. We now have a file that can be read by Excel and other
+spreadsheet applications.
+
+In the next sections we will see how we can use the @c libxlsxwriter module
+to add formatting and other Excel features.
+
+Next: @ref tutorial02.
+
+*/
diff --git a/docs/src/tutorial02.dox b/docs/src/tutorial02.dox
new file mode 100644
index 00000000..f048c9b1
--- /dev/null
+++ b/docs/src/tutorial02.dox
@@ -0,0 +1,54 @@
+/**
+@page tutorial02 Tutorial 2: Adding formatting to the XLSX File
+
+
+In the previous section we created a simple spreadsheet using C and
+the @c libxlsxwriter library.
+
+This converted the required data into an Excel file but it looked a
+little bare. In order to make the information clearer we would like to
+add some simple formatting, like this:
+
+@image html tutorial02.png
+
+The differences here are that we have added **Item** and **Cost** column
+headers in a bold font, we have formatted the currency in the second
+column and we have made the **Total** string bold.
+
+To do this we can extend our program as follows:
+
+@dontinclude tutorial2.c
+@skip include
+@until };
+@until };
+@until }
+@until }
+
+The main difference between this and the previous program is that we have
+added two @ref format.h "Format" objects that we can use to format cells in
+the spreadsheet.
+
+Format objects represent all of the formatting properties that can be applied
+to a cell in Excel such as fonts, number formatting, colors and borders. This
+is explained in more detail in @ref format.h "The Format object" and @ref
+working_with_formats.
+
+For now we will avoid getting into the details and just use a limited
+amount of the format functionality to add some simple formatting:
+
+@dontinclude tutorial2.c
+@skipline bold
+@until num_format
+
+We can then pass these formats as a parameter to the `worksheet_write*()`
+functions to format the data in the cell:
+
+@dontinclude tutorial2.c
+@skipline Total
+@skipline SUM
+
+In the next section we will look at handling more data types.
+
+Next: @ref tutorial03.
+
+*/
diff --git a/docs/src/tutorial03.dox b/docs/src/tutorial03.dox
new file mode 100644
index 00000000..84eeabcc
--- /dev/null
+++ b/docs/src/tutorial03.dox
@@ -0,0 +1,90 @@
+/**
+@page tutorial03 Tutorial 3: Writing different types of data to the XLSX File
+
+
+In the previous section we created a simple spreadsheet with formatting
+using C and the @c libxlsxwriter module.
+
+This time let's extend the data we want to write to include some dates:
+
+Item | Date       | Cost
+---- | ---------- | ---:
+Rent | 2013-01-13 | 1000
+Gas  | 2013-01-14 |  100
+Food | 2013-01-16 |  300
+Gym  | 2013-01-20 |   50
+
+
+The corresponding spreadsheet will look like this:
+
+@image html tutorial03.png
+
+The differences here are that we have added a Date column with
+formatting and made that column a little wider to accommodate the dates.
+
+To do this we can extend our program as follows:
+
+@dontinclude tutorial3.c
+@skip include
+@until };
+@until };
+@until }
+@until }
+
+The main difference between this and the previous program is that we have
+added a new @ref format.h "Format" object for dates and we have additional
+handling for the date information.
+
+We have also extended the data that we are going to write to include a
+lxw_datetime struct to hold the date information. We will see how that is used
+shortly.
+
+@dontinclude tutorial3.c
+@skipline struct
+@until };
+@until };
+
+
+
+Excel treats different types of input data, such as strings and numbers,
+differently although it generally does it transparently to the user.
+Libxlsxwriter tries to emulate this in the `worksheet_write*()` functions by
+mapping C data types to types that Excel supports.
+
+- worksheet_write_string()
+- worksheet_write_number()
+- worksheet_write_formula()
+- worksheet_write_datetime()
+- worksheet_write_blank()
+
+In this version of our program we have used some of these functions for
+different types of data:
+
+@dontinclude tutorial3.c
+@skipline expenses[i].item
+@until    expenses[i].cost
+
+The handling of dates is also new to our program.
+
+Dates and times in Excel are floating point numbers that have a number format
+applied to display them in the correct format. Libxlsxwriter provides the
+worksheet_write_datetime() and the lxw_datetime struct help to convert dates
+and times into Excel date and time numbers.
+
+The worksheet_write_datetime() function converts the lxw_datetime struct to a
+number that represents an Excel date but we also need to add the number format
+to ensure that Excel displays it as as date:
+
+@dontinclude tutorial3.c
+@skipline yyyy
+
+Date handling is explained in more detail in @ref working_with_dates.
+
+That completes the tutorial section.
+
+In the next sections we will look at the API in more detail starting
+with workbook.
+
+Next: @ref workbook.h "The Workbook object"
+
+*/
diff --git a/docs/src/working_with_colors.dox b/docs/src/working_with_colors.dox
new file mode 100644
index 00000000..657bd47b
--- /dev/null
+++ b/docs/src/working_with_colors.dox
@@ -0,0 +1,42 @@
+/**
+@page working_with_colors Working with Colors
+
+Throughout libxlsxwriter colors are specified using a Html style RGB
+integer value. For example with a Format object:
+
+@code
+    format_set_font_color(format, 0x3030E0);
+@endcode
+
+For convenience a limited number of color names are supported:
+
+@code
+    format_set_font_color(format, LXW_COLOR_RED);
+@endcode
+
+The color names and corresponding RRGGBB value are shown below:
+
+
+  Color    | Define                | Value
+  -------- | --------------------- | ---------
+  Black    | #LXW_COLOR_BLACK      | `0x000000`
+  Blue     | #LXW_COLOR_BLUE       | `0x0000FF`
+  Brown    | #LXW_COLOR_BROWN      | `0x800000`
+  Cyan     | #LXW_COLOR_CYAN       | `0x00FFFF`
+  Gray     | #LXW_COLOR_GRAY       | `0x808080`
+  Green    | #LXW_COLOR_GREEN      | `0x008000`
+  Lime     | #LXW_COLOR_LIME       | `0x00FF00`
+  Magenta  | #LXW_COLOR_MAGENTA    | `0xFF00FF`
+  Navy     | #LXW_COLOR_NAVY       | `0x000080`
+  Orange   | #LXW_COLOR_ORANGE     | `0xFF6600`
+  Pink     | #LXW_COLOR_PINK       | `0xFF00FF`
+  Purple   | #LXW_COLOR_PURPLE     | `0x800080`
+  Red      | #LXW_COLOR_RED        | `0xFF0000`
+  Silver   | #LXW_COLOR_SILVER     | `0xC0C0C0`
+  White    | #LXW_COLOR_WHITE      | `0xFFFFFF`
+  Yellow   | #LXW_COLOR_YELLOW     | `0xFFFF00`
+
+
+Next: @ref working_with_dates
+
+*/
diff --git a/docs/src/working_with_dates.dox b/docs/src/working_with_dates.dox
new file mode 100644
index 00000000..6e5f00a1
--- /dev/null
+++ b/docs/src/working_with_dates.dox
@@ -0,0 +1,80 @@
+/**
+@page working_with_dates Working with Dates and Times
+
+
+Dates and times in Excel are represented by real numbers. For example a date
+that is displayed in Excel as "Jan 1 2013 12:00 PM" is stored as the number
+41275.5.
+
+The integer part of the number stores the number of days since the epoch,
+which is generally 1900, and the fractional part stores the percentage of the
+day.
+
+A date or time in Excel is just like any other number. To display the number
+as a date you must apply an Excel number format to it. Here is an example:
+
+@dontinclude dates_and_times01.c
+@skip include
+@until return
+@until }
+
+@image html date_example01.png
+
+To make working with dates and times a little easier the `libxlsxwriter`
+library provides the lxw_datetime struct and the worksheet_write_datetime()
+function.
+
+The members of the lxw_datetime struct and the range of their values are:
+
+  Member   | Value
+  -------- | -----------
+  year     | 1900 - 9999
+  month    | 1 - 12
+  day      | 1 - 31
+  hour     | 0 - 23
+  min      | 0 - 59
+  sec      | 0 - 59.999
+
+Dates in Excel do not support timezones and the maximum resolution of times is
+milliseconds.
+
+If dates or times are required without the other you should initialise the
+unrequired values to `0`:
+
+@code
+    // Date and time.
+    lxw_datetime datetime1 = {2014, 11, 25, 17, 45, 5.1};
+
+    // Date only.
+    lxw_datetime datetime2 = {2014, 11, 25, 0, 0, 0};
+
+    // Time only.
+    lxw_datetime datetime3 = {0, 0, 0, 17, 45, 5.1};
+@endcode
+
+Using lxw_datetime and worksheet_write_datetime() the previous example can
+then be re-written as follows:
+
+@dontinclude dates_and_times02.c
+@skip include
+@until return
+@until }
+
+The output from this program is the same as the previous example.
+
+@image html date_example02.png
+
+Dates can be formatted using any of the date formats supported by Excel.  Here
+is a longer example that shows the same date in a several different formats:
+
+@dontinclude dates_and_times03.c
+@skip include
+@until return
+@until }
+
+@image html date_example03.png
+
+
+Next: @ref working_with_memory
+
+*/
diff --git a/docs/src/working_with_formats.dox b/docs/src/working_with_formats.dox
new file mode 100644
index 00000000..a649c4d9
--- /dev/null
+++ b/docs/src/working_with_formats.dox
@@ -0,0 +1,146 @@
+/**
+@page working_with_formats Working with Formats
+
+The main functions and properties used to add formatting to a cell are shown
+in @ref format.h "The Format object". This section provides some additional
+information about working with formats.
+
+## Creating and using a Format object
+
+Formats are created by calling the workbook_add_format() method and properties
+as set using the various functions shown below:
+
+@code
+    lxw_format *format = workbook_add_format(workbook);
+
+    format_set_bold(format);
+    format_set_font_color(format, LXW_COLOR_RED);
+@endcode
+
+
+Once a Format object has been created  and its properties have been
+set it can be passed as an argument to the `worksheet_write*()` methods as
+follows:
+
+@code
+    worksheet_write_string(worksheet, 0, 0, "Hello", format);
+    worksheet_write_number(worksheet, 1, 0, 123.456, format);
+@endcode
+
+Formats can also be passed to the worksheet `worksheet_set_row()` and
+`worksheet_set_column()` methods to define the default formatting properties
+for a row or column:
+
+@code
+    # Not implemented in version 0.0.1.
+    worksheet_set_row(worksheet, 2, format)
+    worksheet_set_column(worksheet, 0, 20, format)
+@endcode
+
+
+## Format methods and Format properties
+
+The following table shows the Excel format categories and the equivalent
+`libxlsxwriter` Format function:
+
+  | Category        | Description          |  Method Name                   |
+  | :-------------- | :------------------- |  :---------------------------  |
+  | **Font**        | Font type            |  format_set_font_name()        |
+  |                 | Font size            |  format_set_font_size()        |
+  |                 | Font color           |  format_set_font_color()       |
+  |                 | Bold                 |  format_set_bold()             |
+  |                 | Italic               |  format_set_italic()           |
+  |                 | Underline            |  format_set_underline()        |
+  |                 | Strikeout            |  format_set_font_strikeout()   |
+  |                 | Super/Subscript      |  format_set_font_script()      |
+  | **Number**      | Numeric format       |  format_set_num_format()       |
+  | **Protection**  | Unlock cells         |  format_set_unlocked()         |
+  |                 | Hide formulas        |  format_set_hidden()           |
+  | **Alignment**   | Horizontal align     |  format_set_align()            |
+  |                 | Vertical align       |  format_set_align()            |
+  |                 | Rotation             |  format_set_rotation()         |
+  |                 | Text wrap            |  format_set_text_wrap()        |
+  |                 | Indentation          |  format_set_indent()           |
+  |                 | Shrink to fit        |  format_set_shrink()           |
+  | **Pattern**     | Cell pattern         |  format_set_pattern()          |
+  |                 | Background color     |  format_set_bg_color()         |
+  |                 | Foreground color     |  format_set_fg_color()         |
+  | **Border**      | Cell border          |  format_set_border()           |
+  |                 | Bottom border        |  format_set_bottom()           |
+  |                 | Top border           |  format_set_top()              |
+  |                 | Left border          |  format_set_left()             |
+  |                 | Right border         |  format_set_right()            |
+  |                 | Border color         |  format_set_border_color()     |
+  |                 | Bottom color         |  format_set_bottom_color()     |
+  |                 | Top color            |  format_set_top_color()        |
+  |                 | Left color           |  format_set_left_color()       |
+  |                 | Right color          |  format_set_right_color()      |
+
+
+## Format Colors
+
+Format property colors are specified using a Html style RGB integer value or a
+limited number of defined colors:
+@code
+    format_set_font_color(format1, 0x3030E0);
+    format_set_font_color(format2, LXW_COLOR_RED);
+@endcode
+
+See see @ref working_with_colors for more details.
+
+
+## Format Defaults
+
+The default Excel 2007+ cell format is Calibri 11 with all other properties
+off.
+
+In general a format function call without an argument will turn a property on,
+for example:
+
+@code
+   lxw_format *format = workbook_add_format(workbook);
+
+   format_set_bold(format);
+@endcode
+
+## Modifying and Reusing Formats
+
+Once a format has been created it can be used and reused in
+`worksheet_write*()` functions across any number of worksheets:
+
+@code
+    lxw_format  *myformat1  = workbook_add_format(workbook);
+    format_set_bold(myformat1);
+
+    worksheet_write_string(worksheet1, 1, 4, "Some text", myformat1);
+    worksheet_write_string(worksheet2, 1, 4, "Some text", myformat1);
+@endcode
+
+However, each unique cell format in an `libxlsxwriter` spreadsheet must have a
+corresponding Format object. It isn't possible to use a Format with a
+`worksheet_write*()` method and then redefine it for use at a later
+stage. This is because a Format is applied to a cell not in its current state
+but in its final state. Consider the following example:
+
+@code
+   lxw_format *format = workbook_add_format(workbook);
+   format_set_bold(format);
+
+   worksheet_write_string(worksheet, 0, 0, "Hello", format);
+
+   format_set_italic(format);
+
+   worksheet_write_string(worksheet, 1, 0, "World", format);
+@endcode
+
+
+Cell `(0, 0)` is assigned a format which with the font set to bold. However, the
+italic property is subsequently and used in cell `(1, 0)`. This has the effect
+of adding italic to any previous uses of `format`. The result in this case is
+that "Hello" and "World" will both appear as bold and italic.
+
+
+Next: @ref working_with_colors
+
+
+*/
diff --git a/docs/src/working_with_memory.dox b/docs/src/working_with_memory.dox
new file mode 100644
index 00000000..bf42797a
--- /dev/null
+++ b/docs/src/working_with_memory.dox
@@ -0,0 +1,18 @@
+/**
+@page working_with_memory Working with Memory and Performance
+
+
+By default `libxlsxwriter` holds all cell data in memory. This is to allow
+future features where formatting is applied separately from the data.
+
+The effect of this is that for large files libxlsxwriter can consume a lot of
+memory.
+
+This issue will be resolved in the next 1-2 releases to allow a small constant
+memory usage like in the Perl and Python modules that libxlsxwriter was ported
+from.
+
+Next: @ref examples
+
+
+*/
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 00000000..65421528
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter examples.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Directory variables.
+INC_DIR = ../include
+
+# Flags passed to the C++ compiler.
+CFLAGS += -g -Wall -Wextra
+
+# Source files to compile.
+SRCS = $(wildcard *.c)
+EXES = $(patsubst %.c,%,$(SRCS))
+
+LIBXLSXWRITER = ../src/libxlsxwriter.a
+
+LIBS = $(LIBXLSXWRITER) -lz
+
+all : $(LIBXLSXWRITER) $(EXES)
+
+$(LIBXLSXWRITER):
+	$(Q)make -C ../third_party/minizip
+	$(Q)make -C ../src
+
+clean :
+	$(Q)rm -f $(EXES)
+
+# Executable targets.
+%: %.c $(LIBXLSXWRITER)
+	$(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $< -o $@ $(LIBS)
+
+test_valgrind: all
+	$(Q)for exe in $(EXES); do \
+	    valgrind -q --error-exitcode=1 --leak-check=full ./$$exe; \
+	done
diff --git a/examples/anatomy.c b/examples/anatomy.c
new file mode 100644
index 00000000..8db3d95e
--- /dev/null
+++ b/examples/anatomy.c
@@ -0,0 +1,56 @@
+/*
+ * Anatomy of a simple libxlsxwriter program.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* Create a new workbook. */
+    lxw_workbook  *workbook   = new_workbook("anatomy.xlsx");
+
+    /* Add a worksheet with a user defined sheet name. */
+    lxw_worksheet *worksheet1 = workbook_add_worksheet(workbook, "Demo");
+
+    /* Add a worksheet with Excel's default sheet name: Sheet2. */
+    lxw_worksheet *worksheet2 = workbook_add_worksheet(workbook, NULL);
+
+    /* Add some cell formats. */
+    lxw_format  *myformat1    = workbook_add_format(workbook);
+    lxw_format  *myformat2    = workbook_add_format(workbook);
+
+    /* Set the bold property for the first format. */
+    format_set_bold(myformat1);
+
+    /* Set a number format for the second format. */
+    format_set_num_format(myformat2, "$#,##0.00");
+
+
+    /* Write some unformatted data. */
+    worksheet_write_string(worksheet1, 0, 0, "Peach", NULL);
+    worksheet_write_string(worksheet1, 1, 0, "Plum",  NULL);
+
+    /* Write formatted data. */
+    worksheet_write_string(worksheet1, 2, 0, "Pear",  myformat1);
+
+    /* Formats can be reused. */
+    worksheet_write_string(worksheet1, 3, 0, "Persimmon",  myformat1);
+
+
+    /* Write some numbers. */
+    worksheet_write_number(worksheet1, 5, 0, 123,       NULL);
+    worksheet_write_number(worksheet1, 6, 0, 4567.555,  myformat2);
+
+
+    /* Write to the second worksheet. */
+    worksheet_write_string(worksheet2, 0, 0, "Some text", myformat1);
+
+
+    /* Close the workbook, save the file and free any memory. */
+    workbook_close(workbook);
+
+    return 0;
+}
diff --git a/examples/dates_and_times01.c b/examples/dates_and_times01.c
new file mode 100644
index 00000000..aa0e7e00
--- /dev/null
+++ b/examples/dates_and_times01.c
@@ -0,0 +1,39 @@
+/*
+ * Example of writing a dates and time in Excel using a number with date
+ * formatting. This demonstrates that dates and times in Excel are just
+ * formatted real numbers.
+ *
+ * An easier approach using a lxw_datetime struct is shown in example
+ * dates_and_times02.c.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* A number to display as a date. */
+    double number = 41333.5;
+
+    /* Create a new workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("date_and_times01.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add a format with date formatting. */
+    lxw_format    *format    = workbook_add_format(workbook);
+    format_set_num_format(format, "mmm d yyyy hh:mm AM/PM");
+
+
+    /* Write the number without formatting. */
+    worksheet_write_number(worksheet, 0, 0, number, NULL   );  // 41333.5
+
+    /* Write the number with formatting. Note: the worksheet_write_datetime()
+     * function is preferable for writing dates and times. This is for
+     * demonstration purposes only.
+     */
+    worksheet_write_number(worksheet, 1, 0, number, format);   // Feb 28 2013 12:00 PM
+
+    return workbook_close(workbook);
+}
diff --git a/examples/dates_and_times02.c b/examples/dates_and_times02.c
new file mode 100644
index 00000000..a9ac5e54
--- /dev/null
+++ b/examples/dates_and_times02.c
@@ -0,0 +1,32 @@
+/*
+ * Example of writing dates and times in Excel using an lxw_datetime struct
+ * and date formatting.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* A datetime to display. */
+    lxw_datetime datetime = {2013, 2, 28, 12, 0, 0.0};
+
+    /* Create a new workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("date_and_times02.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add a format with date formatting. */
+    lxw_format    *format    = workbook_add_format(workbook);
+    format_set_num_format(format, "mmm d yyyy hh:mm AM/PM");
+
+
+    /* Write the datetime without formatting. */
+    worksheet_write_datetime(worksheet, 0, 0, &datetime, NULL  );  // 41333.5
+
+    /* Write the datetime with formatting. */
+    worksheet_write_datetime(worksheet, 1, 0, &datetime, format);  // Feb 28 2013 12:00 PM
+
+    return workbook_close(workbook);
+}
diff --git a/examples/dates_and_times03.c b/examples/dates_and_times03.c
new file mode 100644
index 00000000..447ab21d
--- /dev/null
+++ b/examples/dates_and_times03.c
@@ -0,0 +1,67 @@
+/*
+ * Example of writing dates and times in Excel using different date formats.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* A datetime to display. */
+    lxw_datetime datetime = {2013, 1, 23, 12, 30, 5.123};
+    uint32_t 	 row = 0;
+    uint16_t 	 col = 0;
+    int          i;
+
+    /* Examples date and time formats. In the output file compare how changing
+     * the format strings changes the appearance of the date.
+     */
+    char *date_formats[] = {
+        "dd/mm/yy",
+        "mm/dd/yy",
+        "dd m yy",
+        "d mm yy",
+        "d mmm yy",
+        "d mmmm yy",
+        "d mmmm yyy",
+        "d mmmm yyyy",
+        "dd/mm/yy hh:mm",
+        "dd/mm/yy hh:mm:ss",
+        "dd/mm/yy hh:mm:ss.000",
+        "hh:mm",
+        "hh:mm:ss",
+        "hh:mm:ss.000",
+    };
+
+    /* Create a new workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("date_and_times03.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add a bold format. */
+    lxw_format    *bold      = workbook_add_format(workbook);
+    format_set_bold(bold);
+
+    /* Write the column headers. */
+    worksheet_write_string(worksheet, row, col,     "Formatted date", bold);
+    worksheet_write_string(worksheet, row, col + 1, "Format",         bold);
+
+    /* Write the same date and time using each of the above formats. */
+    for (i = 0; i < 14; i++) {
+        row++;
+
+        /* Create a format for the date or time.*/
+        lxw_format *format  = workbook_add_format(workbook);
+        format_set_num_format(format, date_formats[i]);
+        format_set_align(format, LXW_ALIGN_LEFT);
+
+        /* Write the datetime with each format. */
+        worksheet_write_datetime(worksheet, row, col, &datetime, format);
+
+        /* Also write the format string for comparison. */
+        worksheet_write_string(worksheet, row, col + 1, date_formats[i], NULL);
+    }
+
+    return workbook_close(workbook);
+}
diff --git a/examples/demo.c b/examples/demo.c
new file mode 100644
index 00000000..986ec355
--- /dev/null
+++ b/examples/demo.c
@@ -0,0 +1,37 @@
+/*
+ * A simple example of some of the features of the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* Create a new workbook. */
+    lxw_workbook  *workbook  = new_workbook("hello_world.xlsx");
+
+    /* Add a worksheet. */
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add a format. */
+    lxw_format    *format    = workbook_add_format(workbook);
+
+    /* Set the bold property for the format */
+    format_set_bold(format);
+
+    /* Write some simple text. */
+    worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
+
+    /* Text with formatting. */
+    worksheet_write_string(worksheet, 1, 0, "World", format);
+
+    /* Writer some numbers. */
+    worksheet_write_number(worksheet, 1, 0, 123,     NULL);
+    worksheet_write_number(worksheet, 1, 0, 123.456, NULL);
+
+    workbook_close(workbook);
+
+    return 0;
+}
diff --git a/examples/format_font.c b/examples/format_font.c
new file mode 100644
index 00000000..c6901a8f
--- /dev/null
+++ b/examples/format_font.c
@@ -0,0 +1,43 @@
+/*
+ * Example of writing some data with font formatting to a simple Excel
+ * file using libxlsxwriter.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* Create a new workbook. */
+    lxw_workbook  *workbook  = new_workbook("format_font.xlsx");
+
+    /* Add a worksheet. */
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add some formats. */
+    lxw_format    *format1   = workbook_add_format(workbook);
+    lxw_format    *format2   = workbook_add_format(workbook);
+    lxw_format    *format3   = workbook_add_format(workbook);
+
+    /* Set the bold property for format 1. */
+    format_set_bold(format1);
+
+    /* Set the italic property for format 2. */
+    format_set_italic(format2);
+
+    /* Set the bold and italic properties for format 3. */
+    format_set_bold  (format3);
+    format_set_italic(format3);
+
+    /* Write some formatted strings. */
+    worksheet_write_string(worksheet, 0, 0, "This is bold",    format1);
+    worksheet_write_string(worksheet, 1, 0, "This is italic",  format2);
+    worksheet_write_string(worksheet, 2, 0, "Bold and italic", format3);
+
+    /* Close the workbook, save the file and free any memory. */
+    workbook_close(workbook);
+
+    return 0;
+}
diff --git a/examples/format_num_format.c b/examples/format_num_format.c
new file mode 100644
index 00000000..221bba25
--- /dev/null
+++ b/examples/format_num_format.c
@@ -0,0 +1,65 @@
+/*
+ * Example of writing some data with numeric formatting to a simple Excel file
+ * using libxlsxwriter.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    /* Create a new workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("format_num_format.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Add some formats. */
+    lxw_format    *format01   = workbook_add_format(workbook);
+    lxw_format    *format02   = workbook_add_format(workbook);
+    lxw_format    *format03   = workbook_add_format(workbook);
+    lxw_format    *format04   = workbook_add_format(workbook);
+    lxw_format    *format05   = workbook_add_format(workbook);
+    lxw_format    *format06   = workbook_add_format(workbook);
+    lxw_format    *format07   = workbook_add_format(workbook);
+    lxw_format    *format08   = workbook_add_format(workbook);
+    lxw_format    *format09   = workbook_add_format(workbook);
+    lxw_format    *format10   = workbook_add_format(workbook);
+    lxw_format    *format11   = workbook_add_format(workbook);
+
+    /* Set some example number formats. */
+    format_set_num_format(format01, "0.000");
+    format_set_num_format(format02, "#,##0");
+    format_set_num_format(format03, "#,##0.00");
+    format_set_num_format(format04, "0.00");
+    format_set_num_format(format05, "mm/dd/yy");
+    format_set_num_format(format06, "mmm d yyyy");
+    format_set_num_format(format07, "d mmmm yyyy");
+    format_set_num_format(format08, "dd/mm/yyyy hh:mm AM/PM");
+    format_set_num_format(format09, "0 \"dollar and\" .00 \"cents\"");
+
+    /* Write data using the formats. */
+    worksheet_write_number(worksheet, 0, 0, 3.1415926, NULL);      // 3.1415926
+    worksheet_write_number(worksheet, 1, 0, 3.1415926, format01);  // 3.142
+    worksheet_write_number(worksheet, 2, 0, 1234.56,   format02);  // 1,235
+    worksheet_write_number(worksheet, 3, 0, 1234.56,   format03);  // 1,234.56
+    worksheet_write_number(worksheet, 4, 0, 49.99,     format04);  // 49.99
+    worksheet_write_number(worksheet, 5, 0, 36892.521, format05);  // 01/01/01
+    worksheet_write_number(worksheet, 6, 0, 36892.521, format06);  // Jan 1 2001
+    worksheet_write_number(worksheet, 7, 0, 36892.521, format07);  // 1 January 2001
+    worksheet_write_number(worksheet, 8, 0, 36892.521, format08);  // 01/01/2001 12:30 AM
+    worksheet_write_number(worksheet, 9, 0, 1.87,      format09);  // 1 dollar and .87 cents
+
+    /* Show limited conditional number formats. */
+    format_set_num_format(format10, "[Green]General;[Red]-General;General");
+    worksheet_write_number(worksheet, 10, 0, 123, format10);  // > 0 Green
+    worksheet_write_number(worksheet, 11, 0, -45, format10);  // < 0 Red
+    worksheet_write_number(worksheet, 12, 0,   0, format10);  // = 0 Default color
+
+    /* Format a Zip code. */
+    format_set_num_format(format11, "00000");
+    worksheet_write_number(worksheet, 13, 0, 1209, format11);
+    
+    /* Close the workbook, save the file and free any memory. */
+    return workbook_close(workbook);
+}
diff --git a/examples/hello.c b/examples/hello.c
new file mode 100644
index 00000000..fce79e01
--- /dev/null
+++ b/examples/hello.c
@@ -0,0 +1,21 @@
+/*
+ * Example of writing some data to a simple Excel file using libxlsxwriter.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("hello_world.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
+    worksheet_write_number(worksheet, 1, 0, 123, NULL);
+
+    workbook_close(workbook);
+
+    return 0;
+}
diff --git a/examples/tutorial1.c b/examples/tutorial1.c
new file mode 100644
index 00000000..ae2df029
--- /dev/null
+++ b/examples/tutorial1.c
@@ -0,0 +1,50 @@
+/*
+ * A simple program to write some data to an Excel file using the
+ * libxlsxwriter library.
+ *
+ * This program is shown, with explanations, in Tutorial 1 of the
+ * libxlsxwriter documentation.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+/* Some data we want to write to the worksheet. */
+struct expense {
+    char item[32];
+    int  cost;
+};
+
+struct expense expenses[] = {
+    {"Rent", 1000},
+    {"Gas",   100},
+    {"Food",  300},
+    {"Gym",    50},
+};
+
+
+int main() {
+
+    /* Create a workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("tutorial01.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Start from the first cell. Rows and columns are zero indexed. */
+    int row = 0;
+    int col = 0;
+
+    /* Iterate over the data and write it out element by element. */
+    for (row = 0; row < 4; row++) {
+        worksheet_write_string(worksheet, row, col,     expenses[row].item, NULL);
+        worksheet_write_number(worksheet, row, col + 1, expenses[row].cost, NULL);
+    }
+
+    /* Write a total using a formula. */
+    worksheet_write_string (worksheet, row, col,     "Total",       NULL);
+    worksheet_write_formula(worksheet, row, col + 1, "=SUM(B1:B4)", NULL);
+
+    /* Save the workbook and free any allocated memory. */
+    return workbook_close(workbook);
+}
diff --git a/examples/tutorial2.c b/examples/tutorial2.c
new file mode 100644
index 00000000..ec65ee75
--- /dev/null
+++ b/examples/tutorial2.c
@@ -0,0 +1,63 @@
+/*
+ * A simple program to write some data to an Excel file using the
+ * libxlsxwriter library.
+ *
+ * This program is shown, with explanations, in Tutorial 2 of the
+ * libxlsxwriter documentation.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+/* Some data we want to write to the worksheet. */
+struct expense {
+    char item[32];
+    int  cost;
+};
+
+struct expense expenses[] = {
+    {"Rent", 1000},
+    {"Gas",   100},
+    {"Food",  300},
+    {"Gym",    50},
+};
+
+
+int main() {
+
+    /* Create a workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("tutorial02.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    int row = 0;
+    int col = 0;
+    int i;
+
+    /* Add a bold format to use to highlight cells. */
+    lxw_format *bold = workbook_add_format(workbook);
+    format_set_bold(bold);
+
+    /* Add a number format for cells with money. */
+    lxw_format *money = workbook_add_format(workbook);
+    format_set_num_format(money, "$#,##0");
+
+    /* Write some data header. */
+    worksheet_write_string(worksheet, row, col,     "Item", bold);
+    worksheet_write_string(worksheet, row, col + 1, "Cost", bold);
+
+    /* Iterate over the data and write it out element by element. */
+    for (i = 0; i < 4; i++) {
+        /* Write from the first cell below the headers. */
+        row = i + 1;
+        worksheet_write_string(worksheet, row, col,     expenses[i].item, NULL);
+        worksheet_write_number(worksheet, row, col + 1, expenses[i].cost, money);
+    }
+
+    /* Write a total using a formula. */
+    worksheet_write_string (worksheet, row + 1, col,     "Total",       bold);
+    worksheet_write_formula(worksheet, row + 1, col + 1, "=SUM(B2:B5)", money);
+
+    /* Save the workbook and free any allocated memory. */
+    return workbook_close(workbook);
+}
diff --git a/examples/tutorial3.c b/examples/tutorial3.c
new file mode 100644
index 00000000..52f78031
--- /dev/null
+++ b/examples/tutorial3.c
@@ -0,0 +1,70 @@
+/*
+ * A simple program to write some data to an Excel file using the
+ * libxlsxwriter library.
+ *
+ * This program is shown, with explanations, in Tutorial 3 of the
+ * libxlsxwriter documentation.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+/* Some data we want to write to the worksheet. */
+struct expense {
+    char         item[32];
+    int          cost;
+    lxw_datetime datetime;
+};
+
+struct expense expenses[] = {
+    {"Rent", 1000, { .year = 2013, .month = 1, .day = 13 } },
+    {"Gas",   100, { .year = 2013, .month = 1, .day = 14 } },
+    {"Food",  300, { .year = 2013, .month = 1, .day = 16 } },
+    {"Gym",    50, { .year = 2013, .month = 1, .day = 20 } },
+};
+
+
+int main() {
+
+    /* Create a workbook and add a worksheet. */
+    lxw_workbook  *workbook  = new_workbook("tutorial03.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    int row = 0;
+    int col = 0;
+    int i;
+
+    /* Add a bold format to use to highlight cells. */
+    lxw_format *bold = workbook_add_format(workbook);
+    format_set_bold(bold);
+
+    /* Add a number format for cells with money. */
+    lxw_format *money = workbook_add_format(workbook);
+    format_set_num_format(money, "$#,##0");
+
+    /*  Add an Excel date format. */
+    lxw_format *date_format = workbook_add_format(workbook);
+    format_set_num_format(date_format, "mmmm d yyyy");
+
+
+    /* Write some data header. */
+    worksheet_write_string(worksheet, row, col,     "Item", bold);
+    worksheet_write_string(worksheet, row, col + 1, "Cost", bold);
+
+    /* Iterate over the data and write it out elementt by element. */
+    for (i = 0; i < 4; i++) {
+        /* Write from the first cell below the headers. */
+        row = i + 1;
+        worksheet_write_string  (worksheet, row, col,      expenses[i].item,     NULL);
+        worksheet_write_datetime(worksheet, row, col + 1, &expenses[i].datetime, date_format);
+        worksheet_write_number  (worksheet, row, col + 2,  expenses[i].cost,     money);
+    }
+
+    /* Write a total using a formula. */
+    worksheet_write_string (worksheet, row + 1, col,     "Total",       bold);
+    worksheet_write_formula(worksheet, row + 1, col + 2, "=SUM(C2:C5)", money);
+
+    /* Save the workbook and free any allocated memory. */
+    return workbook_close(workbook);
+}
diff --git a/examples/utf8.c b/examples/utf8.c
new file mode 100644
index 00000000..3f9f1330
--- /dev/null
+++ b/examples/utf8.c
@@ -0,0 +1,20 @@
+/*
+ * A simple Unicode UTF-8 example using libxlsxwriter.
+ *
+ * Note: The source file must be UTF-8 encoded.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("utf8.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_string(worksheet, 2, 1, "Это фраза на русском!", NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/include/xlsxwriter.h b/include/xlsxwriter.h
new file mode 100644
index 00000000..468f8d19
--- /dev/null
+++ b/include/xlsxwriter.h
@@ -0,0 +1,25 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ */
+
+/**
+ * @file xlsxwriter.h
+ *
+ * xlsxwriter - A library for creating Excel XLSX files.
+ *
+ * TODO.
+ *
+ */
+#ifndef __LXW_XLSXWRITER_H__
+#define __LXW_XLSXWRITER_H__
+
+#include "xlsxwriter/workbook.h"
+#include "xlsxwriter/worksheet.h"
+#include "xlsxwriter/format.h"
+#include "xlsxwriter/utility.h"
+
+#define LXW_VERSION "0.0.1"
+
+#endif /* __LXW_XLSXWRITER_H__ */
diff --git a/include/xlsxwriter/app.h b/include/xlsxwriter/app.h
new file mode 100644
index 00000000..f36722ab
--- /dev/null
+++ b/include/xlsxwriter/app.h
@@ -0,0 +1,79 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * app - A libxlsxwriter library for creating Excel XLSX app files.
+ *
+ */
+#ifndef __LXW_APP_H__
+#define __LXW_APP_H__
+
+#include <stdint.h>
+#include <string.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+/* Define the queue.h TAILQ structs for the App structs. */
+STAILQ_HEAD(lxw_heading_pairs, lxw_heading_pair);
+STAILQ_HEAD(lxw_part_names, lxw_part_name);
+
+typedef struct lxw_heading_pair {
+
+    char *key;
+    char *value;
+
+    STAILQ_ENTRY (lxw_heading_pair) list_pointers;
+
+} lxw_heading_pair;
+
+typedef struct lxw_part_name {
+
+    char *name;
+
+    STAILQ_ENTRY (lxw_part_name) list_pointers;
+
+} lxw_part_name;
+
+/* Struct to represent an App object. */
+typedef struct lxw_app {
+
+    FILE *file;
+
+    struct lxw_heading_pairs *heading_pairs;
+    struct lxw_part_names *part_names;
+    lxw_doc_properties *properties;
+
+    size_t num_heading_pairs;
+    size_t num_part_names;
+
+} lxw_app;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_app *_new_app();
+void _free_app(lxw_app *app);
+void _app_assemble_xml_file(lxw_app *self);
+void _add_part_name(lxw_app *self, const char *name);
+void _add_heading_pair(lxw_app *self, const char *key, const char *value);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _app_xml_declaration(lxw_app *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_APP_H__ */
diff --git a/include/xlsxwriter/common.h b/include/xlsxwriter/common.h
new file mode 100644
index 00000000..8151ca6d
--- /dev/null
+++ b/include/xlsxwriter/common.h
@@ -0,0 +1,96 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * common - Common functions and defines for the libxlsxwriter library.
+ *
+ */
+#ifndef __LXW_COMMON_H__
+#define __LXW_COMMON_H__
+
+#include <time.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#ifndef TESTING
+/* Turn off until release. TODO */
+/* #define STATIC static */
+#define STATIC
+#else
+#define STATIC
+#endif
+
+#define XL_SHEETNAME_MAX   32
+#define LXW_SHEETNAME_LEN  65
+
+enum lxw_boolean {
+    LXW_FALSE,
+    LXW_TRUE
+};
+
+#define ERROR(message)                          \
+    fprintf(stderr, "[ERROR][%s:%d]: " message "\n", __FILE__, __LINE__)
+
+#define MEM_ERROR()                             \
+    ERROR("Memory allocation failed.")
+
+#define GOTO_LABEL_ON_MEM_ERROR(pointer, label) \
+    if (!pointer) {                             \
+        MEM_ERROR();                            \
+        goto label;                             \
+    }
+
+#define RETURN_ON_MEM_ERROR(pointer, error)     \
+    if (!pointer) {                             \
+        MEM_ERROR();                            \
+        return error;                           \
+    }
+
+#define LXW_WARN(message)                       \
+    fprintf(stderr, "[WARN]: " message "\n")
+
+/* Define the queue.h structs for the formats list. */
+STAILQ_HEAD(lxw_formats, lxw_format);
+
+/* Define the queue.h structs for the generic data structs. */
+STAILQ_HEAD(lxw_tuples, lxw_tuple);
+
+typedef struct lxw_tuple {
+    char *key;
+    char *value;
+
+    STAILQ_ENTRY (lxw_tuple) list_pointers;
+} lxw_tuple;
+
+typedef struct lxw_doc_properties {
+    char *title;
+    char *subject;
+    char *author;
+    char *manager;
+    char *company;
+    char *category;
+    char *keywords;
+    char *comments;
+    char *status;
+    time_t created;
+} lxw_doc_properties;
+
+
+ /* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_COMMON_H__ */
diff --git a/include/xlsxwriter/content_types.h b/include/xlsxwriter/content_types.h
new file mode 100644
index 00000000..b6682414
--- /dev/null
+++ b/include/xlsxwriter/content_types.h
@@ -0,0 +1,70 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * content_types - A libxlsxwriter library for creating Excel XLSX
+ *                 content_types files.
+ *
+ */
+#ifndef __LXW_CONTENT_TYPES_H__
+#define __LXW_CONTENT_TYPES_H__
+
+#include <stdint.h>
+#include <string.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+#define LXW_CONTENT_TYPE_SCHEMA "http://schemas.openxmlformats.org/package/2006/content-types"
+#define LXW_APP_PACKAGE  "application/vnd.openxmlformats-package."
+#define LXW_APP_DOCUMENT "application/vnd.openxmlformats-officedocument."
+
+/*
+ * Struct to represent a content_types.
+ */
+typedef struct lxw_content_types {
+
+    FILE *file;
+
+    struct lxw_tuples *default_types;
+    struct lxw_tuples *overrides;
+
+} lxw_content_types;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_content_types *_new_content_types();
+void _free_content_types(lxw_content_types *content_types);
+void _content_types_assemble_xml_file(lxw_content_types *self);
+void _ct_add_default(lxw_content_types *self, const char *key,
+                     const char *value);
+void _ct_add_override(lxw_content_types *self, const char *key,
+                      const char *value);
+void _ct_add_worksheet_name(lxw_content_types *self, const char *str);
+void _ct_add_shared_strings(lxw_content_types *self);
+void _ct_add_calc_chain(lxw_content_types *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _content_types_xml_declaration(lxw_content_types *self);
+STATIC void _write_default(lxw_content_types *self, const char *ext,
+                           const char *type);
+STATIC void _write_override(lxw_content_types *self, const char *part_name,
+                            const char *type);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_CONTENT_TYPES_H__ */
diff --git a/include/xlsxwriter/core.h b/include/xlsxwriter/core.h
new file mode 100644
index 00000000..fc37fb11
--- /dev/null
+++ b/include/xlsxwriter/core.h
@@ -0,0 +1,51 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * core - A libxlsxwriter library for creating Excel XLSX core files.
+ *
+ */
+#ifndef __LXW_CORE_H__
+#define __LXW_CORE_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+/*
+ * Struct to represent a core.
+ */
+typedef struct lxw_core {
+
+    FILE *file;
+    lxw_doc_properties *properties;
+
+} lxw_core;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_core *_new_core();
+void _free_core(lxw_core *core);
+void _core_assemble_xml_file(lxw_core *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _core_xml_declaration(lxw_core *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_CORE_H__ */
diff --git a/include/xlsxwriter/format.h b/include/xlsxwriter/format.h
new file mode 100644
index 00000000..cee83b03
--- /dev/null
+++ b/include/xlsxwriter/format.h
@@ -0,0 +1,1190 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ */
+
+/**
+ * @page format_page The Format object
+ *
+ * The Format object represents an the formatting properties that can be
+ * applied to a cell including: fonts, colors, patterns,
+ * borders, alignment and number formatting.
+ *
+ * See @ref format.h for full details of the functionality.
+ * 
+ * @file format.h
+ *
+ * @brief Functions and properties for adding formatting to cells in Excel.
+ *
+ * This section describes the functions and properties that are available for
+ * formatting cells in Excel.
+ *
+ * The properties of a cell that can be formatted include: fonts, colors,
+ * patterns, borders, alignment and number formatting.
+ *
+ * @image html formats_intro.png
+ *
+ * Formats in `libxlswriter` are accessed via the lxw_format
+ * struct. Throughout this document these will be referred to simply as
+ * *Formats*.
+ *
+ * Formats are created by calling the workbook_add_format() method as
+ * follows:
+ *
+ * @code
+ *     lxw_format *format = workbook_add_format(workbook);
+ * @endcode
+ *
+ * The members of the lxw_format struct aren't modified directly. Instead the
+ * format properties are set by calling the function shown in this section.
+ * For example:
+ *
+ * @code
+ *    // Create the Format.
+ *    lxw_format *format = workbook_add_format(workbook);
+ *
+ *    // Set some of the format properties.
+ *    format_set_bold(format);
+ *    format_set_font_color(format, LXW_COLOR_RED);
+ *
+ *    // Use the format to change the text format in a cell.
+ *    worksheet_write_string(worksheet, 0, 0, "Hello", format);
+ *
+ * @endcode
+ *
+ * The full range of formatting options that can be applied using
+ * `libxlswriter` are shown below.
+ *
+ */
+#ifndef __LXW_FORMAT_H__
+#define __LXW_FORMAT_H__
+
+#include <stdint.h>
+#include <string.h>
+#include "hash_table.h"
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+/**
+ * @brief The type for RGB colors in libxlswriter.
+ *
+ * The type for RGB colors in libxlswriter. The valid range is `0x000000`
+ * (black) to `0xFFFFFF` (white). See @ref working_with_colors.
+ */
+typedef int32_t lxw_color_t;
+
+#define LXW_FORMAT_FIELD_LEN            128
+#define LXW_DEFAULT_FONT_NAME           "Calibri"
+#define LXW_DEFAULT_FONT_FAMILY         2
+#define LXW_DEFAULT_FONT_THEME          1
+#define LXW_PROPERTY_UNSET              -1
+#define LXW_COLOR_UNSET                 -1
+#define LXW_COLOR_MASK                  0xFFFFFF
+#define LXW_MIN_FONT_SIZE               1
+#define LXW_MAX_FONT_SIZE               409
+
+#define LXW_FORMAT_FIELD_COPY(dst, src)             \
+    do{                                             \
+        strncpy(dst, src, LXW_FORMAT_FIELD_LEN -1); \
+        dst[LXW_FORMAT_FIELD_LEN - 1] = '\0';       \
+    } while (0)
+
+/** Format underline values for format_set_underline(). */
+enum lxw_format_underlines {
+    /** Single underline */
+    LXW_UNDERLINE_SINGLE = 1,
+
+    /** Double underline */
+    LXW_UNDERLINE_DOUBLE,
+
+    /** Single accounting underline */
+    LXW_UNDERLINE_SINGLE_ACCOUNTING,
+
+    /** Double accounting underline */
+    LXW_UNDERLINE_DOUBLE_ACCOUNTING
+};
+
+/** Superscript and subscript values for format_set_font_script(). */
+enum lxw_format_scripts {
+
+    /** Superscript font */
+    LXW_FONT_SUPERSCRIPT = 1,
+
+    /** Subscript font */
+    LXW_FONT_SUBSCRIPT
+};
+
+/** Alignment values for format_set_align(). */
+enum lxw_format_alignments {
+    /** No alignment. Cell will use Excel's default for the data type */
+    LXW_ALIGN_NONE = 0,
+
+    /** Left horizontal alignment */
+    LXW_ALIGN_LEFT,
+
+    /** Center horizontal alignment */
+    LXW_ALIGN_CENTER,
+
+    /** Right horizontal alignment */
+    LXW_ALIGN_RIGHT,
+
+    /** Cell fill horizontal alignment */
+    LXW_ALIGN_FILL,
+
+    /** Justify horizontal alignment */
+    LXW_ALIGN_JUSTIFY,
+
+    /** Center Across horizontal alignment */
+    LXW_ALIGN_CENTER_ACROSS,
+
+    /** Left horizontal alignment */
+    LXW_ALIGN_DISTRIBUTED,
+
+    /** Top vertical alignment */
+    LXW_ALIGN_VERTICAL_TOP,
+
+    /** Bottom vertical alignment */
+    LXW_ALIGN_VERTICAL_BOTTOM,
+
+    /** Center vertical alignment */
+    LXW_ALIGN_VERTICAL_CENTER,
+
+    /** Justify vertical alignment */
+    LXW_ALIGN_VERTICAL_JUSTIFY,
+
+    /** Distributed vertical alignment */
+    LXW_ALIGN_VERTICAL_DISTRIBUTED
+};
+
+enum lxw_format_diagonal_types {
+    LXW_DIAGONAL_BORDER_UP = 1,
+    LXW_DIAGONAL_BORDER_DOWN,
+    LXW_DIAGONAL_BORDER_UP_DOWN
+};
+
+/** Predefined values for common colors. */
+enum lxw_defined_colors {
+    /** Black */
+    LXW_COLOR_BLACK = 0x000000,
+
+    /** Blue */
+    LXW_COLOR_BLUE = 0x0000FF,
+
+    /** Brown */
+    LXW_COLOR_BROWN = 0x800000,
+
+    /** Cyan */
+    LXW_COLOR_CYAN = 0x00FFFF,
+
+    /** Gray */
+    LXW_COLOR_GRAY = 0x808080,
+
+    /** Green */
+    LXW_COLOR_GREEN = 0x008000,
+
+    /** Lime */
+    LXW_COLOR_LIME = 0x00FF00,
+
+    /** Magenta */
+    LXW_COLOR_MAGENTA = 0xFF00FF,
+
+    /** Navy */
+    LXW_COLOR_NAVY = 0x000080,
+
+    /** Orange */
+    LXW_COLOR_ORANGE = 0xFF6600,
+
+    /** Pink */
+    LXW_COLOR_PINK = 0xFF00FF,
+
+    /** Purple */
+    LXW_COLOR_PURPLE = 0x800080,
+
+    /** Red */
+    LXW_COLOR_RED = 0xFF0000,
+
+    /** Silver */
+    LXW_COLOR_SILVER = 0xC0C0C0,
+
+    /** White */
+    LXW_COLOR_WHITE = 0xFFFFFF,
+
+    /** Yellow */
+    LXW_COLOR_YELLOW = 0xFFFF00
+};
+
+/** Pattern value for use with format_set_pattern(). */
+enum lxw_format_patterns {
+    /** Empty pattern */
+    LXW_PATTERN_NONE = 0,
+
+    /** Solid pattern */
+    LXW_PATTERN_SOLID,
+
+    /** Medium gray pattern */
+    LXW_PATTERN_MEDIUM_GRAY,
+
+    /** Dark gray pattern */
+    LXW_PATTERN_DARK_GRAY,
+
+    /** Light gray pattern */
+    LXW_PATTERN_LIGHT_GRAY,
+
+    /** Dark horizontal line pattern */
+    LXW_PATTERN_DARK_HORIZONTAL,
+
+    /** Dark vertical line pattern */
+    LXW_PATTERN_DARK_VERTICAL,
+
+    /** Dark diagonal stripe pattern */
+    LXW_PATTERN_DARK_DOWN,
+
+    /** Reverse dark diagonal stripe pattern */
+    LXW_PATTERN_DARK_UP,
+
+    /** Dark grid pattern */
+    LXW_PATTERN_DARK_GRID,
+
+    /** Dark trellis pattern */
+    LXW_PATTERN_DARK_TRELLIS,
+
+    /** Light horizontal Line pattern */
+    LXW_PATTERN_LIGHT_HORIZONTAL,
+
+    /** Light vertical line pattern */
+    LXW_PATTERN_LIGHT_VERTICAL,
+
+    /** Light diagonal stripe pattern */
+    LXW_PATTERN_LIGHT_DOWN,
+
+    /** Reverse light diagonal stripe pattern */
+    LXW_PATTERN_LIGHT_UP,
+
+    /** Light grid pattern */
+    LXW_PATTERN_LIGHT_GRID,
+
+    /** Light trellis pattern */
+    LXW_PATTERN_LIGHT_TRELLIS,
+
+    /** 12.5% gray pattern */
+    LXW_PATTERN_GRAY_125,
+
+    /** 6.25% gray pattern */
+    LXW_PATTERN_GRAY_0625
+};
+
+/** Cell border styles for use with format_set_border(). */
+enum lxw_format_borders {
+    /** No border */
+    LXW_BORDER_NONE,
+
+    /** Thin border style */
+    LXW_BORDER_THIN,
+
+    /** Medium border style */
+    LXW_BORDER_MEDIUM,
+
+    /** Dashed border style */
+    LXW_BORDER_DASHED,
+
+    /** Dotted border style */
+    LXW_BORDER_DOTTED,
+
+    /** Thick border style */
+    LXW_BORDER_THICK,
+
+    /** Double border style */
+    LXW_BORDER_DOUBLE,
+
+    /** Hair border style */
+    LXW_BORDER_HAIR,
+
+    /** Medium dashed border style */
+    LXW_BORDER_MEDIUM_DASHED,
+
+    /** Dash-dot border style */
+    LXW_BORDER_DASH_DOT,
+
+    /** Medium dash-dot border style */
+    LXW_BORDER_MEDIUM_DASH_DOT,
+
+    /** Dash-dot-dot border style */
+    LXW_BORDER_DASH_DOT_DOT,
+
+    /** Medium dash-dot-dot border style */
+    LXW_BORDER_MEDIUM_DASH_DOT_DOT,
+
+    /** Slant dash-dot border style */
+    LXW_BORDER_SLANT_DASH_DOT
+};
+
+/**
+ * @brief Struct to represent the formatting properties of an Excel format.
+ *
+ * Formats in `libxlswriter` are accessed via this struct.
+ *
+ * The members of the lxw_format struct aren't modified directly. Instead the
+ * format properties are set by calling the functions shown in format.h.
+ *
+ * For example:
+ *
+ * @code
+ *    // Create the Format.
+ *    lxw_format *format = workbook_add_format(workbook);
+ *
+ *    // Set some of the format properties.
+ *    format_set_bold(format);
+ *    format_set_font_color(format, LXW_COLOR_RED);
+ *
+ *    // Use the format to change the text format in a cell.
+ *    worksheet_write_string(worksheet, 0, 0, "Hello", format);
+ *
+ * @endcode
+ *
+ */
+typedef struct lxw_format {
+
+    FILE *file;
+
+    lxw_hash_table *xf_format_indices;
+    uint16_t *num_xf_formats;
+
+    int32_t xf_index;
+    int32_t dxf_index;
+
+    char num_format[LXW_FORMAT_FIELD_LEN];
+    char font_name[LXW_FORMAT_FIELD_LEN];
+    char font_scheme[LXW_FORMAT_FIELD_LEN];
+    uint8_t num_format_index;
+    uint16_t font_index;
+    uint8_t has_font;
+    uint8_t has_dxf_font;
+    uint16_t font_size;
+    uint8_t bold;
+    uint8_t italic;
+    lxw_color_t font_color;
+    uint8_t underline;
+    uint8_t font_strikeout;
+    uint8_t font_outline;
+    uint8_t font_shadow;
+    uint8_t font_script;
+    uint8_t font_family;
+    uint8_t font_charset;
+    uint8_t font_condense;
+    uint8_t font_extend;
+    uint8_t theme;
+    uint8_t hyperlink;
+
+    uint8_t hidden;
+    uint8_t locked;
+
+    uint8_t text_h_align;
+    uint8_t text_wrap;
+    uint8_t text_v_align;
+    uint8_t text_justlast;
+    int16_t rotation;
+
+    lxw_color_t fg_color;
+    lxw_color_t bg_color;
+    uint8_t pattern;
+    uint8_t has_fill;
+    uint8_t has_dxf_fill;
+    int32_t fill_index;
+    int32_t fill_count;
+
+    int32_t border_index;
+    uint8_t has_border;
+    uint8_t has_dxf_border;
+    int32_t border_count;
+
+    uint8_t bottom;
+    uint8_t diag_border;
+    uint8_t diag_type;
+    uint8_t left;
+    uint8_t right;
+    uint8_t top;
+    lxw_color_t bottom_color;
+    lxw_color_t diag_color;
+    lxw_color_t left_color;
+    lxw_color_t right_color;
+    lxw_color_t top_color;
+
+    uint8_t indent;
+    uint8_t shrink;
+    uint8_t merge_range;
+    uint8_t reading_order;
+    uint8_t just_distrib;
+    uint8_t color_indexed;
+    uint8_t font_only;
+
+    STAILQ_ENTRY (lxw_format) list_pointers;
+} lxw_format;
+
+/*
+ * Struct to represent the font component of a format.
+ */
+typedef struct lxw_font {
+
+    char font_name[LXW_FORMAT_FIELD_LEN];
+    uint16_t font_size;
+    uint8_t bold;
+    uint8_t italic;
+    lxw_color_t font_color;
+    uint8_t underline;
+    uint8_t font_strikeout;
+    uint8_t font_outline;
+    uint8_t font_shadow;
+    uint8_t font_script;
+    uint8_t font_family;
+    uint8_t font_charset;
+    uint8_t font_condense;
+    uint8_t font_extend;
+} lxw_font;
+
+/*
+ * Struct to represent the border component of a format.
+ */
+typedef struct lxw_border {
+
+    uint8_t bottom;
+    uint8_t diag_border;
+    uint8_t diag_type;
+    uint8_t left;
+    uint8_t right;
+    uint8_t top;
+
+    lxw_color_t bottom_color;
+    lxw_color_t diag_color;
+    lxw_color_t left_color;
+    lxw_color_t right_color;
+    lxw_color_t top_color;
+
+} lxw_border;
+
+/*
+ * Struct to represent the fill component of a format.
+ */
+typedef struct lxw_fill {
+
+    lxw_color_t fg_color;
+    lxw_color_t bg_color;
+    uint8_t pattern;
+
+} lxw_fill;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_format *_new_format();
+void _free_format(lxw_format *format);
+int32_t _get_xf_index(lxw_format *format);
+lxw_font *_get_font_key(lxw_format *format);
+lxw_border *_get_border_key(lxw_format *format);
+lxw_fill *_get_fill_key(lxw_format *format);
+
+/**
+ * @brief Set the font used in the cell.
+ *
+ * @param format    Pointer to a Format instance.
+ * @param font_name Cell font name.
+ *
+ * Specify the font used used in the cell format:
+ *
+ * @code
+ *     format_set_font_name(format, "Avenir Black Oblique");
+ * @endcode
+ *
+ * @image html format_set_font_name.png
+ *
+ * Excel can only display fonts that are installed on the system that it is
+ * running on. Therefore it is generally best to use the fonts that come as
+ * standard with Excel such as Calibri, Times New Roman and Courier New.
+ *
+ * The default font in Excel 2007, and later, is Calibri.
+ */
+void format_set_font_name(lxw_format *format, const char *font_name);
+
+/**
+ * @brief Set the size of the font used in the cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param size   The cell font size.
+ *
+ * Set the font size of the cell format:
+ *
+ * @code
+ *     format_set_font_size(format, 30);
+ * @endcode
+ *
+ * Excel adjusts the height of a row to accommodate the largest font
+ * size in the row. You can also explicitly specify the height of a
+ * row using the worksheet_set_row() function.
+ */
+void format_set_font_size(lxw_format *format, uint16_t size);
+
+/**
+ * @brief Set the color of the font used in the cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell font color.
+ *
+ *
+ * Set the font color:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *
+ *     format_set_font_color(format, "red");
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "wheelbarrow", format);
+ * @endcode
+ *
+ * The color should be an RGB integer value, see @ref working_with_colors.
+ *
+ * @note
+ * The format_set_font_color() method is used to set the font color in a
+ * cell. To set the color of a cell background use the format_set_bg_color()
+ * and format_set_pattern() methods.
+ */
+void format_set_font_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Turn on bold for the format font.
+ *
+ * @param format Pointer to a Format instance.
+ *
+ * Set the bold property of the font:
+ *
+ * @code
+ *     format_set_bold(format);
+ * @endcode
+ */
+void format_set_bold(lxw_format *format);
+
+/**
+ * @brief Turn on italic for the format font.
+ *
+ * @param format Pointer to a Format instance.
+ *
+ * Set the italic property of the font:
+ *
+ * @code
+ *     format_set_italic(format);
+ * @endcode
+ */
+void format_set_italic(lxw_format *format);
+
+/**
+ * @brief Turn on underline for the format:
+ *
+ * @param format Pointer to a Format instance.
+ * @param style Underline style.
+ *
+ * Set the underline property of the format:
+ *
+ * @code
+ *     format_set_underline(format, LXW_UNDERLINE_SINGLE);
+ * @endcode
+ *
+ * The available underline styles are:
+ *
+ * - #LXW_UNDERLINE_SINGLE
+ * - #LXW_UNDERLINE_DOUBLE
+ * - #LXW_UNDERLINE_SINGLE_ACCOUNTING
+ * - #LXW_UNDERLINE_DOUBLE_ACCOUNTING
+ *
+ */
+void format_set_underline(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the strikeout property of the font.
+ *
+ * @param format Pointer to a Format instance.
+ */
+void format_set_font_strikeout(lxw_format *format);
+
+/**
+ * @brief Set the superscript/subscript property of the font.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Superscript or subscript style.
+ *
+ * Set the superscript o subscript property of the font.
+ *
+ * The available script styles are:
+ *
+ * - #LXW_FONT_SUPERSCRIPT
+ * - #LXW_FONT_SUBSCRIPT
+ */
+void format_set_font_script(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the number format for a cell.
+ *
+ * @param format      Pointer to a Format instance.
+ * @param num_format The cell number format string.
+ *
+ * This method is used to define the numerical format of a number in
+ * Excel. It controls whether a number is displayed as an integer, a
+ * floating point number, a date, a currency value or some other user
+ * defined format.
+ *
+ * The numerical format of a cell can be specified by using a format
+ * string:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_num_format(format, "d mmm yyyy");
+ * @endcode
+ *
+ * Format strings can control any aspect of number formatting allowed by Excel:
+ *
+ * @dontinclude format_num_format.c
+ * @skipline set_num_format
+ * @until 1209
+ * 
+ * @image html format_set_num_format.png
+ *
+ * The number system used for dates is described in @ref working_with_dates.
+ *
+ * For more information on number formats in Excel refer to the
+ * [Microsoft documentation on cell formats](http://office.microsoft.com/en-gb/assistance/HP051995001033.aspx).
+ */
+void format_set_num_format(lxw_format *format, const char *num_format);
+
+/**
+ * @brief Set the Excel built-in number format for a cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param index  The built-in number format index for the cell.
+ *
+ * This function is similar to format_set_num_format() except that it takes an
+ * index to a limited number of Excel's built-in number formats instead of a
+ * user defined format string:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_num_format(format, 0x0F);     // d-mmm-yy
+ * @endcode
+ *
+ * @note
+ *
+ * Unless you need to specifically access one of Excel's built-in number
+ * formats the format_set_num_format() function above is a better
+ * solution. The format_set_num_format_index() function is mainly included for
+ * backward compatibility and completeness.
+ *
+ * The Excel built-in number formats as shown in the table below:
+ *
+ *   | Index | Index | Format String                                        |
+ *   | ----- | ----- | ---------------------------------------------------- |
+ *   | 0     | 0x00  | `General`                                            |
+ *   | 1     | 0x01  | `0`                                                  |
+ *   | 2     | 0x02  | `0.00`                                               |
+ *   | 3     | 0x03  | `#,##0`                                              |
+ *   | 4     | 0x04  | `#,##0.00`                                           |
+ *   | 5     | 0x05  | `($#,##0_);($#,##0)`                                 |
+ *   | 6     | 0x06  | `($#,##0_);[Red]($#,##0)`                            |
+ *   | 7     | 0x07  | `($#,##0.00_);($#,##0.00)`                           |
+ *   | 8     | 0x08  | `($#,##0.00_);[Red]($#,##0.00)`                      |
+ *   | 9     | 0x09  | `0%`                                                 |
+ *   | 10    | 0x0a  | `0.00%`                                              |
+ *   | 11    | 0x0b  | `0.00E+00`                                           |
+ *   | 12    | 0x0c  | `# ?/?`                                              |
+ *   | 13    | 0x0d  | `# ??/??`                                            |
+ *   | 14    | 0x0e  | `m/d/yy`                                             |
+ *   | 15    | 0x0f  | `d-mmm-yy`                                           |
+ *   | 16    | 0x10  | `d-mmm`                                              |
+ *   | 17    | 0x11  | `mmm-yy`                                             |
+ *   | 18    | 0x12  | `h:mm AM/PM`                                         |
+ *   | 19    | 0x13  | `h:mm:ss AM/PM`                                      |
+ *   | 20    | 0x14  | `h:mm`                                               |
+ *   | 21    | 0x15  | `h:mm:ss`                                            |
+ *   | 22    | 0x16  | `m/d/yy h:mm`                                        |
+ *   | ...   | ...   | ...                                                  |
+ *   | 37    | 0x25  | `(#,##0_);(#,##0)`                                   |
+ *   | 38    | 0x26  | `(#,##0_);[Red](#,##0)`                              |
+ *   | 39    | 0x27  | `(#,##0.00_);(#,##0.00)`                             |
+ *   | 40    | 0x28  | `(#,##0.00_);[Red](#,##0.00)`                        |
+ *   | 41    | 0x29  | `_(* #,##0_);_(* (#,##0);_(* "-"_);_(@_)`            |
+ *   | 42    | 0x2a  | `_($* #,##0_);_($* (#,##0);_($* "-"_);_(@_)`         |
+ *   | 43    | 0x2b  | `_(* #,##0.00_);_(* (#,##0.00);_(* "-"??_);_(@_)`    |
+ *   | 44    | 0x2c  | `_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)` |
+ *   | 45    | 0x2d  | `mm:ss`                                              |
+ *   | 46    | 0x2e  | `[h]:mm:ss`                                          |
+ *   | 47    | 0x2f  | `mm:ss.0`                                            |
+ *   | 48    | 0x30  | `##0.0E+0`                                           |
+ *   | 49    | 0x31  | `@`                                                  |
+ *
+ *  @note
+ *
+ *  -  Numeric formats 23 to 36 are not documented by Microsoft and may differ
+ *     in international versions. The listed date and currency formats may also
+ *     vary depending on system settings.
+ *
+ *  - The dollar sign in the above format appears as the defined local currency
+ *    symbol.
+ *
+ *  - These formats can also be set via format_set_num_format().
+ */
+void format_set_num_format_index(lxw_format *format, uint8_t index);
+
+/**
+ * @brief Set the cell unlocked state.
+ *
+ * @param format Pointer to a Format instance.
+ *
+ * This property can be used to allow modification of a cell in a protected
+ * worksheet. In Excel, cell locking is turned on by default for all
+ * cells. However, it only has an effect if the worksheet has been protected
+ * using the worksheet worksheet_protect() method:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_unlocked(format);
+ *
+ *     // Enable worksheet protection.
+ *     worksheet_protect(worksheet);
+ *
+ *     // This cell cannot be edited.
+ *     worksheet_write_formula(worksheet, 0, 0, "=1+2", NULL);
+ *
+ *     // This cell can be edited.
+ *     worksheet_write_formula(worksheet, 1, 0, "=1+2", format);
+ * @endcode
+ */
+void format_set_unlocked(lxw_format *format);
+
+/**
+ * @brief Hide formulas in a cell.
+ *
+ * @param format Pointer to a Format instance.
+ *
+ * This property is used to hide a formula while still displaying its result. This
+ * is generally used to hide complex calculations from end users who are only
+ * interested in the result. It only has an effect if the worksheet has been
+ * protected using the worksheet write_protect() method:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_hidden(format);
+ *
+ *     // Enable worksheet protection.
+ *     worksheet_protect(worksheet);
+ *
+ *     // The formula in this cell isn't visible.
+ *     worksheet_write_formula(worksheet, 0, 0, "=1+2", format);
+ * @endcode
+ */
+void format_set_hidden(lxw_format *format);
+
+/**
+ * @brief Set the alignment for data in the cell.
+ *
+ * @param format    Pointer to a Format instance.
+ * @param alignment The horizontal and or vertical alignment direction.
+ *
+ * This method is used to set the horizontal and vertical text alignment within a
+ * cell. The following are the available horizontal alignments:
+ *
+ * - #LXW_ALIGN_LEFT
+ * - #LXW_ALIGN_CENTER
+ * - #LXW_ALIGN_RIGHT
+ * - #LXW_ALIGN_FILL
+ * - #LXW_ALIGN_JUSTIFY
+ * - #LXW_ALIGN_CENTER_ACROSS
+ * - #LXW_ALIGN_DISTRIBUTED
+ *
+ * The following are the available vertical alignments:
+ *
+ * - #LXW_ALIGN_VERTICAL_TOP
+ * - #LXW_ALIGN_VERTICAL_BOTTOM
+ * - #LXW_ALIGN_VERTICAL_CENTER
+ * - #LXW_ALIGN_VERTICAL_JUSTIFY
+ * - #LXW_ALIGN_VERTICAL_DISTRIBUTED
+ *
+ * As in Excel, vertical and horizontal alignments can be combined:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *
+ *     format_set_align(format, "center");
+ *     format_set_align(format, "vcenter");
+ *
+ *     worksheet_set_row(0, 30);
+ *     worksheet_write_string(worksheet, 0, 0, "Some Text", format);
+ * @endcode
+ *
+ * Text can be aligned across two or more adjacent cells using the
+ * center_across property. However, for genuine merged cells it is better to
+ * use the worksheet_merge_range() worksheet method.
+ *
+ * The vertical justify option can be used to provide automatic text wrapping
+ * in a cell. The height of the cell will be adjusted to accommodate the
+ * wrapped text. To specify where the text wraps use the
+ * format_set_text_wrap() method.
+ */
+void format_set_align(lxw_format *format, uint8_t alignment);
+
+/**
+ * @brief Wrap text in a cell.
+ *
+ * Turn text wrapping on for text in a cell.
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_text_wrap(format);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "Some long text to wrap in a cell", format);
+ * @endcode
+ *
+ * If you wish to control where the text is wrapped you can add newline characters
+ * to the string:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_text_wrap(format);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "It's\na bum\nwrap", format);
+ * @endcode
+ *
+ * Excel will adjust the height of the row to accommodate the wrapped text. A
+ * similar effect can be obtained without newlines using the
+ * format_set_align() function with #LXW_ALIGN_VERTICAL_JUSTIFY.
+ */
+void format_set_text_wrap(lxw_format *format);
+
+/**
+ * @brief Set the rotation of the text in a cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param angle  Rotation angle in the range -90 to 90 and 270.
+ *
+ * Set the rotation of the text in a cell. The rotation can be any angle in the
+ * range -90 to 90 degrees:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_rotation(format, 30);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "This text is rotated", format);
+ * @endcode
+ *
+ * The angle 270 is also supported. This indicates text where the letters run from
+ * top to bottom.
+ */
+void format_set_rotation(lxw_format *format, int16_t angle);
+
+/**
+ * @brief Set the cell text indentation level.
+ *
+ * @param format Pointer to a Format instance.
+ * @param level  Indentation level.
+ *
+ * This method can be used to indent text in a cell. The argument, which should be
+ * an integer, is taken as the level of indentation:
+ *
+ * @code
+ *     format1 = workbook_add_format(workbook);
+ *     format2 = workbook_add_format(workbook);
+ *
+ *     format_set_indent(format1, 1);
+ *     format_set_indent(format2, 2);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "This text is indented 1 level",  format1);
+ *     worksheet_write_string(worksheet, 1, 0, "This text is indented 2 levels", format2);
+ * @endcode
+ *
+ * @image html text_indent.png
+ *
+ * @note
+ * Indentation is a horizontal alignment property. It will override any other
+ * horizontal properties but it can be used in conjunction with vertical
+ * properties.
+ */
+void format_set_indent(lxw_format *format, uint8_t level);
+
+/**
+ * @brief Turn on the text "shrink to fit" for a cell.
+ *
+ * @param format Pointer to a Format instance.
+ *
+ * This method can be used to shrink text so that it fits in a cell:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *     format_set_shrink(format);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "Honey, I shrunk the text!", format);
+ * @endcode
+ */
+void format_set_shrink(lxw_format *format);
+
+/**
+ * @brief Set the background fill pattern for a cell
+ *
+ * @param format Pointer to a Format instance.
+ * @param index  Pattern index.
+ *
+ * Set the background pattern for a cell.
+ *
+ * The most common pattern is a solid fill of the background color:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *
+ *     format_set_pattern (format, LXW_PATTERN_SOLID);
+ *     format_set_bg_color(format, LXW_COLOR_YELLOW);
+ * @endcode
+ *
+ * The available fill patterns are:
+ *
+ *    Fill Type                     | Define
+ *    ----------------------------- | -----------------------------
+ *    Solid                         | #LXW_PATTERN_SOLID
+ *    Medium gray                   | #LXW_PATTERN_MEDIUM_GRAY
+ *    Dark gray                     | #LXW_PATTERN_DARK_GRAY
+ *    Light gray                    | #LXW_PATTERN_LIGHT_GRAY
+ *    Dark horizontal line          | #LXW_PATTERN_DARK_HORIZONTAL
+ *    Dark vertical line            | #LXW_PATTERN_DARK_VERTICAL
+ *    Dark diagonal stripe          | #LXW_PATTERN_DARK_DOWN
+ *    Reverse dark diagonal stripe  | #LXW_PATTERN_DARK_UP
+ *    Dark grid                     | #LXW_PATTERN_DARK_GRID
+ *    Dark trellis                  | #LXW_PATTERN_DARK_TRELLIS
+ *    Light horizontal line         | #LXW_PATTERN_LIGHT_HORIZONTAL
+ *    Light vertical line           | #LXW_PATTERN_LIGHT_VERTICAL
+ *    Light diagonal stripe         | #LXW_PATTERN_LIGHT_DOWN
+ *    Reverse light diagonal stripe | #LXW_PATTERN_LIGHT_UP
+ *    Light grid                    | #LXW_PATTERN_LIGHT_GRID
+ *    Light trellis                 | #LXW_PATTERN_LIGHT_TRELLIS
+ *    12.5% gray                    | #LXW_PATTERN_GRAY_125
+ *    6.25% gray                    | #LXW_PATTERN_GRAY_0625
+ *
+ */
+void format_set_pattern(lxw_format *format, uint8_t index);
+
+/**
+ * @brief Set the pattern background color for a cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell pattern background color.
+ *
+ * The format_set_bg_color() method can be used to set the background color of
+ * a pattern. Patterns are defined via the format_set_pattern() method. If a
+ * pattern hasn't been defined then a solid fill pattern is used as the
+ * default.
+ *
+ * Here is an example of how to set up a solid fill in a cell:
+ *
+ * @code
+ *     format = workbook_add_format(workbook);
+ *
+ *     format_set_pattern (format, LXW_PATTERN_SOLID);
+ *     format_set_bg_color(format, LXW_COLOR_GREEN);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "Ray", format);
+ * @endcode
+ *
+ * @image html formats_set_bg_color.png
+ *
+ * The color should be an RGB integer value, see @ref working_with_colors.
+ *
+ */
+void format_set_bg_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the pattern foreground color for a cell.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell pattern foreground  color.
+ *
+ * The format_set_fg_color() method can be used to set the foreground color of
+ * a pattern.
+ *
+ * The color should be an RGB integer value, see @ref working_with_colors.
+ *
+ */
+void format_set_fg_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the cell border style.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Border style index.
+ *
+ * Set the cell border style:
+ *
+ * @code
+ *     format_set_border(format, LXW_BORDER_THIN);
+ * @endcode 
+ *
+ * Individual border elements can be configured using the following functions with
+ * the same parameters:
+ *
+ * - format_set_bottom()
+ * - format_set_top()
+ * - format_set_left()
+ * - format_set_right()
+ *
+ * A cell border is comprised of a border on the bottom, top, left and right.
+ * These can be set to the same value using format_set_border() or
+ * individually using the relevant method calls shown above.
+ *
+ * The following border styles are available:
+ *
+ * - #LXW_BORDER_THIN
+ * - #LXW_BORDER_MEDIUM
+ * - #LXW_BORDER_DASHED
+ * - #LXW_BORDER_DOTTED
+ * - #LXW_BORDER_THICK
+ * - #LXW_BORDER_DOUBLE
+ * - #LXW_BORDER_HAIR
+ * - #LXW_BORDER_MEDIUM_DASHED
+ * - #LXW_BORDER_DASH_DOT
+ * - #LXW_BORDER_MEDIUM_DASH_DOT
+ * - #LXW_BORDER_DASH_DOT_DOT
+ * - #LXW_BORDER_MEDIUM_DASH_DOT_DOT
+ * - #LXW_BORDER_SLANT_DASH_DOT
+ *
+ *  The most commonly used style is the `thin` style.
+ */
+void format_set_border(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the cell bottom border style.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Border style index.
+ *
+ * Set the cell bottom border style. See format_set_border() for details on the
+ * border styles.
+ */
+void format_set_bottom(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the cell top border style.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Border style index.
+ *
+ * Set the cell top border style. See format_set_border() for details on the border
+ * styles.
+ */
+void format_set_top(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the cell left border style.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Border style index.
+ *
+ * Set the cell left border style. See format_set_border() for details on the
+ * border styles.
+ */
+void format_set_left(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the cell right border style.
+ *
+ * @param format Pointer to a Format instance.
+ * @param style  Border style index.
+ *
+ * Set the cell right border style. See format_set_border() for details on the
+ * border styles.
+ */
+void format_set_right(lxw_format *format, uint8_t style);
+
+/**
+ * @brief Set the color of the cell border.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell border color.
+ *
+ * Individual border elements can be configured using the following methods with
+ * the same parameters:
+ *
+ * - format_set_bottom_color()
+ * - format_set_top_color()
+ * - format_set_left_color()
+ * - format_set_right_color()
+ *
+ * Set the color of the cell borders. A cell border is comprised of a border
+ * on the bottom, top, left and right. These can be set to the same color
+ * using format_set_border_color() or individually using the relevant method
+ * calls shown above.
+ *
+ * The color should be an RGB integer value, see @ref working_with_colors.
+ */
+void format_set_border_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the color of the bottom cell border.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell border color.
+ *
+ * See format_set_border_color() for details on the border colors.
+ */
+void format_set_bottom_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the color of the top cell border.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell border color.
+ *
+ * See format_set_border_color() for details on the border colors.
+ */
+void format_set_top_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the color of the left cell border.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell border color.
+ *
+ * See format_set_border_color() for details on the border colors.
+ */
+void format_set_left_color(lxw_format *format, lxw_color_t color);
+
+/**
+ * @brief Set the color of the right cell border.
+ *
+ * @param format Pointer to a Format instance.
+ * @param color  The cell border color.
+ *
+ * See format_set_border_color() for details on the border colors.
+ */
+void format_set_right_color(lxw_format *format, lxw_color_t color);
+
+void format_set_diag_type(lxw_format *format, uint8_t value);
+void format_set_diag_color(lxw_format *format, lxw_color_t color);
+void format_set_diag_border(lxw_format *format, uint8_t value);
+void format_set_font_outline(lxw_format *format);
+void format_set_font_shadow(lxw_format *format);
+void format_set_font_family(lxw_format *format, uint8_t value);
+void format_set_font_charset(lxw_format *format, uint8_t value);
+void format_set_font_scheme(lxw_format *format, const char *font_scheme);
+void format_set_font_condense(lxw_format *format);
+void format_set_font_extend(lxw_format *format);
+void format_set_reading_order(lxw_format *format, uint8_t value);
+void format_set_theme(lxw_format *format, uint8_t value);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_FORMAT_H__ */
diff --git a/include/xlsxwriter/hash_table.h b/include/xlsxwriter/hash_table.h
new file mode 100644
index 00000000..8bbaa6c3
--- /dev/null
+++ b/include/xlsxwriter/hash_table.h
@@ -0,0 +1,73 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * hash_table - Hash table functions for libxlsxwriter.
+ *
+ */
+
+#ifndef __LXW_HASH_TABLE_H__
+#define __LXW_HASH_TABLE_H__
+
+#include "xlsxwriter/third_party/queue.h"
+#include "common.h"
+
+/* List declarations. */
+STAILQ_HEAD(lxw_hash_order_list, lxw_hash_element);
+SLIST_HEAD(lxw_hash_bucket_list, lxw_hash_element);
+
+/* LXW_HASH hash table struct. */
+typedef struct lxw_hash_table {
+    size_t num_buckets;
+    size_t used_buckets;
+    size_t unique_count;
+    uint8_t free_key;
+    uint8_t free_value;
+
+    struct lxw_hash_order_list *order_list;
+    struct lxw_hash_bucket_list **buckets;
+} lxw_hash_table;
+
+/*
+ * LXW_HASH table element struct.
+ *
+ * The hash elements contain pointers to allow them to be stored in
+ * lists in the the hash table buckets and also pointers to track the
+ * insertion order in a separate list.
+ */
+typedef struct lxw_hash_element {
+    void *key;
+    void *value;
+
+    STAILQ_ENTRY (lxw_hash_element) lxw_hash_order_pointers;
+    SLIST_ENTRY (lxw_hash_element) lxw_hash_list_pointers;
+} lxw_hash_element;
+
+
+ /* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_hash_element *_hash_key_exists(lxw_hash_table *lxw_hash, void *key,
+                                   size_t key_len);
+lxw_hash_element *_insert_hash_element(lxw_hash_table *lxw_hash, void *key,
+                                       void *value, size_t key_len);
+lxw_hash_table *_new_lxw_hash(size_t num_buckets, uint8_t free_key,
+                              uint8_t free_value);
+void _free_lxw_hash(lxw_hash_table *lxw_hash);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_HASH_TABLE_H__ */
diff --git a/include/xlsxwriter/packager.h b/include/xlsxwriter/packager.h
new file mode 100644
index 00000000..09a964ac
--- /dev/null
+++ b/include/xlsxwriter/packager.h
@@ -0,0 +1,69 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * packager - A libxlsxwriter library for creating Excel XLSX packager files.
+ *
+ */
+#ifndef __LXW_PACKAGER_H__
+#define __LXW_PACKAGER_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+#include "xlsxwriter/third_party/minizip/zip.h"
+
+#include "common.h"
+#include "workbook.h"
+#include "worksheet.h"
+#include "shared_strings.h"
+#include "app.h"
+#include "core.h"
+#include "theme.h"
+#include "styles.h"
+#include "format.h"
+#include "content_types.h"
+#include "relationships.h"
+
+#define FILENAME_LEN 128
+#define LXW_ZIP_BUFFER_SIZE (16384)
+
+/*
+ * Struct to represent a packager.
+ */
+typedef struct lxw_packager {
+
+    FILE *file;
+    lxw_workbook *workbook;
+
+    size_t buffer_size;
+    zipFile zipfile;
+    zip_fileinfo zipfile_info;
+    char *filename;
+    char *buffer;
+
+} lxw_packager;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_packager *_new_packager(const char *filename);
+void _free_packager(lxw_packager *packager);
+uint8_t _create_package(lxw_packager *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_PACKAGER_H__ */
diff --git a/include/xlsxwriter/relationships.h b/include/xlsxwriter/relationships.h
new file mode 100644
index 00000000..010243c1
--- /dev/null
+++ b/include/xlsxwriter/relationships.h
@@ -0,0 +1,82 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * relationships - A libxlsxwriter library for creating Excel XLSX
+ *                 relationships files.
+ *
+ */
+#ifndef __LXW_RELATIONSHIPS_H__
+#define __LXW_RELATIONSHIPS_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+#define LXW_SCHEMA_ROOT     "http://schemas.openxmlformats.org"
+#define LXW_PACKAGE_SCHEMA  LXW_SCHEMA_ROOT "/package/2006/relationships"
+#define LXW_DOCUMENT_SCHEMA LXW_SCHEMA_ROOT "/officeDocument/2006/relationships"
+#define LXW_MS_SCHEMA       "http://schemas.microsoft.com/office/2006/relationships"
+
+/* Define the queue.h STAILQ structs for the generic data structs. */
+STAILQ_HEAD(lxw_rel_tuples, lxw_rel_tuple);
+
+typedef struct lxw_rel_tuple {
+
+    char *type;
+    char *target;
+    char *target_mode;
+
+    STAILQ_ENTRY (lxw_rel_tuple) list_pointers;
+
+} lxw_rel_tuple;
+
+/*
+ * Struct to represent a relationships.
+ */
+typedef struct lxw_relationships {
+
+    FILE *file;
+
+    uint32_t rel_id;
+    struct lxw_rel_tuples *relationships;
+
+} lxw_relationships;
+
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_relationships *_new_relationships();
+void _free_relationships(lxw_relationships *relationships);
+void _relationships_assemble_xml_file(lxw_relationships *self);
+
+void _add_document_relationship(lxw_relationships *self, const char *type,
+                                const char *target);
+void _add_package_relationship(lxw_relationships *self, const char *type,
+                               const char *target);
+void _add_ms_package_relationship(lxw_relationships *self, const char *type,
+                                  const char *target);
+void _add_worksheet_relationship(lxw_relationships *self, const char *type,
+                                 const char *target, const char *target_mode);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _relationships_xml_declaration(lxw_relationships *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_RELATIONSHIPS_H__ */
diff --git a/include/xlsxwriter/shared_strings.h b/include/xlsxwriter/shared_strings.h
new file mode 100644
index 00000000..d5560cfb
--- /dev/null
+++ b/include/xlsxwriter/shared_strings.h
@@ -0,0 +1,84 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * shared_strings - A libxlsxwriter library for creating Excel XLSX
+ *                  sst files.
+ *
+ */
+#ifndef __LXW_SST_H__
+#define __LXW_SST_H__
+
+#include <string.h>
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+#define NUM_SST_BUCKETS 8
+/* STAILQ_HEAD() declaration. */
+struct sst_order_list {
+    struct sst_element *stqh_first;
+    struct sst_element **stqh_last;
+};
+
+/* SLIST_HEAD() declaration. */
+struct sst_bucket_list {
+    struct sst_element *slh_first;
+};
+
+/*
+ * Elements of the SST table. They contain pointers to allow them to
+ * be stored in lists in the the hash table buckets and also pointers to
+ * track the insertion order in a separate list.
+ */
+struct sst_element {
+    size_t index;
+    char *string;
+
+    STAILQ_ENTRY (sst_element) sst_order_pointers;
+    SLIST_ENTRY (sst_element) sst_list_pointers;
+};
+
+/*
+ * Struct to represent a sst.
+ */
+typedef struct lxw_sst {
+    FILE *file;
+
+    size_t num_buckets;
+    size_t used_buckets;
+    size_t string_count;
+    size_t unique_count;
+
+    struct sst_order_list *order_list;
+    struct sst_bucket_list **buckets;
+
+} lxw_sst;
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_sst *_new_sst();
+void _free_sst(lxw_sst *sst);
+int32_t _get_sst_index(lxw_sst *sst, const char *string);
+void _sst_assemble_xml_file(lxw_sst *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _sst_xml_declaration(lxw_sst *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_SST_H__ */
diff --git a/include/xlsxwriter/styles.h b/include/xlsxwriter/styles.h
new file mode 100644
index 00000000..50b4a1c9
--- /dev/null
+++ b/include/xlsxwriter/styles.h
@@ -0,0 +1,78 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * styles - A libxlsxwriter library for creating Excel XLSX styles files.
+ *
+ */
+#ifndef __LXW_STYLES_H__
+#define __LXW_STYLES_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "format.h"
+
+/*
+ * Struct to represent a styles.
+ */
+typedef struct lxw_styles {
+
+    FILE *file;
+    uint32_t font_count;
+    uint32_t xf_count;
+    uint32_t dxf_count;
+    uint32_t num_format_count;
+    uint32_t border_count;
+    uint32_t fill_count;
+    struct lxw_formats *xf_formats;
+    struct lxw_formats *dxf_formats;
+
+} lxw_styles;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_styles *_new_styles();
+void _free_styles(lxw_styles *styles);
+void _styles_assemble_xml_file(lxw_styles *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _styles_xml_declaration(lxw_styles *self);
+STATIC void _write_style_sheet(lxw_styles *self);
+STATIC void _write_font_size(lxw_styles *self, uint16_t font_size);
+STATIC void _write_font_color_theme(lxw_styles *self, uint8_t theme);
+STATIC void _write_font_name(lxw_styles *self, const char *font_name);
+STATIC void _write_font_family(lxw_styles *self, uint8_t font_family);
+STATIC void _write_font_scheme(lxw_styles *self, const char *font_scheme);
+STATIC void _write_font(lxw_styles *self, lxw_format *format);
+STATIC void _write_fonts(lxw_styles *self);
+STATIC void _write_default_fill(lxw_styles *self, const char *pattern);
+STATIC void _write_fills(lxw_styles *self);
+STATIC void _write_border(lxw_styles *self, lxw_format *format);
+STATIC void _write_borders(lxw_styles *self);
+STATIC void _write_style_xf(lxw_styles *self);
+STATIC void _write_cell_style_xfs(lxw_styles *self);
+STATIC void _write_xf(lxw_styles *self, lxw_format *format);
+STATIC void _write_cell_xfs(lxw_styles *self);
+STATIC void _write_cell_style(lxw_styles *self);
+STATIC void _write_cell_styles(lxw_styles *self);
+STATIC void _write_dxfs(lxw_styles *self);
+STATIC void _write_table_styles(lxw_styles *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_STYLES_H__ */
diff --git a/include/xlsxwriter/theme.h b/include/xlsxwriter/theme.h
new file mode 100644
index 00000000..19190968
--- /dev/null
+++ b/include/xlsxwriter/theme.h
@@ -0,0 +1,50 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * theme - A libxlsxwriter library for creating Excel XLSX theme files.
+ *
+ */
+#ifndef __LXW_THEME_H__
+#define __LXW_THEME_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "common.h"
+
+#define THEME_DATA "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office Theme\"><a:themeElements><a:clrScheme name=\"Office\"><a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1><a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1><a:dk2><a:srgbClr val=\"1F497D\"/></a:dk2><a:lt2><a:srgbClr val=\"EEECE1\"/></a:lt2><a:accent1><a:srgbClr val=\"4F81BD\"/></a:accent1><a:accent2><a:srgbClr val=\"C0504D\"/></a:accent2><a:accent3><a:srgbClr val=\"9BBB59\"/></a:accent3><a:accent4><a:srgbClr val=\"8064A2\"/></a:accent4><a:accent5><a:srgbClr val=\"4BACC6\"/></a:accent5><a:accent6><a:srgbClr val=\"F79646\"/></a:accent6><a:hlink><a:srgbClr val=\"0000FF\"/></a:hlink><a:folHlink><a:srgbClr val=\"800080\"/></a:folHlink></a:clrScheme><a:fontScheme name=\"Office\"><a:majorFont><a:latin typeface=\"Cambria\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"ＭＳ Ｐゴシック\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"宋体\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Times New Roman\"/><a:font script=\"Hebr\" typeface=\"Times New Roman\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"MoolBoran\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Times New Roman\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/></a:majorFont><a:minorFont><a:latin typeface=\"Calibri\"/><a:ea typeface=\"\"/><a:cs typeface=\"\"/><a:font script=\"Jpan\" typeface=\"ＭＳ Ｐゴシック\"/><a:font script=\"Hang\" typeface=\"맑은 고딕\"/><a:font script=\"Hans\" typeface=\"宋体\"/><a:font script=\"Hant\" typeface=\"新細明體\"/><a:font script=\"Arab\" typeface=\"Arial\"/><a:font script=\"Hebr\" typeface=\"Arial\"/><a:font script=\"Thai\" typeface=\"Tahoma\"/><a:font script=\"Ethi\" typeface=\"Nyala\"/><a:font script=\"Beng\" typeface=\"Vrinda\"/><a:font script=\"Gujr\" typeface=\"Shruti\"/><a:font script=\"Khmr\" typeface=\"DaunPenh\"/><a:font script=\"Knda\" typeface=\"Tunga\"/><a:font script=\"Guru\" typeface=\"Raavi\"/><a:font script=\"Cans\" typeface=\"Euphemia\"/><a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/><a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/><a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/><a:font script=\"Thaa\" typeface=\"MV Boli\"/><a:font script=\"Deva\" typeface=\"Mangal\"/><a:font script=\"Telu\" typeface=\"Gautami\"/><a:font script=\"Taml\" typeface=\"Latha\"/><a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/><a:font script=\"Orya\" typeface=\"Kalinga\"/><a:font script=\"Mlym\" typeface=\"Kartika\"/><a:font script=\"Laoo\" typeface=\"DokChampa\"/><a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/><a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/><a:font script=\"Viet\" typeface=\"Arial\"/><a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/></a:minorFont></a:fontScheme><a:fmtScheme name=\"Office\"><a:fillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"50000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs><a:gs pos=\"35000\"><a:schemeClr val=\"phClr\"><a:tint val=\"37000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:tint val=\"15000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"16200000\" scaled=\"1\"/></a:gradFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:shade val=\"51000\"/><a:satMod val=\"130000\"/></a:schemeClr></a:gs><a:gs pos=\"80000\"><a:schemeClr val=\"phClr\"><a:shade val=\"93000\"/><a:satMod val=\"130000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"94000\"/><a:satMod val=\"135000\"/></a:schemeClr></a:gs></a:gsLst><a:lin ang=\"16200000\" scaled=\"0\"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"><a:shade val=\"95000\"/><a:satMod val=\"105000\"/></a:schemeClr></a:solidFill><a:prstDash val=\"solid\"/></a:ln><a:ln w=\"25400\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/></a:ln><a:ln w=\"38100\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\"><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:prstDash val=\"solid\"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"40000\" dist=\"20000\" dir=\"5400000\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"38000\"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\"><a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst=\"orthographicFront\"><a:rot lat=\"0\" lon=\"0\" rev=\"0\"/></a:camera><a:lightRig rig=\"threePt\" dir=\"t\"><a:rot lat=\"0\" lon=\"0\" rev=\"1200000\"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w=\"63500\" h=\"25400\"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"40000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs><a:gs pos=\"40000\"><a:schemeClr val=\"phClr\"><a:tint val=\"45000\"/><a:shade val=\"99000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"20000\"/><a:satMod val=\"255000\"/></a:schemeClr></a:gs></a:gsLst><a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"-80000\" r=\"50000\" b=\"180000\"/></a:path></a:gradFill><a:gradFill rotWithShape=\"1\"><a:gsLst><a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"80000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs><a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"30000\"/><a:satMod val=\"200000\"/></a:schemeClr></a:gs></a:gsLst><a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" b=\"50000\"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>\n"
+
+/*
+ * Struct to represent a theme.
+ */
+typedef struct lxw_theme {
+
+    FILE *file;
+} lxw_theme;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+lxw_theme *_new_theme();
+void _free_theme(lxw_theme *theme);
+void _theme_xml_declaration(lxw_theme *self);
+void _theme_assemble_xml_file(lxw_theme *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_THEME_H__ */
diff --git a/include/xlsxwriter/third_party/minizip/ioapi.h b/include/xlsxwriter/third_party/minizip/ioapi.h
new file mode 100644
index 00000000..4a4897f3
--- /dev/null
+++ b/include/xlsxwriter/third_party/minizip/ioapi.h
@@ -0,0 +1,208 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
+
+*/
+
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef __FreeBSD__
+#define fopen64 fopen
+#define ftello64 ftello
+#define fseeko64 fseeko
+#endif
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#define MAXU32 0xffffffff
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
+#endif
+
+
+
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
+
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
+
+
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+/* #define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) */
+/* #define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) */
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/xlsxwriter/third_party/minizip/zip.h b/include/xlsxwriter/third_party/minizip/zip.h
new file mode 100644
index 00000000..90722f49
--- /dev/null
+++ b/include/xlsxwriter/third_party/minizip/zip.h
@@ -0,0 +1,365 @@
+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
+
+*/
+
+/* Pragma added by libxlsxwriter project to avoid warnings with -pedantic -ansi. */
+#pragma GCC system_header
+
+#ifndef _zip12_H
+#define _zip12_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* #define HAVE_BZIP2 */
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
+/*
+  Close the current file in the zipfile, for file opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip64_H */
diff --git a/include/xlsxwriter/third_party/queue.h b/include/xlsxwriter/third_party/queue.h
new file mode 100644
index 00000000..55bd4945
--- /dev/null
+++ b/include/xlsxwriter/third_party/queue.h
@@ -0,0 +1,694 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+ * $FreeBSD$
+ */
+
+#ifndef _SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * This file defines four types of data structures: singly-linked lists,
+ * singly-linked tail queues, lists and tail queues.
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction.  Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A singly-linked tail queue is headed by a pair of pointers, one to the
+ * head of the list and the other to the tail of the list. The elements are
+ * singly linked for minimum space and pointer manipulation overhead at the
+ * expense of O(n) removal for arbitrary elements. New elements can be added
+ * to the list after an existing element, at the head of the list, or at the
+ * end of the list. Elements being removed from the head of the tail queue
+ * should use the explicit macro for this purpose for optimum efficiency.
+ * A singly-linked tail queue may only be traversed in the forward direction.
+ * Singly-linked tail queues are ideal for applications with large datasets
+ * and few or no removals or for implementing a FIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may be traversed in either direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ *
+ *
+ *				SLIST	LIST	STAILQ	TAILQ
+ * _HEAD			+	+	+	+
+ * _HEAD_INITIALIZER		+	+	+	+
+ * _ENTRY			+	+	+	+
+ * _INIT			+	+	+	+
+ * _EMPTY			+	+	+	+
+ * _FIRST			+	+	+	+
+ * _NEXT			+	+	+	+
+ * _PREV			-	+	-	+
+ * _LAST			-	-	+	+
+ * _FOREACH			+	+	+	+
+ * _FOREACH_FROM		+	+	+	+
+ * _FOREACH_SAFE		+	+	+	+
+ * _FOREACH_FROM_SAFE		+	+	+	+
+ * _FOREACH_REVERSE		-	-	-	+
+ * _FOREACH_REVERSE_FROM	-	-	-	+
+ * _FOREACH_REVERSE_SAFE	-	-	-	+
+ * _FOREACH_REVERSE_FROM_SAFE	-	-	-	+
+ * _INSERT_HEAD			+	+	+	+
+ * _INSERT_BEFORE		-	+	-	+
+ * _INSERT_AFTER		+	+	+	+
+ * _INSERT_TAIL			-	-	+	+
+ * _CONCAT			-	-	+	+
+ * _REMOVE_AFTER		+	-	+	-
+ * _REMOVE_HEAD			+	-	+	-
+ * _REMOVE			+	+	+	+
+ * _SWAP			+	+	+	+
+ *
+ */
+#ifdef QUEUE_MACRO_DEBUG
+/* Store the last 2 places the queue element or head was altered */
+struct qm_trace {
+	unsigned long	 lastline;
+	unsigned long	 prevline;
+	const char	*lastfile;
+	const char	*prevfile;
+};
+
+#define	TRACEBUF	struct qm_trace trace;
+#define	TRACEBUF_INITIALIZER	{ __FILE__, __LINE__, NULL, 0 } ,
+#define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
+#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
+
+#define	QMD_TRACE_HEAD(head) do {					\
+	(head)->trace.prevline = (head)->trace.lastline;		\
+	(head)->trace.prevfile = (head)->trace.lastfile;		\
+	(head)->trace.lastline = __LINE__;				\
+	(head)->trace.lastfile = __FILE__;				\
+} while (0)
+
+#define	QMD_TRACE_ELEM(elem) do {					\
+	(elem)->trace.prevline = (elem)->trace.lastline;		\
+	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
+	(elem)->trace.lastline = __LINE__;				\
+	(elem)->trace.lastfile = __FILE__;				\
+} while (0)
+
+#else
+#define	QMD_TRACE_ELEM(elem)
+#define	QMD_TRACE_HEAD(head)
+#define	QMD_SAVELINK(name, link)
+#define	TRACEBUF
+#define	TRACEBUF_INITIALIZER
+#define	TRASHIT(x)
+#endif	/* QUEUE_MACRO_DEBUG */
+
+/*
+ * Singly-linked List declarations.
+ */
+#define	SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
+
+#define	SLIST_FIRST(head)	((head)->slh_first)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for ((var) = SLIST_FIRST((head));				\
+	    (var);							\
+	    (var) = SLIST_NEXT((var), field))
+
+#define	SLIST_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
+	    (var);							\
+	    (var) = SLIST_NEXT((var), field))
+
+#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = SLIST_FIRST((head));				\
+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	SLIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
+	for ((varp) = &SLIST_FIRST((head));				\
+	    ((var) = *(varp)) != NULL;					\
+	    (varp) = &SLIST_NEXT((var), field))
+
+#define	SLIST_INIT(head) do {						\
+	SLIST_FIRST((head)) = NULL;					\
+} while (0)
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
+	SLIST_NEXT((slistelm), field) = (elm);				\
+} while (0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
+	SLIST_FIRST((head)) = (elm);					\
+} while (0)
+
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+#define	SLIST_REMOVE(head, elm, type, field) do {			\
+	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
+	if (SLIST_FIRST((head)) == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	}								\
+	else {								\
+		struct type *curelm = SLIST_FIRST((head));		\
+		while (SLIST_NEXT(curelm, field) != (elm))		\
+			curelm = SLIST_NEXT(curelm, field);		\
+		SLIST_REMOVE_AFTER(curelm, field);			\
+	}								\
+	TRASHIT(*oldnext);						\
+} while (0)
+
+#define SLIST_REMOVE_AFTER(elm, field) do {				\
+	SLIST_NEXT(elm, field) =					\
+	    SLIST_NEXT(SLIST_NEXT(elm, field), field);			\
+} while (0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
+} while (0)
+
+#define SLIST_SWAP(head1, head2, type) do {				\
+	struct type *swap_first = SLIST_FIRST(head1);			\
+	SLIST_FIRST(head1) = SLIST_FIRST(head2);			\
+	SLIST_FIRST(head2) = swap_first;				\
+} while (0)
+
+/*
+ * Singly-linked Tail queue declarations.
+ */
+#define	STAILQ_HEAD(name, type)						\
+struct name {								\
+	struct type *stqh_first;/* first element */			\
+	struct type **stqh_last;/* addr of last next element */		\
+}
+
+#define	STAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).stqh_first }
+
+#define	STAILQ_ENTRY(type)						\
+struct {								\
+	struct type *stqe_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked Tail queue functions.
+ */
+#define	STAILQ_CONCAT(head1, head2) do {				\
+	if (!STAILQ_EMPTY((head2))) {					\
+		*(head1)->stqh_last = (head2)->stqh_first;		\
+		(head1)->stqh_last = (head2)->stqh_last;		\
+		STAILQ_INIT((head2));					\
+	}								\
+} while (0)
+
+#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
+
+#define	STAILQ_FIRST(head)	((head)->stqh_first)
+
+#define	STAILQ_FOREACH(var, head, field)				\
+	for((var) = STAILQ_FIRST((head));				\
+	   (var);							\
+	   (var) = STAILQ_NEXT((var), field))
+
+#define	STAILQ_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
+	   (var);							\
+	   (var) = STAILQ_NEXT((var), field))
+
+#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = STAILQ_FIRST((head));				\
+	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)		\
+	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
+	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	STAILQ_INIT(head) do {						\
+	STAILQ_FIRST((head)) = NULL;					\
+	(head)->stqh_last = &STAILQ_FIRST((head));			\
+} while (0)
+
+#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
+	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
+		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+	STAILQ_NEXT((tqelm), field) = (elm);				\
+} while (0)
+
+#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
+		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+	STAILQ_FIRST((head)) = (elm);					\
+} while (0)
+
+#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
+	STAILQ_NEXT((elm), field) = NULL;				\
+	*(head)->stqh_last = (elm);					\
+	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
+} while (0)
+
+#define	STAILQ_LAST(head, type, field)					\
+	(STAILQ_EMPTY((head)) ? NULL :					\
+	    __containerof((head)->stqh_last, struct type, field.stqe_next))
+
+#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
+
+#define	STAILQ_REMOVE(head, elm, type, field) do {			\
+	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
+	if (STAILQ_FIRST((head)) == (elm)) {				\
+		STAILQ_REMOVE_HEAD((head), field);			\
+	}								\
+	else {								\
+		struct type *curelm = STAILQ_FIRST((head));		\
+		while (STAILQ_NEXT(curelm, field) != (elm))		\
+			curelm = STAILQ_NEXT(curelm, field);		\
+		STAILQ_REMOVE_AFTER(head, curelm, field);		\
+	}								\
+	TRASHIT(*oldnext);						\
+} while (0)
+
+#define STAILQ_REMOVE_AFTER(head, elm, field) do {			\
+	if ((STAILQ_NEXT(elm, field) =					\
+	     STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL)	\
+		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
+} while (0)
+
+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
+	if ((STAILQ_FIRST((head)) =					\
+	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
+		(head)->stqh_last = &STAILQ_FIRST((head));		\
+} while (0)
+
+#define STAILQ_SWAP(head1, head2, type) do {				\
+	struct type *swap_first = STAILQ_FIRST(head1);			\
+	struct type **swap_last = (head1)->stqh_last;			\
+	STAILQ_FIRST(head1) = STAILQ_FIRST(head2);			\
+	(head1)->stqh_last = (head2)->stqh_last;			\
+	STAILQ_FIRST(head2) = swap_first;				\
+	(head2)->stqh_last = swap_last;					\
+	if (STAILQ_EMPTY(head1))					\
+		(head1)->stqh_last = &STAILQ_FIRST(head1);		\
+	if (STAILQ_EMPTY(head2))					\
+		(head2)->stqh_last = &STAILQ_FIRST(head2);		\
+} while (0)
+
+
+/*
+ * List declarations.
+ */
+#define	LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;	/* first element */			\
+}
+
+#define	LIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+
+/*
+ * List functions.
+ */
+
+#if (defined(_KERNEL) && defined(INVARIANTS))
+#define	QMD_LIST_CHECK_HEAD(head, field) do {				\
+	if (LIST_FIRST((head)) != NULL &&				\
+	    LIST_FIRST((head))->field.le_prev !=			\
+	     &LIST_FIRST((head)))					\
+		panic("Bad list head %p first->prev != head", (head));	\
+} while (0)
+
+#define	QMD_LIST_CHECK_NEXT(elm, field) do {				\
+	if (LIST_NEXT((elm), field) != NULL &&				\
+	    LIST_NEXT((elm), field)->field.le_prev !=			\
+	     &((elm)->field.le_next))					\
+	     	panic("Bad link elm %p next->prev != elm", (elm));	\
+} while (0)
+
+#define	QMD_LIST_CHECK_PREV(elm, field) do {				\
+	if (*(elm)->field.le_prev != (elm))				\
+		panic("Bad link elm %p prev->next != elm", (elm));	\
+} while (0)
+#else
+#define	QMD_LIST_CHECK_HEAD(head, field)
+#define	QMD_LIST_CHECK_NEXT(elm, field)
+#define	QMD_LIST_CHECK_PREV(elm, field)
+#endif /* (_KERNEL && INVARIANTS) */
+
+#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
+
+#define	LIST_FIRST(head)	((head)->lh_first)
+
+#define	LIST_FOREACH(var, head, field)					\
+	for ((var) = LIST_FIRST((head));				\
+	    (var);							\
+	    (var) = LIST_NEXT((var), field))
+
+#define	LIST_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
+	    (var);							\
+	    (var) = LIST_NEXT((var), field))
+
+#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = LIST_FIRST((head));				\
+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	LIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	LIST_INIT(head) do {						\
+	LIST_FIRST((head)) = NULL;					\
+} while (0)
+
+#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
+	QMD_LIST_CHECK_NEXT(listelm, field);				\
+	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
+		LIST_NEXT((listelm), field)->field.le_prev =		\
+		    &LIST_NEXT((elm), field);				\
+	LIST_NEXT((listelm), field) = (elm);				\
+	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
+} while (0)
+
+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
+	QMD_LIST_CHECK_PREV(listelm, field);				\
+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
+	LIST_NEXT((elm), field) = (listelm);				\
+	*(listelm)->field.le_prev = (elm);				\
+	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
+} while (0)
+
+#define	LIST_INSERT_HEAD(head, elm, field) do {				\
+	QMD_LIST_CHECK_HEAD((head), field);				\
+	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
+		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
+	LIST_FIRST((head)) = (elm);					\
+	(elm)->field.le_prev = &LIST_FIRST((head));			\
+} while (0)
+
+#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
+
+#define	LIST_PREV(elm, head, type, field)				\
+	((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL :		\
+	    __containerof((elm)->field.le_prev, struct type, field.le_next))
+
+#define	LIST_REMOVE(elm, field) do {					\
+	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
+	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
+	QMD_LIST_CHECK_NEXT(elm, field);				\
+	QMD_LIST_CHECK_PREV(elm, field);				\
+	if (LIST_NEXT((elm), field) != NULL)				\
+		LIST_NEXT((elm), field)->field.le_prev = 		\
+		    (elm)->field.le_prev;				\
+	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
+	TRASHIT(*oldnext);						\
+	TRASHIT(*oldprev);						\
+} while (0)
+
+#define LIST_SWAP(head1, head2, type, field) do {			\
+	struct type *swap_tmp = LIST_FIRST((head1));			\
+	LIST_FIRST((head1)) = LIST_FIRST((head2));			\
+	LIST_FIRST((head2)) = swap_tmp;					\
+	if ((swap_tmp = LIST_FIRST((head1))) != NULL)			\
+		swap_tmp->field.le_prev = &LIST_FIRST((head1));		\
+	if ((swap_tmp = LIST_FIRST((head2))) != NULL)			\
+		swap_tmp->field.le_prev = &LIST_FIRST((head2));		\
+} while (0)
+
+/*
+ * Tail queue declarations.
+ */
+#define	TAILQ_HEAD(name, type)						\
+struct name {								\
+	struct type *tqh_first;	/* first element */			\
+	struct type **tqh_last;	/* addr of last next element */		\
+	TRACEBUF							\
+}
+
+#define	TAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
+
+#define	TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+	TRACEBUF							\
+}
+
+/*
+ * Tail queue functions.
+ */
+#if (defined(_KERNEL) && defined(INVARIANTS))
+#define	QMD_TAILQ_CHECK_HEAD(head, field) do {				\
+	if (!TAILQ_EMPTY(head) &&					\
+	    TAILQ_FIRST((head))->field.tqe_prev !=			\
+	     &TAILQ_FIRST((head)))					\
+		panic("Bad tailq head %p first->prev != head", (head));	\
+} while (0)
+
+#define	QMD_TAILQ_CHECK_TAIL(head, field) do {				\
+	if (*(head)->tqh_last != NULL)					\
+	    	panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); 	\
+} while (0)
+
+#define	QMD_TAILQ_CHECK_NEXT(elm, field) do {				\
+	if (TAILQ_NEXT((elm), field) != NULL &&				\
+	    TAILQ_NEXT((elm), field)->field.tqe_prev !=			\
+	     &((elm)->field.tqe_next))					\
+		panic("Bad link elm %p next->prev != elm", (elm));	\
+} while (0)
+
+#define	QMD_TAILQ_CHECK_PREV(elm, field) do {				\
+	if (*(elm)->field.tqe_prev != (elm))				\
+		panic("Bad link elm %p prev->next != elm", (elm));	\
+} while (0)
+#else
+#define	QMD_TAILQ_CHECK_HEAD(head, field)
+#define	QMD_TAILQ_CHECK_TAIL(head, headname)
+#define	QMD_TAILQ_CHECK_NEXT(elm, field)
+#define	QMD_TAILQ_CHECK_PREV(elm, field)
+#endif /* (_KERNEL && INVARIANTS) */
+
+#define	TAILQ_CONCAT(head1, head2, field) do {				\
+	if (!TAILQ_EMPTY(head2)) {					\
+		*(head1)->tqh_last = (head2)->tqh_first;		\
+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
+		(head1)->tqh_last = (head2)->tqh_last;			\
+		TAILQ_INIT((head2));					\
+		QMD_TRACE_HEAD(head1);					\
+		QMD_TRACE_HEAD(head2);					\
+	}								\
+} while (0)
+
+#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
+
+#define	TAILQ_FIRST(head)	((head)->tqh_first)
+
+#define	TAILQ_FOREACH(var, head, field)					\
+	for ((var) = TAILQ_FIRST((head));				\
+	    (var);							\
+	    (var) = TAILQ_NEXT((var), field))
+
+#define	TAILQ_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
+	    (var);							\
+	    (var) = TAILQ_NEXT((var), field))
+
+#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
+	for ((var) = TAILQ_FIRST((head));				\
+	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
+	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
+#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+	for ((var) = TAILQ_LAST((head), headname);			\
+	    (var);							\
+	    (var) = TAILQ_PREV((var), headname, field))
+
+#define	TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field)		\
+	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
+	    (var);							\
+	    (var) = TAILQ_PREV((var), headname, field))
+
+#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
+	for ((var) = TAILQ_LAST((head), headname);			\
+	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
+	    (var) = (tvar))
+
+#define	TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, tvar) \
+	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
+	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
+	    (var) = (tvar))
+
+#define	TAILQ_INIT(head) do {						\
+	TAILQ_FIRST((head)) = NULL;					\
+	(head)->tqh_last = &TAILQ_FIRST((head));			\
+	QMD_TRACE_HEAD(head);						\
+} while (0)
+
+#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	QMD_TAILQ_CHECK_NEXT(listelm, field);				\
+	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
+		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
+		    &TAILQ_NEXT((elm), field);				\
+	else {								\
+		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
+		QMD_TRACE_HEAD(head);					\
+	}								\
+	TAILQ_NEXT((listelm), field) = (elm);				\
+	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
+	QMD_TRACE_ELEM(&(elm)->field);					\
+	QMD_TRACE_ELEM(&listelm->field);				\
+} while (0)
+
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	QMD_TAILQ_CHECK_PREV(listelm, field);				\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	TAILQ_NEXT((elm), field) = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
+	QMD_TRACE_ELEM(&(elm)->field);					\
+	QMD_TRACE_ELEM(&listelm->field);				\
+} while (0)
+
+#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
+	QMD_TAILQ_CHECK_HEAD(head, field);				\
+	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
+		TAILQ_FIRST((head))->field.tqe_prev =			\
+		    &TAILQ_NEXT((elm), field);				\
+	else								\
+		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
+	TAILQ_FIRST((head)) = (elm);					\
+	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
+	QMD_TRACE_HEAD(head);						\
+	QMD_TRACE_ELEM(&(elm)->field);					\
+} while (0)
+
+#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
+	QMD_TAILQ_CHECK_TAIL(head, field);				\
+	TAILQ_NEXT((elm), field) = NULL;				\
+	(elm)->field.tqe_prev = (head)->tqh_last;			\
+	*(head)->tqh_last = (elm);					\
+	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
+	QMD_TRACE_HEAD(head);						\
+	QMD_TRACE_ELEM(&(elm)->field);					\
+} while (0)
+
+#define	TAILQ_LAST(head, headname)					\
+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
+
+#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
+
+#define	TAILQ_PREV(elm, headname, field)				\
+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+
+#define	TAILQ_REMOVE(head, elm, field) do {				\
+	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
+	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
+	QMD_TAILQ_CHECK_NEXT(elm, field);				\
+	QMD_TAILQ_CHECK_PREV(elm, field);				\
+	if ((TAILQ_NEXT((elm), field)) != NULL)				\
+		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
+		    (elm)->field.tqe_prev;				\
+	else {								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+		QMD_TRACE_HEAD(head);					\
+	}								\
+	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
+	TRASHIT(*oldnext);						\
+	TRASHIT(*oldprev);						\
+	QMD_TRACE_ELEM(&(elm)->field);					\
+} while (0)
+
+#define TAILQ_SWAP(head1, head2, type, field) do {			\
+	struct type *swap_first = (head1)->tqh_first;			\
+	struct type **swap_last = (head1)->tqh_last;			\
+	(head1)->tqh_first = (head2)->tqh_first;			\
+	(head1)->tqh_last = (head2)->tqh_last;				\
+	(head2)->tqh_first = swap_first;				\
+	(head2)->tqh_last = swap_last;					\
+	if ((swap_first = (head1)->tqh_first) != NULL)			\
+		swap_first->field.tqe_prev = &(head1)->tqh_first;	\
+	else								\
+		(head1)->tqh_last = &(head1)->tqh_first;		\
+	if ((swap_first = (head2)->tqh_first) != NULL)			\
+		swap_first->field.tqe_prev = &(head2)->tqh_first;	\
+	else								\
+		(head2)->tqh_last = &(head2)->tqh_first;		\
+} while (0)
+
+#endif /* !_SYS_QUEUE_H_ */
diff --git a/include/xlsxwriter/utility.h b/include/xlsxwriter/utility.h
new file mode 100644
index 00000000..12ba6df9
--- /dev/null
+++ b/include/xlsxwriter/utility.h
@@ -0,0 +1,84 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ */
+
+/**
+ * @file utility.h
+ *
+ * @brief Utility functions for libxlsxwriter.
+ *
+ * <!-- Copyright 2014, John McNamara, jmcnamara@cpan.org -->
+ *
+ */
+
+#ifndef __LXW_UTILITY_H__
+#define __LXW_UTILITY_H__
+
+#include <stdint.h>
+#include "common.h"
+
+#define MAX_COL_NAME_LENGTH   5
+#define MAX_CELL_NAME_LENGTH  13
+#define MAX_CELL_RANGE_LENGTH (MAX_CELL_NAME_LENGTH * 2 + 1)
+#define EPOCH_1900            0
+#define EPOCH_1904            1
+
+/** @brief Struct to represent a date and time in Excel.
+ *
+ * Struct to represent a date and time in Excel. See @ref working_with_dates.
+ */
+typedef struct lxw_datetime {
+
+    /** Year     : 1900 - 9999 */
+    int year;
+    /** Month    : 1 - 12 */
+    int month;
+    /** Day      : 1 - 31 */
+    int day;
+    /** Hour     : 0 - 23 */
+    int hour;
+    /** Minute   : 0 - 59 */
+    int min;
+    /** Seconds  : 0 - 59.999 */
+    double sec;
+
+} lxw_datetime;
+
+
+
+ /* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+void _xl_col_to_name(char *col_name, int col_num, uint8_t absolute);
+
+void xl_rowcol_to_cell(char *cell_name, int row, int col);
+
+void xl_rowcol_to_cell_abs(char *cell_name,
+                           int row,
+                           int col, uint8_t abs_row, uint8_t abs_col);
+
+void xl_range(char *range,
+              int first_row, int first_col, int last_row, int last_col);
+
+void xl_range_abs(char *range,
+                  int first_row, int first_col, int last_row, int last_col);
+
+double _datetime_to_excel_date(lxw_datetime *datetime, uint8_t date_1904);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+#endif
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_UTILITY_H__ */
diff --git a/include/xlsxwriter/workbook.h b/include/xlsxwriter/workbook.h
new file mode 100644
index 00000000..ea696b47
--- /dev/null
+++ b/include/xlsxwriter/workbook.h
@@ -0,0 +1,244 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ */
+
+/**
+ * @page workbook_page The Workbook object
+ *
+ * The Workbook is the main object exposed by the libxlsxwriter library. It
+ * represents the entire spreadsheet as you see it in Excel and internally it
+ * represents the Excel file as it is written on disk.
+ *
+ * See @ref workbook.h for full details of the functionality.
+ * 
+ * @file workbook.h
+ *
+ * @brief Functions related to creating an Excel xlsx workbook.
+ *
+ * The Workbook is the main object exposed by the libxlsxwriter library. It
+ * represents the entire spreadsheet as you see it in Excel and internally it
+ * represents the Excel file as it is written on disk.
+ *
+ * @code
+ *     #include "xlsxwriter.h"
+ *
+ *     int main() {
+ *
+ *         lxw_workbook  *workbook  = new_workbook("filename.xlsx");
+ *         lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+ *
+ *         worksheet_write_string(worksheet, 0, 0, "Hello Excel", NULL);
+ *
+ *         return workbook_close(workbook);
+ *     }
+ * @endcode
+ *
+ * @image html workbook01.png
+ *
+ */
+#ifndef __LXW_WORKBOOK_H__
+#define __LXW_WORKBOOK_H__
+
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+#include "worksheet.h"
+#include "shared_strings.h"
+#include "hash_table.h"
+#include "common.h"
+
+/* Define the queue.h TAILQ structs for the workbook list. */
+STAILQ_HEAD(lxw_worksheets, lxw_worksheet);
+
+/**
+ * @brief Errors conditions encountered when closing the Workbook and writing
+ * the Excel file to disk.
+ */
+enum lxw_close_error {
+    /** No error */
+    LXW_CLOSE_ERROR_NONE,
+    /** Error encountered when creating file zip container */
+    LXW_CLOSE_ERROR_ZIP
+    /* TODO. Need to add/document more. */
+};
+
+/**
+ * @brief Struct to represent an Excel workbook.
+ *
+ * The members of the lxw_workbook struct aren't modified directly. Instead
+ * the workbook properties are set by calling the functions shown in
+ * workbook.h.
+ */
+typedef struct lxw_workbook {
+
+    FILE *file;
+    struct lxw_worksheets *worksheets;
+    struct lxw_formats *formats;
+    lxw_sst *sst;
+    lxw_doc_properties *properties;
+    const char *filename;
+
+    uint16_t num_sheets;
+    uint16_t first_sheet;
+    uint16_t active_tab;
+    uint16_t num_xf_formats;
+    uint16_t num_format_count;
+
+    uint16_t font_count;
+    uint16_t border_count;
+    uint16_t fill_count;
+
+    lxw_hash_table *xf_format_indices;
+
+} lxw_workbook;
+
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+/**
+ * @brief Create a new workbook object.
+ *
+ * @param filename The name of the new Excel file to create.
+ *
+ * @return A lxw_workbook instance.
+ *
+ * The `%new_workbook()` constructor is used to create a new Excel workbook
+ * with a given filename:
+ *
+ * @code
+ *     lxw_workbook *workbook  = new_workbook("filename.xlsx");
+ * @endcode
+ *
+ * When specifying a filename it is recommended that you use an `.xlsx`
+ * extension or Excel will generate a warning when opening the file.
+ *
+ */
+lxw_workbook *new_workbook(const char *filename);
+
+/**
+ * @brief Add a new worksheet to a workbook:
+ *
+ * @param workbook  Pointer to a lxw_workbook instance.
+ * @param sheetname Optional worksheet name, defaults to Sheet1, etc.
+ *
+ * @return A lxw_worksheet instance.
+ *
+ * The `%workbook_add_worksheet()` method adds a new worksheet to a workbook:
+ *
+ * At least one worksheet should be added to a new workbook: The @ref
+ * worksheet.h "Worksheet" object is used to write data and configure a
+ * worksheet in the workbook.
+ *
+ * The `sheetname` parameter is optional. If it is `NULL` the default
+ * Excel convention will be followed, i.e. Sheet1, Sheet2, etc.:
+ *
+ * @code
+ *     worksheet = workbook_add_worksheet(workbook, NULL  );     // Sheet1
+ *     worksheet = workbook_add_worksheet(workbook, "Foglio2");  // Foglio2
+ *     worksheet = workbook_add_worksheet(workbook, "Data");     // Data
+ *     worksheet = workbook_add_worksheet(workbook, NULL  );     // Sheet4
+ *
+ * @endcode
+ *
+ * @image html workbook02.png
+ *
+ * The worksheet name must be a valid Excel worksheet name, i.e. it must be
+ * less than 32 character and it cannot contain any of the characters:
+ *
+ *     / \ [ ] : * ?
+ *
+ * In addition, you cannot use the same, case insensitive, `sheetname` for more
+ * than one worksheet.
+ *
+ */
+lxw_worksheet *workbook_add_worksheet(lxw_workbook *workbook,
+                                      const char *sheetname);
+
+/**
+ * @brief Create a new @ref format.h "Format" object to formats cells in
+ *        worksheets.
+ *
+ * @param workbook Pointer to a lxw_workbook instance.
+ *
+ * @return A lxw_format instance.
+ *
+ * The `workbook_add_format()` function can be used to create new @ref
+ * format.h "Format" objects which are used to apply formatting to a cell.
+ *
+ * @code
+ *    // Create the Format.
+ *    lxw_format *format = workbook_add_format(workbook);
+ *
+ *    // Set some of the format properties.
+ *    format_set_bold(format);
+ *    format_set_font_color(format, LXW_COLOR_RED);
+ *
+ *    // Use the format to change the text format in a cell.
+ *    worksheet_write_string(worksheet, 0, 0, "Hello", format);
+ * @endcode
+ *
+ * See @ref format.h "the Format object" and @ref working_with_formats
+ * sections for more details about Format properties and how to set them.
+ *
+ */
+lxw_format *workbook_add_format(lxw_workbook *workbook);
+
+/**
+ * @brief Close the Workbook object and write the XLSX file.
+ *
+ * @param workbook Pointer to a lxw_workbook instance.
+ *
+ * @return A #lxw_close_error.
+ *
+ * The `%workbook_close()` function closes a Workbook object, writes the Excel
+ * file to disk, frees any memory allocated internally to the Workbook and
+ * frees the object itself.
+ *
+ * @code
+ *     workbook_close(workbook);
+ * @endcode
+ *
+ * The `%workbook_close()` function returns any #lxw_close_error error codes
+ * encountered when creating the Excel file. The error code can be returned
+ * from the program main or the calling function:
+ *
+ * @code
+ *     return workbook_close(workbook);
+ * @endcode
+ *
+ */
+uint8_t workbook_close(lxw_workbook *workbook);
+
+void _free_workbook(lxw_workbook *workbook);
+void _workbook_assemble_xml_file(lxw_workbook *self);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _workbook_xml_declaration(lxw_workbook *self);
+STATIC void _workbook_xml_declaration(lxw_workbook *self);
+STATIC void _write_workbook(lxw_workbook *self);
+STATIC void _write_file_version(lxw_workbook *self);
+STATIC void _write_workbook_pr(lxw_workbook *self);
+STATIC void _write_book_views(lxw_workbook *self);
+STATIC void _write_workbook_view(lxw_workbook *self);
+STATIC void _write_sheet(lxw_workbook *self,
+                         const char *name, uint32_t sheet_id, uint8_t hidden);
+STATIC void _write_sheets(lxw_workbook *self);
+STATIC void _write_calc_pr(lxw_workbook *self);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_WORKBOOK_H__ */
diff --git a/include/xlsxwriter/worksheet.h b/include/xlsxwriter/worksheet.h
new file mode 100644
index 00000000..f2ccb785
--- /dev/null
+++ b/include/xlsxwriter/worksheet.h
@@ -0,0 +1,430 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ */
+
+/**
+ * @page worksheet_page The Worksheet object
+ *
+ * The Worksheet object represents an Excel worksheet. It handles
+ * operations such as writing data to cells or formatting worksheet
+ * layout.
+ *
+ * See @ref worksheet.h for full details of the functionality.
+ * 
+ * @file worksheet.h
+ *
+ * @brief Functions related to adding data and formatting to a worksheet.
+ *
+ * The Worksheet object represents an Excel worksheet. It handles
+ * operations such as writing data to cells or formatting worksheet
+ * layout.
+ *
+ * A Worksheet object isn’t created directly. Instead a worksheet is
+ * created by calling the workbook_add_worksheet() method from a
+ * Workbook object:
+ * 
+ * @code
+ *     #include "xlsxwriter.h"
+ *
+ *     int main() {
+ *
+ *         lxw_workbook  *workbook  = new_workbook("filename.xlsx");
+ *         lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+ *
+ *         worksheet_write_string(worksheet, 0, 0, "Hello Excel", NULL);
+ *
+ *         return workbook_close(workbook);
+ *     }
+ * @endcode
+ *
+ */
+#ifndef __LXW_WORKSHEET_H__
+#define __LXW_WORKSHEET_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "shared_strings.h"
+#include "common.h"
+#include "format.h"
+#include "utility.h"
+
+/** @brief Error codes from `worksheet_write*()` functions. */
+enum lxw_write_error {
+    LXW_WRITE_ERROR_NONE = 0,
+    LXW_RANGE_ERROR,
+    LXW_STRING_HASH_ERROR,
+    LXW_STRING_LENGTH_ERROR,
+    LXW_END
+};
+
+enum cell_types {
+    NUMBER_CELL = 1,
+    STRING_CELL,
+    FORMULA_CELL,
+    BLANK_CELL
+};
+
+/* Define the queue.h TAILQ structs for the list head types. */
+TAILQ_HEAD(lxw_table_cells, lxw_cell);
+TAILQ_HEAD(lxw_table_rows, lxw_row);
+
+/**
+ * @brief Struct to represent an Excel worksheet.
+ *
+ * The members of the lxw_worksheet struct aren't modified directly. Instead
+ * the worksheet properties are set by calling the functions shown in
+ * worksheet.h.
+ */
+typedef struct lxw_worksheet {
+
+    FILE *file;
+    struct lxw_table_rows *table;
+
+    uint32_t dim_rowmin;
+    uint32_t dim_rowmax;
+    uint16_t dim_colmin;
+    uint16_t dim_colmax;
+
+    lxw_sst *sst;
+    char *name;
+
+    uint32_t index;
+    uint8_t active;
+    uint8_t selected;
+    uint8_t hidden;
+
+    STAILQ_ENTRY (lxw_worksheet) list_pointers;
+
+} lxw_worksheet;
+
+/*
+ * Worksheet initialisation data.
+ */
+typedef struct lxw_worksheet_init_data {
+    uint32_t index;
+    uint8_t hidden;
+
+    lxw_sst *sst;
+    char *name;
+
+} lxw_worksheet_init_data;
+
+/* Struct to represent a worksheet row. */
+typedef struct lxw_row {
+    uint32_t row_num;
+    struct lxw_table_cells *cells;
+
+    /* List pointers for queue.h. */
+    TAILQ_ENTRY (lxw_row) list_pointers;
+} lxw_row;
+
+/* Struct to represent a worksheet cell. */
+typedef struct lxw_cell {
+    uint32_t row_num;
+    uint16_t col_num;
+    enum cell_types type;
+    lxw_format *format;
+
+    union {
+        double number;
+        int32_t string_id;
+        char *formula;
+    } u;
+
+    union {
+        double number;
+        char *string;
+    } formula_result;
+
+    /* List pointers for queue.h. */
+    TAILQ_ENTRY (lxw_cell) list_pointers;
+} lxw_cell;
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+/**
+ * @brief Write a number to a worksheet cell.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param number    The number to write to the cell.
+ * @param format    A pointer to a Format instance or NULL.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * The `worksheet_write_number()` method writes numeric types to the cell specified by
+ * `row` and `column`:
+ *
+ * @code
+ *     worksheet_write_number(worksheet, 0, 0, 123456, NULL);
+ *     worksheet_write_number(worksheet, 1, 0, 2.3451, NULL);
+ * @endcode
+ *
+ * @image html write_number01.png
+ *
+ * The native data type for all numbers in Excel is a IEEE-754 64-bit
+ * double-precision floating point, which is also the default type used by
+ * `%worksheet_write_number`.
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter can be `NULL` to indicate no formatting or it can be a
+ * @ref format.h "Format" object.
+ *
+ * @code
+ *     lxw_format *format = workbook_add_format(workbook);
+ *     format_set_num_format(format, "$#,##0.00");
+ *
+ *     worksheet_write_number(worksheet, 0, 0, 1234.567, format);
+ * @endcode
+ *
+ * @image html write_number02.png
+ *
+ */
+int8_t worksheet_write_number(lxw_worksheet *worksheet,
+                              uint32_t row,
+                              uint16_t col, double number,
+                              lxw_format *format);
+/**
+ * @brief Write a string to a worksheet cell.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param string    String to write to cell.
+ * @param format    A pointer to a Format instance or NULL.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * The `%worksheet_write_string()` method writes a string to the cell specified by `row`
+ * and `column`:
+ *
+ * @code
+ *     worksheet_write_string(worksheet, 0, 0, "This phrase is English!", NULL);
+ * @endcode
+ *
+ * @image html write_string01.png
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter can be `NULL` to indicate no formatting or it can be a
+ * @ref format.h "Format" object:
+ *
+ * @code
+ *     lxw_format *format = workbook_add_format(workbook);
+ *     format_set_bold(format);
+ *
+ *     worksheet_write_string(worksheet, 0, 0, "This phrase is Bold!", format);
+ * @endcode
+ *
+ * @image html write_string02.png
+ *
+ * Unicode strings are supported in UTF-8 encoding. This generally requires
+ * that your source file is UTF-8 encoded or that the data has been read from
+ * a UTF-8 source:
+ *
+ * @code
+ *    worksheet_write_string(worksheet, 0, 0, "Это фраза на русском!", NULL);
+ * @endcode
+ *
+ * @image html write_string03.png
+ *
+ */
+int8_t worksheet_write_string(lxw_worksheet *worksheet,
+                              uint32_t row,
+                              uint16_t col, const char *string,
+                              lxw_format *format);
+/**
+ * @brief Write a formula to a worksheet cell.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param formula   Formula string to write to cell.
+ * @param format    A pointer to a Format instance or NULL.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * The `%worksheet_write_formula()` method writes a formula or function to the cell
+ * specified by `row` and `column`:
+ *
+ * @code
+ *     worksheet_write_formula(worksheet, 0, 0, "=B3 + 6",                    NULL);
+ *     worksheet_write_formula(worksheet, 1, 0, "=SIN(PI()/4)",               NULL);
+ *     worksheet_write_formula(worksheet, 2, 0, "=SUM(A1:A2)",                NULL);
+ *     worksheet_write_formula(worksheet, 3, 0, "=IF(A3>1,\"Yes\", \"No\")",  NULL);
+ *     worksheet_write_formula(worksheet, 4, 0, "=AVERAGE(1, 2, 3, 4)",       NULL);
+ *     worksheet_write_formula(worksheet, 5, 0, "=DATEVALUE(\"1-Jan-2013\")", NULL);
+ * @endcode
+ *
+ * @image html write_formula01.png
+ *
+ * The `format` parameter is used to apply formatting to the cell. This
+ * parameter can be `NULL` to indicate no formatting or it can be a
+ * @ref format.h "Format" object.
+ *
+ * Libxlsxwriter doesn't calculate the value of a formula and instead stores a
+ * default value of `0`. The correct formula result is displayed in Excel, as
+ * shown in the example above, since it recalculates the formulas when it loads
+ * the file. For cases where this is an issue see the
+ * `worksheet_write_formula_num()` function and the discussion in that section.
+ *
+ * Formulas must be written with the US style separator/range operator which
+ * is a comma (not semi-colon). Therefore a formula with multiple values
+ * should be written as follows:
+ *
+ * @code
+ *     worksheet_write_formula(worksheet, 0, 0, "=SUM(1, 2, 3)", NULL); // OK.
+ *     worksheet_write_formula(worksheet, 1, 0, "=SUM(1; 2; 3)", NULL); // NO. Error on load.
+ * @endcode
+ *
+ */
+int8_t worksheet_write_formula(lxw_worksheet *worksheet,
+                               uint32_t row,
+                               uint16_t col, const char *formula,
+                               lxw_format *format);
+/**
+ * @brief Write a formula to a worksheet cell with a user defined result.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param formula   Formula string to write to cell.
+ * @param format    A pointer to a Format instance or NULL.
+ * @param result    A user defined result for a formula.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * The `%worksheet_write_formula_num()` method writes a formula or function to the cell
+ * specified by `row` and `column` with a user defined result:
+ *
+ * @code
+ *     // Required as a workaround only.
+ *     worksheet_write_formula_num(worksheet, 0, 0, "=1 + 2", NULL, 3);
+ * @endcode
+ *
+ * Libxlsxwriter doesn't calculate the value of a formula and instead stores
+ * the value `0` as the formula result. It then sets a global flag in the XLSX
+ * file to say that all formulas and functions should be recalculated when the
+ * file is opened.
+ *
+ * This is the method recommended in the Excel documentation and in general it
+ * works fine with spreadsheet applications.
+ *
+ * However, applications that don't have a facility to calculate formulas,
+ * such as Excel Viewer, or some mobile applications will only display the `0`
+ * results.
+ *
+ * If required, the `%worksheet_write_formula_num()` function can be used to
+ * specify a formula and its result.
+ *
+ * This function is rarely required and is only provided for compatibility
+ * with some third party applications. For most applications the
+ * worksheet_write_formula() function is the recommended way of writing
+ * formulas.
+ *
+ */
+int8_t worksheet_write_formula_num(lxw_worksheet *worksheet,
+                                   uint32_t row,
+                                   uint16_t col,
+                                   const char *formula,
+                                   lxw_format *format, double result);
+
+/**
+ * @brief Write a date or time to a worksheet cell.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param datetime  The datetime to write to the cell.
+ * @param format    A pointer to a Format instance or NULL.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * The `worksheet_write_datetime()` method can be used to write a date or time to the cell
+ * specified by `row` and `column`:
+ *
+ * @dontinclude dates_and_times02.c
+ * @skip include
+ * @until num_format
+ * @skip Feb
+ * @until }
+ *
+ * The `format` parameter should be used to apply formatting to the cell using
+ * a @ref format.h "Format" object as shown above. Without a date format the
+ * datetime will appear as a number only.
+ *
+ * See @ref working_with_dates for more information about handling dates and
+ * times in libxlsxwriter.
+ */
+int8_t worksheet_write_datetime(lxw_worksheet *worksheet,
+                                uint32_t row,
+                                uint16_t col, lxw_datetime *datetime,
+                                lxw_format *format);
+
+/**
+ * @brief Write a formatted blank worksheet cell.
+ *
+ * @param worksheet Pointer to the lxw_worksheet instance to be updated.
+ * @param row       The zero indexed row number.
+ * @param col       The zero indexed column number.
+ * @param format    A pointer to a Format instance or NULL.
+ *
+ * @return A #lxw_write_error code.
+ *
+ * Write a blank cell specified by `row` and `column`:
+ *
+ * @code
+ *     worksheet_write_blank(worksheet, 1, 1, border_format);
+ * @endcode
+ *
+ * This method is used to add formatting to a cell which doesn't contain a string
+ * or number value.
+ *
+ * Excel differentiates between an "Empty" cell and a "Blank" cell. An Empty
+ * cell is a cell which doesn't contain data or formatting whilst a Blank cell
+ * doesn't contain data but does contain formatting. Excel stores Blank cells
+ * but ignores Empty cells.
+ *
+ * As such, if you write an empty cell without formatting it is ignored.
+ *
+ */
+
+int8_t worksheet_write_blank(lxw_worksheet *worksheet,
+                             uint32_t row, uint16_t col, lxw_format *format);
+
+lxw_worksheet *_new_worksheet(lxw_worksheet_init_data *init_data);
+void _free_worksheet(lxw_worksheet *worksheet);
+void _worksheet_assemble_xml_file(lxw_worksheet *worksheet);
+
+/* Declarations required for unit testing. */
+#ifdef TESTING
+
+STATIC void _worksheet_xml_declaration(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_worksheet(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_dimension(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_sheet_view(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_sheet_views(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_sheet_format_pr(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_sheet_data(lxw_worksheet *worksheet);
+STATIC void _worksheet_write_page_margins(lxw_worksheet *worksheet);
+STATIC void _write_row(lxw_worksheet *worksheet, lxw_row *row, char *spans);
+STATIC lxw_row *_get_row(struct lxw_table_rows *table, uint32_t row_num);
+
+#endif /* TESTING */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __LXW_WORKSHEET_H__ */
diff --git a/include/xlsxwriter/xmlwriter.h b/include/xlsxwriter/xmlwriter.h
new file mode 100644
index 00000000..226e42db
--- /dev/null
+++ b/include/xlsxwriter/xmlwriter.h
@@ -0,0 +1,166 @@
+/*
+ * libxlsxwriter
+ * 
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ * xmlwriter - A libxlsxwriter library for creating Excel XLSX
+ *             XML files.
+ *
+ * The xmlwriter library is used to create the XML sub-components files
+ * in the Excel XLSX file format.
+ *
+ * This library is used in preference to a more generic XML library to allow
+ * for customisation and optimisation for the XLSX file format.
+ *
+ * The xmlwriter functions are only used internally and do not need to be
+ * called directly by the end user.
+ *
+ */
+#ifndef __XMLWRITER_H__
+#define __XMLWRITER_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include "xlsxwriter/third_party/queue.h"
+
+/* Defines. */
+#define MAX_ATTRIBUTE_LENGTH 140
+#define ATTR_32 32
+#define MAX_CELL_NAME_LENGTH 13
+
+ /* *INDENT-OFF* */
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* *INDENT-ON* */
+
+/* Attribute used in XML elements. */
+struct xml_attribute {
+    char key[MAX_ATTRIBUTE_LENGTH];
+    char value[MAX_ATTRIBUTE_LENGTH];
+
+    /* Make the struct a queue.h list element. */
+    STAILQ_ENTRY (xml_attribute) list_entries;
+};
+
+/* Use queue.h macros to define the xml_attribute_list type. */
+STAILQ_HEAD(xml_attribute_list, xml_attribute);
+
+/* Create a new attribute struct to add to a xml_attribute_list. */
+struct xml_attribute *_new_attribute_str(const char *key, const char *value);
+struct xml_attribute *_new_attribute_int(const char *key, uint32_t value);
+struct xml_attribute *_new_attribute_dbl(const char *key, double value);
+
+/* Macro to initialise the xml_attribute_list pointers. */
+#define _INIT_ATTRIBUTES()                                    \
+    STAILQ_INIT(&attributes)
+
+/* Macro to add attribute string elements to xml_attribute_list. */
+#define _PUSH_ATTRIBUTES_STR(key, value)                      \
+    do {                                                      \
+    attribute = _new_attribute_str((key), (value));           \
+    STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
+    } while (0)
+
+/* Macro to add attribute int values to xml_attribute_list. */
+#define _PUSH_ATTRIBUTES_INT(key, value)                      \
+    do {                                                      \
+    attribute = _new_attribute_int((key), (value));           \
+    STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
+    } while (0)
+
+/* Macro to add attribute double values to xml_attribute_list. */
+#define _PUSH_ATTRIBUTES_FLT(key, value)                      \
+    do {                                                      \
+    attribute = _new_attribute_flt((key), (value));           \
+    STAILQ_INSERT_TAIL(&attributes, attribute, list_entries); \
+    } while (0)
+
+/* Macro to free xml_attribute_list and attribute. */
+#define _FREE_ATTRIBUTES()                                    \
+    while (!STAILQ_EMPTY(&attributes)) {                      \
+        attribute = STAILQ_FIRST(&attributes);                \
+        STAILQ_REMOVE_HEAD(&attributes, list_entries);        \
+        free(attribute);                                      \
+    }
+
+/**
+ * Create the XML declaration in an XML file.
+ *
+ * @param xmlfile A FILE pointer to the output XML file.
+ */
+void _xml_declaration(FILE * xmlfile);
+
+/**
+ * Write an XML start tag with optional attributes.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ * @param attributes An optional list of attributes to add to the tag.
+ */
+void _xml_start_tag(FILE * xmlfile,
+                    const char *tag, struct xml_attribute_list *attributes);
+
+/**
+ * Write an XML start tag with optional un-encoded attributes.
+ * This is a minor optimisation for attributes that don't need encoding.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ * @param attributes An optional list of attributes to add to the tag.
+ */
+void _xml_start_tag_unencoded(FILE * xmlfile,
+                              const char *tag,
+                              struct xml_attribute_list *attributes);
+
+/**
+ * Write an XML end tag.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ */
+void _xml_end_tag(FILE * xmlfile, const char *tag);
+
+/**
+ * Write an XML empty tag with optional attributes.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ * @param attributes An optional list of attributes to add to the tag.
+ */
+void _xml_empty_tag(FILE * xmlfile,
+                    const char *tag, struct xml_attribute_list *attributes);
+
+/**
+ * Write an XML empty tag with optional un-encoded attributes.
+ * This is a minor optimisation for attributes that don't need encoding.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ * @param attributes An optional list of attributes to add to the tag.
+ */
+void _xml_empty_tag_unencoded(FILE * xmlfile,
+                              const char *tag,
+                              struct xml_attribute_list *attributes);
+
+/**
+ * Write an XML element containing data and optional attributes.
+ *
+ * @param xmlfile    A FILE pointer to the output XML file.
+ * @param tag        The XML tag to write.
+ * @param data       The data section of the XML element.
+ * @param attributes An optional list of attributes to add to the tag.
+ */
+void _xml_data_element(FILE * xmlfile,
+                       const char *tag,
+                       const char *data,
+                       struct xml_attribute_list *attributes);
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+}
+#endif
+/* *INDENT-ON* */
+
+#endif /* __XMLWRITER_H__ */
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 00000000..5ab3661d
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,71 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Directory variables.
+OBJS_DIR    = .
+INC_DIR     = ../include
+
+# The minizip directory.
+MINIZIP_DIR = ../third_party/minizip
+
+# Flags passed to compiler.
+CFLAGS   += -g -O3 -Wall -Wextra -pedantic -ansi
+
+# Library names.
+LIBXLSXWRITER_A  = libxlsxwriter.a
+LIBXLSXWRITER_SO = libxlsxwriter.so
+
+# Flags passed to static linker.
+ARFLAGS = rc
+
+# Flags passed to dynamic linker.
+SOFLAGS = -shared -fPIC
+
+# Change shared lib options on OS X.
+UNAME := $(shell uname)
+ifeq ($(UNAME), Darwin)
+LIBXLSXWRITER_SO = libxlsxwriter.dylib
+SOFLAGS = -dynamiclib -fPIC -install_name /usr/lib/$(LIBXLSXWRITER_SO)
+endif
+
+
+# Headers as dependecies.
+HDRS = $(wildcard ../include/xlsxwriter/*.h)
+
+# Ojects to compile.
+SRCS  = $(wildcard *.c)
+OBJS  = $(patsubst %.c,%.o,$(SRCS))
+SOBJS = $(patsubst %.c,%.so,$(SRCS))
+# End of OBJS
+
+# Build the object files and the libraries.
+all : $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO)
+	$(Q)cp $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO) ../lib
+
+# The static library.
+$(LIBXLSXWRITER_A) : $(OBJS)
+	$(Q)$(AR) $(ARFLAGS)     $@ $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o  $^
+
+$(LIBXLSXWRITER_SO) : $(SOBJS)
+	$(Q)$(CC) $(SOFLAGS)  -o $@ $(MINIZIP_DIR)/ioapi.so $(MINIZIP_DIR)/zip.so $^ -lz
+
+# Targets for the object files.
+%.o  : %.c $(HDRS)
+	$(Q)$(CC)       -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $<
+
+%.so : %.c $(HDRS)
+	$(Q)$(CC) -fPIC -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+
+# Clean up any temp/build files.
+clean :
+	$(Q)rm -f *.o *.a *.so *.dylib
diff --git a/src/app.c b/src/app.c
new file mode 100644
index 00000000..60da5741
--- /dev/null
+++ b/src/app.c
@@ -0,0 +1,422 @@
+/*****************************************************************************
+ * app - A library for creating Excel XLSX app files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/app.h"
+#include "xlsxwriter/utility.h"
+
+#define APP_SCHEMA "http://schemas.openxmlformats.org/officeDocument/2006"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new app object.
+ */
+lxw_app *
+_new_app()
+{
+    lxw_app *app = calloc(1, sizeof(lxw_app));
+    GOTO_LABEL_ON_MEM_ERROR(app, mem_error);
+
+    app->heading_pairs = calloc(1, sizeof(struct lxw_heading_pairs));
+    GOTO_LABEL_ON_MEM_ERROR(app->heading_pairs, mem_error);
+    STAILQ_INIT(app->heading_pairs);
+
+    app->part_names = calloc(1, sizeof(struct lxw_part_names));
+    GOTO_LABEL_ON_MEM_ERROR(app->part_names, mem_error);
+    STAILQ_INIT(app->part_names);
+
+    return app;
+
+mem_error:
+    _free_app(app);
+    return NULL;
+}
+
+/*
+ * Free a app object.
+ */
+void
+_free_app(lxw_app *app)
+{
+    lxw_heading_pair *heading_pair;
+    lxw_part_name *part_name;
+
+    if (!app)
+        return;
+
+    /* Free the lists in the App object. */
+    while (!STAILQ_EMPTY(app->heading_pairs)) {
+        heading_pair = STAILQ_FIRST(app->heading_pairs);
+        STAILQ_REMOVE_HEAD(app->heading_pairs, list_pointers);
+        free(heading_pair->key);
+        free(heading_pair->value);
+        free(heading_pair);
+    }
+
+    while (!STAILQ_EMPTY(app->part_names)) {
+        part_name = STAILQ_FIRST(app->part_names);
+        STAILQ_REMOVE_HEAD(app->part_names, list_pointers);
+        free(part_name->name);
+        free(part_name);
+    }
+
+    free(app->heading_pairs);
+    free(app->part_names);
+    free(app);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_app_xml_declaration(lxw_app *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <Properties> element.
+ */
+STATIC void
+_write_properties(lxw_app *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char xmlns[] = APP_SCHEMA "/extended-properties";
+    char xmlns_vt[] = APP_SCHEMA "/docPropsVTypes";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", xmlns);
+    _PUSH_ATTRIBUTES_STR("xmlns:vt", xmlns_vt);
+
+    _xml_start_tag(self->file, "Properties", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <Application> element.
+ */
+STATIC void
+_write_application(lxw_app *self)
+{
+    _xml_data_element(self->file, "Application", "Microsoft Excel", NULL);
+}
+
+/*
+ * Write the <DocSecurity> element.
+ */
+STATIC void
+_write_doc_security(lxw_app *self)
+{
+    _xml_data_element(self->file, "DocSecurity", "0", NULL);
+}
+
+/*
+ * Write the <ScaleCrop> element.
+ */
+STATIC void
+_write_scale_crop(lxw_app *self)
+{
+    _xml_data_element(self->file, "ScaleCrop", "false", NULL);
+}
+
+/*
+ * Write the <vt:lpstr> element.
+ */
+STATIC void
+_write_vt_lpstr(lxw_app *self, const char *str)
+{
+    _xml_data_element(self->file, "vt:lpstr", str, NULL);
+}
+
+/*
+ * Write the <vt:i4> element.
+ */
+STATIC void
+_write_vt_i4(lxw_app *self, const char *value)
+{
+    _xml_data_element(self->file, "vt:i4", value, NULL);
+}
+
+/*
+ * Write the <vt:variant> element.
+ */
+STATIC void
+_write_vt_variant(lxw_app *self, const char *key, const char *value)
+{
+    /* Write the vt:lpstr element. */
+    _xml_start_tag(self->file, "vt:variant", NULL);
+    _write_vt_lpstr(self, key);
+    _xml_end_tag(self->file, "vt:variant");
+
+    /* Write the vt:i4 element. */
+    _xml_start_tag(self->file, "vt:variant", NULL);
+    _write_vt_i4(self, value);
+    _xml_end_tag(self->file, "vt:variant");
+}
+
+/*
+ * Write the <vt:vector> element for the heading pairs.
+ */
+STATIC void
+_write_vt_vector_heading_pairs(lxw_app *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_heading_pair *heading_pair;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("size", self->num_heading_pairs * 2);
+    _PUSH_ATTRIBUTES_STR("baseType", "variant");
+
+    _xml_start_tag(self->file, "vt:vector", &attributes);
+
+    STAILQ_FOREACH(heading_pair, self->heading_pairs, list_pointers) {
+        _write_vt_variant(self, heading_pair->key, heading_pair->value);
+    }
+
+    _xml_end_tag(self->file, "vt:vector");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <vt:vector> element for the named parts.
+ */
+STATIC void
+_write_vt_vector_lpstr_named_parts(lxw_app *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_part_name *part_name;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("size", self->num_part_names);
+    _PUSH_ATTRIBUTES_STR("baseType", "lpstr");
+
+    _xml_start_tag(self->file, "vt:vector", &attributes);
+
+    STAILQ_FOREACH(part_name, self->part_names, list_pointers) {
+        _write_vt_lpstr(self, part_name->name);
+    }
+
+    _xml_end_tag(self->file, "vt:vector");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <HeadingPairs> element.
+ */
+STATIC void
+_write_heading_pairs(lxw_app *self)
+{
+    _xml_start_tag(self->file, "HeadingPairs", NULL);
+
+    /* Write the vt:vector element. */
+    _write_vt_vector_heading_pairs(self);
+
+    _xml_end_tag(self->file, "HeadingPairs");
+}
+
+/*
+ * Write the <TitlesOfParts> element.
+ */
+STATIC void
+_write_titles_of_parts(lxw_app *self)
+{
+    _xml_start_tag(self->file, "TitlesOfParts", NULL);
+
+    /* Write the vt:vector element. */
+    _write_vt_vector_lpstr_named_parts(self);
+
+    _xml_end_tag(self->file, "TitlesOfParts");
+}
+
+/*
+ * Write the <Manager> element.
+ */
+STATIC void
+_write_manager(lxw_app *self)
+{
+    lxw_doc_properties *properties = self->properties;
+
+    if (!properties)
+        return;
+
+    if (properties->manager)
+        _xml_data_element(self->file, "Manager", properties->manager, NULL);
+}
+
+/*
+ * Write the <Company> element.
+ */
+STATIC void
+_write_company(lxw_app *self)
+{
+    lxw_doc_properties *properties = self->properties;
+
+    if (properties && properties->company)
+        _xml_data_element(self->file, "Company", properties->company, NULL);
+    else
+        _xml_data_element(self->file, "Company", "", NULL);
+}
+
+/*
+ * Write the <LinksUpToDate> element.
+ */
+STATIC void
+_write_links_up_to_date(lxw_app *self)
+{
+    _xml_data_element(self->file, "LinksUpToDate", "false", NULL);
+}
+
+/*
+ * Write the <SharedDoc> element.
+ */
+STATIC void
+_write_shared_doc(lxw_app *self)
+{
+    _xml_data_element(self->file, "SharedDoc", "false", NULL);
+}
+
+/*
+ * Write the <HyperlinksChanged> element.
+ */
+STATIC void
+_write_hyperlinks_changed(lxw_app *self)
+{
+    _xml_data_element(self->file, "HyperlinksChanged", "false", NULL);
+}
+
+/*
+ * Write the <AppVersion> element.
+ */
+STATIC void
+_write_app_version(lxw_app *self)
+{
+    _xml_data_element(self->file, "AppVersion", "12.0000", NULL);
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_app_assemble_xml_file(lxw_app *self)
+{
+
+    /* Write the XML declaration. */
+    _app_xml_declaration(self);
+
+    _write_properties(self);
+    _write_application(self);
+    _write_doc_security(self);
+    _write_scale_crop(self);
+    _write_heading_pairs(self);
+    _write_titles_of_parts(self);
+    _write_manager(self);
+    _write_company(self);
+    _write_links_up_to_date(self);
+    _write_shared_doc(self);
+    _write_hyperlinks_changed(self);
+    _write_app_version(self);
+
+    _xml_end_tag(self->file, "Properties");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Add the name of a workbook Part such as 'Sheet1' or 'Print_Titles'.
+ */
+void
+_add_part_name(lxw_app *self, const char *name)
+{
+    lxw_part_name *part_name;
+
+    if (!name)
+        return;
+
+    part_name = calloc(1, sizeof(lxw_part_name));
+    GOTO_LABEL_ON_MEM_ERROR(part_name, mem_error);
+
+    part_name->name = __builtin_strdup(name);
+    GOTO_LABEL_ON_MEM_ERROR(part_name->name, mem_error);
+
+    STAILQ_INSERT_TAIL(self->part_names, part_name, list_pointers);
+    self->num_part_names++;
+
+    return;
+
+mem_error:
+    if (part_name) {
+        free(part_name->name);
+        free(part_name);
+    }
+}
+
+/*
+ * Add the name of a workbook Heading Pair such as 'Worksheets', 'Charts' or
+ * 'Named Ranges'.
+ */
+void
+_add_heading_pair(lxw_app *self, const char *key, const char *value)
+{
+    lxw_heading_pair *heading_pair;
+
+    if (!key || !value)
+        return;
+
+    heading_pair = calloc(1, sizeof(lxw_heading_pair));
+    GOTO_LABEL_ON_MEM_ERROR(heading_pair, mem_error);
+
+    heading_pair->key = __builtin_strdup(key);
+    GOTO_LABEL_ON_MEM_ERROR(heading_pair->key, mem_error);
+
+    heading_pair->value = __builtin_strdup(value);
+    GOTO_LABEL_ON_MEM_ERROR(heading_pair->value, mem_error);
+
+    STAILQ_INSERT_TAIL(self->heading_pairs, heading_pair, list_pointers);
+    self->num_heading_pairs++;
+
+    return;
+
+mem_error:
+    if (heading_pair) {
+        free(heading_pair->key);
+        free(heading_pair->value);
+        free(heading_pair);
+    }
+}
diff --git a/src/content_types.c b/src/content_types.c
new file mode 100644
index 00000000..1522f2cd
--- /dev/null
+++ b/src/content_types.c
@@ -0,0 +1,315 @@
+/*****************************************************************************
+ * content_types - A library for creating Excel XLSX content_types files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/content_types.h"
+#include "xlsxwriter/utility.h"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new content_types object.
+ */
+lxw_content_types *
+_new_content_types()
+{
+    lxw_content_types *content_types = calloc(1, sizeof(lxw_content_types));
+    GOTO_LABEL_ON_MEM_ERROR(content_types, mem_error);
+
+    content_types->default_types = calloc(1, sizeof(struct lxw_tuples));
+    GOTO_LABEL_ON_MEM_ERROR(content_types->default_types, mem_error);
+    STAILQ_INIT(content_types->default_types);
+
+    content_types->overrides = calloc(1, sizeof(struct lxw_tuples));
+    GOTO_LABEL_ON_MEM_ERROR(content_types->overrides, mem_error);
+    STAILQ_INIT(content_types->overrides);
+
+    _ct_add_default(content_types, "rels",
+                    LXW_APP_PACKAGE "relationships+xml");
+    _ct_add_default(content_types, "xml", "application/xml");
+
+    _ct_add_override(content_types, "/docProps/app.xml",
+                     LXW_APP_DOCUMENT "extended-properties+xml");
+    _ct_add_override(content_types, "/docProps/core.xml",
+                     LXW_APP_PACKAGE "core-properties+xml");
+    _ct_add_override(content_types, "/xl/styles.xml",
+                     LXW_APP_DOCUMENT "spreadsheetml.styles+xml");
+    _ct_add_override(content_types, "/xl/theme/theme1.xml",
+                     LXW_APP_DOCUMENT "theme+xml");
+    _ct_add_override(content_types, "/xl/workbook.xml",
+                     LXW_APP_DOCUMENT "spreadsheetml.sheet.main+xml");
+
+    return content_types;
+
+mem_error:
+    _free_content_types(content_types);
+    return NULL;
+}
+
+/*
+ * Free a content_types object.
+ */
+void
+_free_content_types(lxw_content_types *content_types)
+{
+    lxw_tuple *default_type;
+    lxw_tuple *override;
+
+    if (!content_types)
+        return;
+
+    while (!STAILQ_EMPTY(content_types->default_types)) {
+        default_type = STAILQ_FIRST(content_types->default_types);
+        STAILQ_REMOVE_HEAD(content_types->default_types, list_pointers);
+        free(default_type->key);
+        free(default_type->value);
+        free(default_type);
+    }
+
+    while (!STAILQ_EMPTY(content_types->overrides)) {
+        override = STAILQ_FIRST(content_types->overrides);
+        STAILQ_REMOVE_HEAD(content_types->overrides, list_pointers);
+        free(override->key);
+        free(override->value);
+        free(override);
+    }
+
+    free(content_types->default_types);
+    free(content_types->overrides);
+    free(content_types);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_content_types_xml_declaration(lxw_content_types *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <Types> element.
+ */
+STATIC void
+_write_types(lxw_content_types *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", LXW_CONTENT_TYPE_SCHEMA);
+
+    _xml_start_tag(self->file, "Types", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <Default> element.
+ */
+STATIC void
+_write_default(lxw_content_types *self, const char *ext, const char *type)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("Extension", ext);
+    _PUSH_ATTRIBUTES_STR("ContentType", type);
+
+    _xml_empty_tag(self->file, "Default", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <Override> element.
+ */
+STATIC void
+_write_override(lxw_content_types *self, const char *part_name,
+                const char *type)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("PartName", part_name);
+    _PUSH_ATTRIBUTES_STR("ContentType", type);
+
+    _xml_empty_tag(self->file, "Override", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write out all of the <Default> types.
+ */
+STATIC void
+_write_defaults(lxw_content_types *self)
+{
+    lxw_tuple *tuple;
+
+    STAILQ_FOREACH(tuple, self->default_types, list_pointers) {
+        _write_default(self, tuple->key, tuple->value);
+    }
+}
+
+/*
+ * Write out all of the <Override> types.
+ */
+STATIC void
+_write_overrides(lxw_content_types *self)
+{
+    lxw_tuple *tuple;
+
+    STAILQ_FOREACH(tuple, self->overrides, list_pointers) {
+        _write_override(self, tuple->key, tuple->value);
+    }
+}
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_content_types_assemble_xml_file(lxw_content_types *self)
+{
+    /* Write the XML declaration. */
+    _content_types_xml_declaration(self);
+
+    _write_types(self);
+    _write_defaults(self);
+    _write_overrides(self);
+
+    /* Close the content_types tag. */
+    _xml_end_tag(self->file, "Types");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+/*
+ * Add elements to the ContentTypes defaults.
+ */
+void
+_ct_add_default(lxw_content_types *self, const char *key, const char *value)
+{
+    lxw_tuple *tuple;
+
+    if (!key || !value)
+        return;
+
+    tuple = calloc(1, sizeof(lxw_tuple));
+    GOTO_LABEL_ON_MEM_ERROR(tuple, mem_error);
+
+    tuple->key = __builtin_strdup(key);
+    GOTO_LABEL_ON_MEM_ERROR(tuple->key, mem_error);
+
+    tuple->value = __builtin_strdup(value);
+    GOTO_LABEL_ON_MEM_ERROR(tuple->value, mem_error);
+
+    STAILQ_INSERT_TAIL(self->default_types, tuple, list_pointers);
+
+    return;
+
+mem_error:
+    if (tuple) {
+        free(tuple->key);
+        free(tuple->value);
+        free(tuple);
+    }
+}
+
+/*
+ * Add elements to the ContentTypes overrides.
+ */
+void
+_ct_add_override(lxw_content_types *self, const char *key, const char *value)
+{
+    lxw_tuple *tuple;
+
+    if (!key || !value)
+        return;
+
+    tuple = calloc(1, sizeof(lxw_tuple));
+    GOTO_LABEL_ON_MEM_ERROR(tuple, mem_error);
+
+    tuple->key = __builtin_strdup(key);
+    GOTO_LABEL_ON_MEM_ERROR(tuple->key, mem_error);
+
+    tuple->value = __builtin_strdup(value);
+    GOTO_LABEL_ON_MEM_ERROR(tuple->value, mem_error);
+
+    STAILQ_INSERT_TAIL(self->overrides, tuple, list_pointers);
+
+    return;
+
+mem_error:
+    if (tuple) {
+        free(tuple->key);
+        free(tuple->value);
+        free(tuple);
+    }
+}
+
+/*
+ * Add the name of a worksheet to the ContentTypes overrides.
+ */
+void
+_ct_add_worksheet_name(lxw_content_types *self, const char *str)
+{
+    char name[MAX_ATTRIBUTE_LENGTH];
+    __builtin_snprintf(name, MAX_ATTRIBUTE_LENGTH, "/xl/worksheets/%s.xml",
+                       str);
+
+    _ct_add_override(self, name,
+                     LXW_APP_DOCUMENT "spreadsheetml.worksheet+xml");
+}
+
+/*
+ * Add the sharedStrings link to the ContentTypes overrides.
+ */
+void
+_ct_add_shared_strings(lxw_content_types *self)
+{
+    _ct_add_override(self, "/xl/sharedStrings.xml",
+                     LXW_APP_DOCUMENT "spreadsheetml.sharedStrings+xml");
+}
+
+/*
+ * Add the calcChain link to the ContentTypes overrides.
+ */
+void
+_ct_add_calc_chain(lxw_content_types *self)
+{
+    _ct_add_override(self, "/xl/calcChain.xml",
+                     LXW_APP_DOCUMENT "spreadsheetml.calcChain+xml");
+}
diff --git a/src/core.c b/src/core.c
new file mode 100644
index 00000000..4358032e
--- /dev/null
+++ b/src/core.c
@@ -0,0 +1,290 @@
+/*****************************************************************************
+ * core - A library for creating Excel XLSX core files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/core.h"
+#include "xlsxwriter/utility.h"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new core object.
+ */
+lxw_core *
+_new_core()
+{
+    lxw_core *core = calloc(1, sizeof(lxw_core));
+    GOTO_LABEL_ON_MEM_ERROR(core, mem_error);
+
+    return core;
+
+mem_error:
+    _free_core(core);
+    return NULL;
+}
+
+/*
+ * Free a core object.
+ */
+void
+_free_core(lxw_core *core)
+{
+    if (!core)
+        return;
+
+    free(core);
+}
+
+/*
+ * Convert a time_t struct to a ISO 8601 style "2010-01-01T00:00:00Z" date.
+ */
+static void
+_localtime_to_iso8601_date(time_t *timer, char *str, size_t size)
+{
+    struct tm *tmp_localtime;
+    time_t current_time = time(NULL);
+
+    if (*timer)
+        tmp_localtime = localtime(timer);
+    else
+        tmp_localtime = localtime(&current_time);
+
+    strftime(str, size - 1, "%Y-%m-%dT%H:%M:%SZ", tmp_localtime);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_core_xml_declaration(lxw_core *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <cp:coreProperties> element.
+ */
+STATIC void
+_write_cp_core_properties(lxw_core *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns:cp",
+                         "http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+    _PUSH_ATTRIBUTES_STR("xmlns:dc", "http://purl.org/dc/elements/1.1/");
+    _PUSH_ATTRIBUTES_STR("xmlns:dcterms", "http://purl.org/dc/terms/");
+    _PUSH_ATTRIBUTES_STR("xmlns:dcmitype", "http://purl.org/dc/dcmitype/");
+    _PUSH_ATTRIBUTES_STR("xmlns:xsi",
+                         "http://www.w3.org/2001/XMLSchema-instance");
+
+    _xml_start_tag(self->file, "cp:coreProperties", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <dc:creator> element.
+ */
+STATIC void
+_write_dc_creator(lxw_core *self)
+{
+    if (self->properties->author) {
+        _xml_data_element(self->file, "dc:creator", self->properties->author,
+                          NULL);
+    }
+    else {
+        _xml_data_element(self->file, "dc:creator", "", NULL);
+    }
+}
+
+/*
+ * Write the <cp:lastModifiedBy> element.
+ */
+STATIC void
+_write_cp_last_modified_by(lxw_core *self)
+{
+    if (self->properties->author) {
+        _xml_data_element(self->file, "cp:lastModifiedBy",
+                          self->properties->author, NULL);
+    }
+    else {
+        _xml_data_element(self->file, "cp:lastModifiedBy", "", NULL);
+    }
+}
+
+/*
+ * Write the <dcterms:created> element.
+ */
+STATIC void
+_write_dcterms_created(lxw_core *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char datetime[ATTR_32];
+
+    _localtime_to_iso8601_date(&self->properties->created, datetime,
+                               MAX_ATTRIBUTE_LENGTH);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
+
+    _xml_data_element(self->file, "dcterms:created", datetime, &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <dcterms:modified> element.
+ */
+STATIC void
+_write_dcterms_modified(lxw_core *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char datetime[ATTR_32];
+
+    _localtime_to_iso8601_date(&self->properties->created, datetime,
+                               MAX_ATTRIBUTE_LENGTH);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
+
+    _xml_data_element(self->file, "dcterms:modified", datetime, &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <dc:title> element.
+ */
+STATIC void
+_write_dc_title(lxw_core *self)
+{
+    if (!self->properties->title)
+        return;
+
+    _xml_data_element(self->file, "dc:title", self->properties->title, NULL);
+}
+
+/*
+ * Write the <dc:subject> element.
+ */
+STATIC void
+_write_dc_subject(lxw_core *self)
+{
+    if (!self->properties->subject)
+        return;
+
+    _xml_data_element(self->file, "dc:subject", self->properties->subject,
+                      NULL);
+}
+
+/*
+ * Write the <cp:keywords> element.
+ */
+STATIC void
+_write_cp_keywords(lxw_core *self)
+{
+    if (!self->properties->keywords)
+        return;
+
+    _xml_data_element(self->file, "cp:keywords", self->properties->keywords,
+                      NULL);
+}
+
+/*
+ * Write the <dc:description> element.
+ */
+STATIC void
+_write_dc_description(lxw_core *self)
+{
+    if (!self->properties->comments)
+        return;
+
+    _xml_data_element(self->file, "dc:description",
+                      self->properties->comments, NULL);
+}
+
+/*
+ * Write the <cp:category> element.
+ */
+STATIC void
+_write_cp_category(lxw_core *self)
+{
+    if (!self->properties->category)
+        return;
+
+    _xml_data_element(self->file, "cp:category", self->properties->category,
+                      NULL);
+}
+
+/*
+ * Write the <cp:contentStatus> element.
+ */
+STATIC void
+_write_cp_content_status(lxw_core *self)
+{
+    if (!self->properties->status)
+        return;
+
+    _xml_data_element(self->file, "cp:contentStatus",
+                      self->properties->status, NULL);
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_core_assemble_xml_file(lxw_core *self)
+{
+    /* Write the XML declaration. */
+    _core_xml_declaration(self);
+
+    _write_cp_core_properties(self);
+    _write_dc_title(self);
+    _write_dc_subject(self);
+    _write_dc_creator(self);
+    _write_cp_keywords(self);
+    _write_dc_description(self);
+    _write_cp_last_modified_by(self);
+    _write_dcterms_created(self);
+    _write_dcterms_modified(self);
+    _write_cp_category(self);
+    _write_cp_content_status(self);
+
+    _xml_end_tag(self->file, "cp:coreProperties");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
diff --git a/src/format.c b/src/format.c
new file mode 100644
index 00000000..f964ef56
--- /dev/null
+++ b/src/format.c
@@ -0,0 +1,728 @@
+/*****************************************************************************
+ * format - A library for creating Excel XLSX format files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/format.h"
+#include "xlsxwriter/utility.h"
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new format object.
+ */
+lxw_format *
+_new_format()
+{
+    lxw_format *format = calloc(1, sizeof(lxw_format));
+    GOTO_LABEL_ON_MEM_ERROR(format, mem_error);
+
+    format->xf_format_indices = NULL;
+
+    format->xf_index = LXW_PROPERTY_UNSET;
+    format->dxf_index = LXW_PROPERTY_UNSET;
+
+    format->font_name[0] = '\0';
+    format->font_scheme[0] = '\0';
+    format->num_format[0] = '\0';
+    format->num_format_index = 0;
+    format->font_index = 0;
+    format->has_font = LXW_FALSE;
+    format->has_dxf_font = LXW_FALSE;
+    format->font_size = 11;
+    format->bold = LXW_FALSE;
+    format->italic = LXW_FALSE;
+    format->font_color = LXW_COLOR_UNSET;
+    format->underline = LXW_FALSE;
+    format->font_strikeout = LXW_FALSE;
+    format->font_outline = LXW_FALSE;
+    format->font_shadow = LXW_FALSE;
+    format->font_script = LXW_FALSE;
+    format->font_family = LXW_DEFAULT_FONT_FAMILY;
+    format->font_charset = LXW_FALSE;
+    format->font_condense = LXW_FALSE;
+    format->font_extend = LXW_FALSE;
+    format->theme = LXW_FALSE;
+    format->hyperlink = LXW_FALSE;
+
+    format->hidden = LXW_FALSE;
+    format->locked = LXW_TRUE;
+
+    format->text_h_align = LXW_ALIGN_NONE;
+    format->text_wrap = LXW_FALSE;
+    format->text_v_align = LXW_ALIGN_NONE;
+    format->text_justlast = LXW_FALSE;
+    format->rotation = 0;
+
+    format->fg_color = LXW_COLOR_UNSET;
+    format->bg_color = LXW_COLOR_UNSET;
+    format->pattern = LXW_PATTERN_NONE;
+    format->has_fill = LXW_FALSE;
+    format->has_dxf_fill = LXW_FALSE;
+    format->fill_index = 0;
+    format->fill_count = 0;
+
+    format->border_index = 0;
+    format->has_border = LXW_FALSE;
+    format->has_dxf_border = LXW_FALSE;
+    format->border_count = 0;
+
+    format->bottom = LXW_BORDER_NONE;
+    format->left = LXW_BORDER_NONE;
+    format->right = LXW_BORDER_NONE;
+    format->top = LXW_BORDER_NONE;
+    format->diag_border = LXW_BORDER_NONE;
+    format->diag_type = LXW_BORDER_NONE;
+    format->bottom_color = LXW_COLOR_UNSET;
+    format->left_color = LXW_COLOR_UNSET;
+    format->right_color = LXW_COLOR_UNSET;
+    format->top_color = LXW_COLOR_UNSET;
+    format->diag_color = LXW_COLOR_UNSET;
+
+    format->indent = 0;
+    format->shrink = LXW_FALSE;
+    format->merge_range = LXW_FALSE;
+    format->reading_order = 0;
+    format->just_distrib = LXW_FALSE;
+    format->color_indexed = LXW_FALSE;
+    format->font_only = LXW_FALSE;
+
+    return format;
+
+mem_error:
+    _free_format(format);
+    return NULL;
+}
+
+/*
+ * Free a format object.
+ */
+void
+_free_format(lxw_format *format)
+{
+    if (!format)
+        return;
+
+    free(format);
+}
+
+/*
+ * Check a user input color.
+ */
+lxw_color_t
+_check_color(lxw_color_t color)
+{
+    if (color == LXW_COLOR_UNSET)
+        return color;
+    else
+        return color & LXW_COLOR_MASK;
+}
+
+/*
+ * Check a user input border.
+ */
+uint8_t
+_check_border(uint8_t border)
+{
+    if (border >= LXW_BORDER_THIN && border <= LXW_BORDER_SLANT_DASH_DOT)
+        return border;
+    else
+        return LXW_BORDER_NONE;
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Returns a format struct suitable for hashing as a lookup key. This is
+ * mainly a memcpy with any pointer members set to NULL.
+ */
+lxw_format *
+_get_format_key(lxw_format *self)
+{
+    lxw_format *key = calloc(1, sizeof(lxw_format));
+    GOTO_LABEL_ON_MEM_ERROR(key, mem_error);
+
+    memcpy(key, self, sizeof(lxw_format));
+
+    /* Set pointer members to NULL since they aren't part of the comparison. */
+    key->xf_format_indices = NULL;
+    key->num_xf_formats = NULL;
+    key->list_pointers.stqe_next = NULL;
+
+    return key;
+
+mem_error:
+    return NULL;
+}
+
+/*
+ * Returns a font struct suitable for hashing as a lookup key.
+ */
+lxw_font *
+_get_font_key(lxw_format *self)
+{
+    lxw_font *key = calloc(1, sizeof(lxw_font));
+    GOTO_LABEL_ON_MEM_ERROR(key, mem_error);
+
+    LXW_FORMAT_FIELD_COPY(key->font_name, self->font_name);
+    key->font_size = self->font_size;
+    key->bold = self->bold;
+    key->italic = self->italic;
+    key->font_color = self->font_color;
+    key->underline = self->underline;
+    key->font_strikeout = self->font_strikeout;
+    key->font_outline = self->font_outline;
+    key->font_shadow = self->font_shadow;
+    key->font_script = self->font_script;
+    key->font_family = self->font_family;
+    key->font_charset = self->font_charset;
+    key->font_condense = self->font_condense;
+    key->font_extend = self->font_extend;
+
+    return key;
+
+mem_error:
+    return NULL;
+}
+
+/*
+ * Returns a border struct suitable for hashing as a lookup key.
+ */
+lxw_border *
+_get_border_key(lxw_format *self)
+{
+    lxw_border *key = calloc(1, sizeof(lxw_border));
+    GOTO_LABEL_ON_MEM_ERROR(key, mem_error);
+
+    key->bottom = self->bottom;
+    key->left = self->left;
+    key->right = self->right;
+    key->top = self->top;
+    key->diag_border = self->diag_border;
+    key->diag_type = self->diag_type;
+    key->bottom_color = self->bottom_color;
+    key->left_color = self->left_color;
+    key->right_color = self->right_color;
+    key->top_color = self->top_color;
+    key->diag_color = self->diag_color;
+
+    return key;
+
+mem_error:
+    return NULL;
+}
+
+/*
+ * Returns a pattern fill struct suitable for hashing as a lookup key.
+ */
+lxw_fill *
+_get_fill_key(lxw_format *self)
+{
+    lxw_fill *key = calloc(1, sizeof(lxw_fill));
+    GOTO_LABEL_ON_MEM_ERROR(key, mem_error);
+
+    key->fg_color = self->fg_color;
+    key->bg_color = self->bg_color;
+    key->pattern = self->pattern;
+
+    return key;
+
+mem_error:
+    return NULL;
+}
+
+/*
+ * Returns the XF index number used by Excel to identify a format.
+ */
+int32_t
+_get_xf_index(lxw_format *self)
+{
+    lxw_format *format_key;
+    lxw_format *existing_format;
+    lxw_hash_element *hash_element;
+    lxw_hash_table *formats_hash_table = self->xf_format_indices;
+    int32_t index;
+
+    /* Note: The formats_hash_table/xf_format_indices contains the unique and
+     * more importantly the *used* formats in the workbook.
+     */
+
+    /* Format already has an index number so return it. */
+    if (self->xf_index != LXW_PROPERTY_UNSET) {
+        return self->xf_index;
+    }
+
+    /* Otherwise, the format doesn't have an index number so we assign one.
+     * First generate a unique key to identify the format in the hash table.
+     */
+    format_key = _get_format_key(self);
+
+    /* Return the default format index if the key generation failed. */
+    if (!format_key)
+        return 0;
+
+    /* Look up the format in the hash table. */
+    hash_element =
+        _hash_key_exists(formats_hash_table, format_key, sizeof(lxw_format));
+
+    if (hash_element) {
+        /* Format matches existing format with an index. */
+        free(format_key);
+        existing_format = hash_element->value;
+        return existing_format->xf_index;
+    }
+    else {
+        /* New format requiring an index. Note. +1 since Excel has an
+         * implicit "General" format at index 0.
+         */
+        index = formats_hash_table->unique_count;
+        self->xf_index = index;
+        _insert_hash_element(formats_hash_table, format_key, self,
+                             sizeof(lxw_format));
+        return index;
+    }
+}
+
+/*
+ * Set the font_name property.
+ */
+void
+format_set_font_name(lxw_format *self, const char *font_name)
+{
+    LXW_FORMAT_FIELD_COPY(self->font_name, font_name);
+}
+
+/*
+ * Set the font_size property.
+ */
+void
+format_set_font_size(lxw_format *self, uint16_t size)
+{
+
+    if (size >= LXW_MIN_FONT_SIZE && size <= LXW_MAX_FONT_SIZE)
+        self->font_size = size;
+}
+
+/*
+ * Set the font_color property.
+ */
+void
+format_set_font_color(lxw_format *self, lxw_color_t color)
+{
+    self->font_color = _check_color(color);
+}
+
+/*
+ * Set the bold property.
+ */
+void
+format_set_bold(lxw_format *self)
+{
+    self->bold = LXW_TRUE;
+}
+
+/*
+ * Set the italic property.
+ */
+
+void
+format_set_italic(lxw_format *self)
+{
+    self->italic = LXW_TRUE;
+}
+
+/*
+ * Set the underline property.
+ */
+void
+format_set_underline(lxw_format *self, uint8_t style)
+{
+    if (style >= LXW_UNDERLINE_SINGLE
+        && style <= LXW_UNDERLINE_DOUBLE_ACCOUNTING)
+        self->underline = style;
+}
+
+/*
+ * Set the font_strikeout property.
+ */
+void
+format_set_font_strikeout(lxw_format *self)
+{
+    self->font_strikeout = LXW_TRUE;
+}
+
+/*
+ * Set the font_script property.
+ */
+void
+format_set_font_script(lxw_format *self, uint8_t style)
+{
+    if (style >= LXW_FONT_SUPERSCRIPT && style <= LXW_FONT_SUBSCRIPT)
+        self->font_script = style;
+}
+
+/*
+ * Set the font_outline property.
+ */
+void
+format_set_font_outline(lxw_format *self)
+{
+    self->font_outline = LXW_TRUE;
+}
+
+/*
+ * Set the font_shadow property.
+ */
+void
+format_set_font_shadow(lxw_format *self)
+{
+    self->font_shadow = LXW_TRUE;
+}
+
+/*
+ * Set the num_format property.
+ */
+void
+format_set_num_format(lxw_format *self, const char *num_format)
+{
+    LXW_FORMAT_FIELD_COPY(self->num_format, num_format);
+}
+
+/*
+ * Set the unlocked property.
+ */
+void
+format_set_unlocked(lxw_format *self)
+{
+    self->locked = LXW_FALSE;
+}
+
+/*
+ * Set the hidden property.
+ */
+void
+format_set_hidden(lxw_format *self)
+{
+    self->hidden = LXW_TRUE;
+}
+
+/*
+ * Set the align property.
+ */
+void
+format_set_align(lxw_format *self, uint8_t value)
+{
+    if (value >= LXW_ALIGN_LEFT && value <= LXW_ALIGN_DISTRIBUTED) {
+        self->text_h_align = value;
+    }
+
+    if (value >= LXW_ALIGN_VERTICAL_TOP
+        && value <= LXW_ALIGN_VERTICAL_DISTRIBUTED) {
+        self->text_v_align = value;
+    }
+}
+
+/*
+ * Set the text_wrap property.
+ */
+void
+format_set_text_wrap(lxw_format *self)
+{
+    self->text_wrap = LXW_TRUE;
+}
+
+/*
+ * Set the rotation property.
+ */
+void
+format_set_rotation(lxw_format *self, int16_t angle)
+{
+    /* Convert user angle to Excel angle. */
+    if (angle == 270) {
+        self->rotation = 255;
+    }
+    else if (angle >= -90 || angle <= 90) {
+        if (angle < 0)
+            angle = -angle + 90;
+
+        self->rotation = angle;
+    }
+    else {
+        LXW_WARN("Rotation rotation outside range: -90 <= angle <= 90");
+        self->rotation = 0;
+    }
+}
+
+/*
+ * Set the indent property.
+ */
+void
+format_set_indent(lxw_format *self, uint8_t value)
+{
+    self->indent = value;
+}
+
+/*
+ * Set the shrink property.
+ */
+void
+format_set_shrink(lxw_format *self)
+{
+    self->shrink = LXW_TRUE;
+}
+
+/*
+ * Set the text_justlast property.
+ */
+void
+format_set_text_justlast(lxw_format *self)
+{
+    self->text_justlast = LXW_TRUE;
+}
+
+/*
+ * Set the pattern property.
+ */
+void
+format_set_pattern(lxw_format *self, uint8_t value)
+{
+    self->pattern = value;
+}
+
+/*
+ * Set the bg_color property.
+ */
+void
+format_set_bg_color(lxw_format *self, lxw_color_t color)
+{
+    self->bg_color = _check_color(color);
+}
+
+/*
+ * Set the fg_color property.
+ */
+void
+format_set_fg_color(lxw_format *self, lxw_color_t color)
+{
+    self->fg_color = _check_color(color);
+}
+
+/*
+ * Set the border property.
+ */
+void
+format_set_border(lxw_format *self, uint8_t style)
+{
+    style = _check_border(style);
+    self->bottom = style;
+    self->top = style;
+    self->left = style;
+    self->right = style;
+}
+
+/*
+ * Set the border_color property.
+ */
+void
+format_set_border_color(lxw_format *self, lxw_color_t color)
+{
+    color = _check_color(color);
+    self->bottom_color = color;
+    self->top_color = color;
+    self->left_color = color;
+    self->right_color = color;
+}
+
+/*
+ * Set the bottom property.
+ */
+void
+format_set_bottom(lxw_format *self, uint8_t style)
+{
+    self->bottom = _check_border(style);
+}
+
+/*
+ * Set the bottom_color property.
+ */
+void
+format_set_bottom_color(lxw_format *self, lxw_color_t color)
+{
+    self->bottom_color = _check_color(color);
+}
+
+/*
+ * Set the left property.
+ */
+void
+format_set_left(lxw_format *self, uint8_t style)
+{
+    self->left = _check_border(style);
+}
+
+/*
+ * Set the left_color property.
+ */
+void
+format_set_left_color(lxw_format *self, lxw_color_t color)
+{
+    self->left_color = _check_color(color);
+}
+
+/*
+ * Set the right property.
+ */
+void
+format_set_right(lxw_format *self, uint8_t style)
+{
+    self->right = _check_border(style);
+}
+
+/*
+ * Set the right_color property.
+ */
+void
+format_set_right_color(lxw_format *self, lxw_color_t color)
+{
+    self->right_color = _check_color(color);
+}
+
+/*
+ * Set the top property.
+ */
+void
+format_set_top(lxw_format *self, uint8_t style)
+{
+    self->top = _check_border(style);
+}
+
+/*
+ * Set the top_color property.
+ */
+void
+format_set_top_color(lxw_format *self, lxw_color_t color)
+{
+    self->top_color = _check_color(color);
+}
+
+/*
+ * Set the diag_type property.
+ */
+void
+format_set_diag_type(lxw_format *self, uint8_t type)
+{
+    if (type >= LXW_DIAGONAL_BORDER_UP && type <= LXW_DIAGONAL_BORDER_UP_DOWN)
+        self->diag_type = type;
+}
+
+/*
+ * Set the diag_color property.
+ */
+void
+format_set_diag_color(lxw_format *self, lxw_color_t color)
+{
+    self->diag_color = _check_color(color);
+}
+
+/*
+ * Set the diag_border property.
+ */
+void
+format_set_diag_border(lxw_format *self, uint8_t style)
+{
+    self->diag_border = style;
+}
+
+/*
+ * Set the num_format_index property.
+ */
+void
+format_set_num_format_index(lxw_format *self, uint8_t value)
+{
+    self->num_format_index = value;
+}
+
+/*
+ * Set the valign property.
+ */
+void
+format_set_valign(lxw_format *self, uint8_t value)
+{
+    self->text_v_align = value;
+}
+
+/*
+ * Set the reading_order property.
+ */
+void
+format_set_reading_order(lxw_format *self, uint8_t value)
+{
+    self->reading_order = value;
+}
+
+/*
+ * Set the font_family property.
+ */
+void
+format_set_font_family(lxw_format *self, uint8_t value)
+{
+    self->font_family = value;
+}
+
+/*
+ * Set the font_charset property.
+ */
+void
+format_set_font_charset(lxw_format *self, uint8_t value)
+{
+    self->font_charset = value;
+}
+
+/*
+ * Set the font_scheme property.
+ */
+void
+format_set_font_scheme(lxw_format *self, const char *font_scheme)
+{
+    LXW_FORMAT_FIELD_COPY(self->font_scheme, font_scheme);
+}
+
+/*
+ * Set the font_condense property.
+ */
+void
+format_set_font_condense(lxw_format *self)
+{
+    self->font_condense = LXW_TRUE;
+}
+
+/*
+ * Set the font_extend property.
+ */
+void
+format_set_font_extend(lxw_format *self)
+{
+    self->font_extend = LXW_TRUE;
+}
+
+/*
+ * Set the theme property.
+ */
+void
+format_set_theme(lxw_format *self, uint8_t value)
+{
+    self->theme = value;
+}
diff --git a/src/hash_table.c b/src/hash_table.c
new file mode 100644
index 00000000..e4a3b073
--- /dev/null
+++ b/src/hash_table.c
@@ -0,0 +1,218 @@
+/*****************************************************************************
+ * hash_table - Hash table functions for libxlsxwriter.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "xlsxwriter/hash_table.h"
+
+/*
+ * Calculate the hash key using the FNV function. See:
+ * http://en.wikipedia.org/wiki/Fowler-Noll-Vo_hash_function
+ */
+size_t
+_generate_hash_key(void *data, size_t data_len, size_t num_buckets)
+{
+    unsigned char *p = data;
+    size_t hash = 2166136261;
+    size_t i;
+
+    for (i = 0; i < data_len; i++)
+        hash = (hash * 16777619) ^ p[i];
+
+    return hash % num_buckets;
+}
+
+/*
+ * Check if an element exists in the hash table and return a pointer
+ * to it if it does.
+ */
+lxw_hash_element *
+_hash_key_exists(lxw_hash_table *lxw_hash, void *key, size_t key_len)
+{
+    size_t hash_key = _generate_hash_key(key, key_len, lxw_hash->num_buckets);
+    struct lxw_hash_bucket_list *list;
+    lxw_hash_element *element;
+
+    if (!lxw_hash->buckets[hash_key]) {
+        /* The key isn't in the LXW_HASH hash table. */
+        return NULL;
+    }
+    else {
+        /* The key is already in the table or there is a hash collision. */
+        list = lxw_hash->buckets[hash_key];
+
+        /* Iterate over the keys in the bucket's linked list. */
+        SLIST_FOREACH(element, list, lxw_hash_list_pointers) {
+            if (memcmp(element->key, key, key_len) == 0) {
+                /* The key already exists in the table. */
+                return element;
+            }
+        }
+
+        /* Key doesn't exist in the list so this is a hash collision. */
+        return NULL;
+    }
+}
+
+/*
+ * Insert or update a value in the LXW_HASH table based on a key
+ * and return a pointer to the new or updated element.
+ */
+lxw_hash_element *
+_insert_hash_element(lxw_hash_table *lxw_hash, void *key, void *value,
+                     size_t key_len)
+{
+    size_t hash_key = _generate_hash_key(key, key_len, lxw_hash->num_buckets);
+    struct lxw_hash_bucket_list *list;
+    lxw_hash_element *element;
+
+    if (!lxw_hash->buckets[hash_key]) {
+        /* The key isn't in the LXW_HASH hash table. */
+
+        /* Create a linked list in the bucket to hold the lxw_hash keys. */
+        list = calloc(1, sizeof(struct lxw_hash_bucket_list));
+        RETURN_ON_MEM_ERROR(list, NULL);
+
+        /* Initialise the bucket linked list. */
+        SLIST_INIT(list);
+
+        /* Create an lxw_hash element to add to the linked list. */
+        element = calloc(1, sizeof(lxw_hash_element));
+        RETURN_ON_MEM_ERROR(element, NULL);
+
+        /* Store the key and value. */
+        element->key = key;
+        element->value = value;
+
+        /* Add the lxw_hash element to the bucket's linked list. */
+        SLIST_INSERT_HEAD(list, element, lxw_hash_list_pointers);
+
+        /* Also add it to the insertion order linked list. */
+        STAILQ_INSERT_TAIL(lxw_hash->order_list, element,
+                           lxw_hash_order_pointers);
+
+        /* Store the bucket list at the hash index. */
+        lxw_hash->buckets[hash_key] = list;
+
+        lxw_hash->used_buckets++;
+        lxw_hash->unique_count++;
+
+        return element;
+    }
+    else {
+        /* The key is already in the table or there is a hash collision. */
+        list = lxw_hash->buckets[hash_key];
+
+        /* Iterate over the keys in the bucket's linked list. */
+        SLIST_FOREACH(element, list, lxw_hash_list_pointers) {
+            if (memcmp(element->key, key, key_len) == 0) {
+                /* The key already exists in the table. Update the value. */
+                if (lxw_hash->free_value)
+                    free(element->value);
+
+                element->value = value;
+                return element;
+            }
+        }
+
+        /* Key doesn't exist in the list so this is a hash collision.
+         * Create an lxw_hash element to add to the linked list. */
+        element = calloc(1, sizeof(lxw_hash_element));
+        RETURN_ON_MEM_ERROR(element, NULL);
+
+        /* Store the key and value. */
+        element->key = key;
+        element->value = value;
+
+        /* Add the lxw_hash element to the bucket linked list. */
+        SLIST_INSERT_HEAD(list, element, lxw_hash_list_pointers);
+
+        /* Also add it to the insertion order linked list. */
+        STAILQ_INSERT_TAIL(lxw_hash->order_list, element,
+                           lxw_hash_order_pointers);
+
+        lxw_hash->unique_count++;
+
+        return element;
+    }
+}
+
+/*
+ * Create a new LXW_HASH hash table object.
+ */
+lxw_hash_table *
+_new_lxw_hash(size_t num_buckets, uint8_t free_key, uint8_t free_value)
+{
+    /* Create the new hash table. */
+    lxw_hash_table *lxw_hash = calloc(1, sizeof(lxw_hash_table));
+    RETURN_ON_MEM_ERROR(lxw_hash, NULL);
+
+    lxw_hash->free_key = free_key;
+    lxw_hash->free_value = free_value;
+
+    /* Add the lxw_hash element buckets. */
+    lxw_hash->buckets =
+        calloc(num_buckets, sizeof(struct lxw_hash_bucket_list *));
+    GOTO_LABEL_ON_MEM_ERROR(lxw_hash->buckets, mem_error);
+
+    /* Add a list for tracking the insertion order. */
+    lxw_hash->order_list = calloc(1, sizeof(struct lxw_hash_order_list));
+    GOTO_LABEL_ON_MEM_ERROR(lxw_hash->order_list, mem_error);
+
+    /* Initialise the order list. */
+    STAILQ_INIT(lxw_hash->order_list);
+
+    /* Store the number of buckets to calculate the load factor. */
+    lxw_hash->num_buckets = num_buckets;
+
+    return lxw_hash;
+
+mem_error:
+    if (lxw_hash)
+        free(lxw_hash->order_list);
+
+    free(lxw_hash);
+
+    return NULL;
+}
+
+/*
+ * Free the LXW_HASH hash table object.
+ */
+void
+_free_lxw_hash(lxw_hash_table *lxw_hash)
+{
+    size_t i;
+    lxw_hash_element *element;
+    lxw_hash_element *element_temp;
+
+    if (!lxw_hash)
+        return;
+
+    /* Free the lxw_hash_elements and their data using the ordered linked list. */
+    STAILQ_FOREACH_SAFE(element, lxw_hash->order_list,
+                        lxw_hash_order_pointers, element_temp) {
+        if (lxw_hash->free_key)
+            free(element->key);
+        if (lxw_hash->free_value)
+            free(element->value);
+        free(element);
+    }
+
+    /* Free the buckets from the hash table. */
+    for (i = 0; i < lxw_hash->num_buckets; i++) {
+        free(lxw_hash->buckets[i]);
+    }
+
+    free(lxw_hash->order_list);
+    free(lxw_hash->buckets);
+    free(lxw_hash);
+}
diff --git a/src/packager.c b/src/packager.c
new file mode 100644
index 00000000..46aac601
--- /dev/null
+++ b/src/packager.c
@@ -0,0 +1,456 @@
+/*****************************************************************************
+ * packager - A library for creating Excel XLSX packager files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/packager.h"
+#include "xlsxwriter/hash_table.h"
+#include "xlsxwriter/utility.h"
+
+int16_t _add_file_to_zip(lxw_packager *self, FILE * file,
+                         const char *filename);
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new packager object.
+ */
+lxw_packager *
+_new_packager(const char *filename)
+{
+    struct tm *file_date;
+    time_t now = time(NULL);
+    lxw_packager *packager = calloc(1, sizeof(lxw_packager));
+    GOTO_LABEL_ON_MEM_ERROR(packager, mem_error);
+
+    packager->buffer = calloc(1, LXW_ZIP_BUFFER_SIZE);
+    GOTO_LABEL_ON_MEM_ERROR(packager->buffer, mem_error);
+
+    packager->filename = __builtin_strdup(filename);
+    GOTO_LABEL_ON_MEM_ERROR(packager->filename, mem_error);
+
+    packager->buffer_size = LXW_ZIP_BUFFER_SIZE;
+
+    /* Initialise the zip_fileinfo struct. */
+    file_date = localtime(&now);
+    packager->zipfile_info.tmz_date.tm_sec = file_date->tm_sec;
+    packager->zipfile_info.tmz_date.tm_min = file_date->tm_min;
+    packager->zipfile_info.tmz_date.tm_hour = file_date->tm_hour;
+    packager->zipfile_info.tmz_date.tm_mday = file_date->tm_mday;
+    packager->zipfile_info.tmz_date.tm_mon = file_date->tm_mon;
+    packager->zipfile_info.tmz_date.tm_year = file_date->tm_year;
+    packager->zipfile_info.dosDate = 0;
+    packager->zipfile_info.internal_fa = 0;
+    packager->zipfile_info.external_fa = 0;
+
+    /* Create a zip container for the xlsx file. */
+    packager->zipfile = zipOpen(packager->filename, 0);
+    if (packager->zipfile == NULL) {
+        ERROR("Error opening zip file for xlsx");
+        goto mem_error;
+    }
+
+    return packager;
+
+mem_error:
+    _free_packager(packager);
+    return NULL;
+}
+
+/*
+ * Free a packager object.
+ */
+void
+_free_packager(lxw_packager *packager)
+{
+    if (!packager)
+        return;
+
+    free(packager->buffer);
+    free(packager->filename);
+    free(packager);
+}
+
+/*****************************************************************************
+ *
+ * File assembly functions.
+ *
+ ****************************************************************************/
+/*
+ * Write the workbook.xml file.
+ */
+STATIC uint8_t
+_write_workbook_file(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+
+    workbook->file = tmpfile();
+
+    _workbook_assemble_xml_file(workbook);
+
+    _add_file_to_zip(self, workbook->file, "xl/workbook.xml");
+
+    fclose(workbook->file);
+
+    return 0;
+}
+
+/*
+ * Write the worksheet files.
+ */
+STATIC uint8_t
+_write_worksheet_files(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+    lxw_worksheet *worksheet;
+    char sheetname[FILENAME_LEN] = { 0 };
+    uint16_t index = 1;
+
+    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+        __builtin_snprintf(sheetname, FILENAME_LEN,
+                           "xl/worksheets/sheet%d.xml", index++);
+
+        worksheet->file = tmpfile();
+
+        _worksheet_assemble_xml_file(worksheet);
+
+        _add_file_to_zip(self, worksheet->file, sheetname);
+
+        fclose(worksheet->file);
+    }
+
+    return 0;
+}
+
+/*
+ * Write the sharedStrings.xml file.
+ */
+STATIC uint8_t
+_write_shared_strings_file(lxw_packager *self)
+{
+    lxw_sst *sst = self->workbook->sst;
+
+    /* Skip the sharedStrings file if there are no shared strings. */
+    if (!sst->string_count)
+        return 0;
+
+    sst->file = tmpfile();
+
+    _sst_assemble_xml_file(sst);
+
+    _add_file_to_zip(self, sst->file, "xl/sharedStrings.xml");
+
+    fclose(sst->file);
+
+    return 0;
+}
+
+/*
+ * Write the app.xml file.
+ */
+STATIC uint8_t
+_write_app_file(lxw_packager *self)
+{
+    lxw_workbook *workbook = self->workbook;
+    lxw_worksheet *worksheet;
+    lxw_app *app = _new_app();
+    char num_sheets[ATTR_32] = { 0 };
+
+    app->file = tmpfile();
+
+    __builtin_snprintf(num_sheets, ATTR_32, "%d", self->workbook->num_sheets);
+
+    _add_heading_pair(app, "Worksheets", num_sheets);
+
+    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+        _add_part_name(app, worksheet->name);
+    }
+
+    _app_assemble_xml_file(app);
+
+    _add_file_to_zip(self, app->file, "docProps/app.xml");
+
+    fclose(app->file);
+
+    _free_app(app);
+
+    return 0;
+}
+
+/*
+ * Write the core.xml file.
+ */
+STATIC uint8_t
+_write_core_file(lxw_packager *self)
+{
+    lxw_core *core = _new_core();
+
+    core->file = tmpfile();
+
+    core->properties = self->workbook->properties;
+
+    _core_assemble_xml_file(core);
+
+    _add_file_to_zip(self, core->file, "docProps/core.xml");
+
+    fclose(core->file);
+
+    _free_core(core);
+
+    return 0;
+}
+
+/*
+ * Write the theme.xml file.
+ */
+STATIC uint8_t
+_write_theme_file(lxw_packager *self)
+{
+    lxw_theme *theme = _new_theme();
+
+    theme->file = tmpfile();
+
+    _theme_assemble_xml_file(theme);
+
+    _add_file_to_zip(self, theme->file, "xl/theme/theme1.xml");
+
+    fclose(theme->file);
+
+    _free_theme(theme);
+
+    return 0;
+}
+
+/*
+ * Write the styles.xml file.
+ */
+STATIC uint8_t
+_write_styles_file(lxw_packager *self)
+{
+    lxw_styles *styles = _new_styles();
+    lxw_hash_element *hash_element;
+
+    /* Copy the unique and in-use formats from the workbook xf_format_indices
+     * list to the styles xf_format list. */
+    STAILQ_FOREACH(hash_element,
+                   self->workbook->xf_format_indices->order_list,
+                   lxw_hash_order_pointers) {
+        lxw_format *workbook_format = (lxw_format *) hash_element->value;
+        lxw_format *style_format = _new_format();
+        memcpy(style_format, workbook_format, sizeof(lxw_format));
+        STAILQ_INSERT_TAIL(styles->xf_formats, style_format, list_pointers);
+    }
+
+    styles->font_count = self->workbook->font_count;
+    styles->border_count = self->workbook->border_count;
+    styles->fill_count = self->workbook->fill_count;
+    styles->num_format_count = self->workbook->num_format_count;
+    styles->xf_count = self->workbook->xf_format_indices->unique_count;
+
+    styles->file = tmpfile();
+
+    _styles_assemble_xml_file(styles);
+
+    _add_file_to_zip(self, styles->file, "xl/styles.xml");
+
+    fclose(styles->file);
+
+    _free_styles(styles);
+
+    return 0;
+}
+
+/*
+ * Write the ContentTypes.xml file.
+ */
+STATIC uint8_t
+_write_content_types_file(lxw_packager *self)
+{
+    lxw_content_types *content_types = _new_content_types();
+    lxw_workbook *workbook = self->workbook;
+    lxw_worksheet *worksheet;
+    char sheetname[FILENAME_LEN] = { 0 };
+    uint16_t index = 1;
+
+    content_types->file = tmpfile();
+
+    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+        __builtin_snprintf(sheetname, FILENAME_LEN, "sheet%d", index++);
+        _ct_add_worksheet_name(content_types, sheetname);
+    }
+
+    if (workbook->sst->string_count)
+        _ct_add_shared_strings(content_types);
+
+    _content_types_assemble_xml_file(content_types);
+
+    _add_file_to_zip(self, content_types->file, "[Content_Types].xml");
+
+    fclose(content_types->file);
+
+    _free_content_types(content_types);
+
+    return 0;
+}
+
+/*
+ * Write the workbook .rels xml file.
+ */
+STATIC uint8_t
+_write_workbook_rels_file(lxw_packager *self)
+{
+    lxw_relationships *rels = _new_relationships();
+    lxw_workbook *workbook = self->workbook;
+    lxw_worksheet *worksheet;
+    char sheetname[FILENAME_LEN] = { 0 };
+    uint16_t index = 1;
+
+    rels->file = tmpfile();
+
+    STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
+        __builtin_snprintf(sheetname, FILENAME_LEN, "worksheets/sheet%d.xml",
+                           index++);
+        _add_document_relationship(rels, "/worksheet", sheetname);
+    }
+
+    _add_document_relationship(rels, "/theme", "theme/theme1.xml");
+    _add_document_relationship(rels, "/styles", "styles.xml");
+
+    if (workbook->sst->string_count)
+        _add_document_relationship(rels, "/sharedStrings",
+                                   "sharedStrings.xml");
+
+    _relationships_assemble_xml_file(rels);
+
+    _add_file_to_zip(self, rels->file, "xl/_rels/workbook.xml.rels");
+
+    fclose(rels->file);
+    _free_relationships(rels);
+
+    return 0;
+}
+
+/*
+ * Write the _rels/.rels xml file.
+ */
+STATIC uint8_t
+_write_root_rels_file(lxw_packager *self)
+{
+    lxw_relationships *rels = _new_relationships();
+
+    rels->file = tmpfile();
+
+    _add_document_relationship(rels, "/officeDocument", "xl/workbook.xml");
+    _add_package_relationship(rels, "/metadata/core-properties",
+                              "docProps/core.xml");
+    _add_document_relationship(rels, "/extended-properties",
+                               "docProps/app.xml");
+
+    _relationships_assemble_xml_file(rels);
+
+    _add_file_to_zip(self, rels->file, "_rels/.rels");
+
+    fclose(rels->file);
+
+    _free_relationships(rels);
+
+    return 0;
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+int16_t
+_add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
+{
+    int16_t error = ZIP_OK;
+    size_t size_read;
+
+    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) {
+        ERROR("Error adding member to zipfile");
+        return error;
+    }
+
+    fflush(file);
+    rewind(file);
+
+    size_read = fread(self->buffer, 1, self->buffer_size, file);
+
+    while (size_read) {
+
+        if (size_read < self->buffer_size) {
+            if (feof(file) == 0) {
+                ERROR("Error reading member file data");
+                return ZIP_ERRNO;
+            }
+        }
+
+        error = zipWriteInFileInZip(self->zipfile, self->buffer, size_read);
+        if (error < 0) {
+            ERROR("Error in writing member in the zipfile");
+            return error;
+        }
+
+        size_read = fread(self->buffer, 1, self->buffer_size, file);
+    }
+
+    if (error < 0) {
+        return ZIP_ERRNO;
+    }
+    else {
+        error = zipCloseFileInZip(self->zipfile);
+        if (error != ZIP_OK) {
+            ERROR("Error in closing member in the zipfile");
+            return error;
+        }
+    }
+
+    return ZIP_OK;
+}
+
+/*
+ * Write the xml files that make up the XLXS OPC package.
+ */
+uint8_t
+_create_package(lxw_packager *self)
+{
+
+    _write_workbook_file(self);
+    _write_worksheet_files(self);
+    _write_shared_strings_file(self);
+    _write_app_file(self);
+    _write_core_file(self);
+    _write_theme_file(self);
+    _write_styles_file(self);
+    _write_content_types_file(self);
+    _write_workbook_rels_file(self);
+    _write_root_rels_file(self);
+
+    zipClose(self->zipfile, NULL);
+
+    return 0;
+}
diff --git a/src/relationships.c b/src/relationships.c
new file mode 100644
index 00000000..b3ccb154
--- /dev/null
+++ b/src/relationships.c
@@ -0,0 +1,242 @@
+/*****************************************************************************
+ * relationships - A library for creating Excel XLSX relationships files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include <string.h>
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/relationships.h"
+#include "xlsxwriter/utility.h"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new relationships object.
+ */
+lxw_relationships *
+_new_relationships()
+{
+    lxw_relationships *rels = calloc(1, sizeof(lxw_relationships));
+    GOTO_LABEL_ON_MEM_ERROR(rels, mem_error);
+
+    rels->relationships = calloc(1, sizeof(struct lxw_rel_tuples));
+    GOTO_LABEL_ON_MEM_ERROR(rels->relationships, mem_error);
+    STAILQ_INIT(rels->relationships);
+
+    return rels;
+
+mem_error:
+    _free_relationships(rels);
+    return NULL;
+}
+
+/*
+ * Free a relationships object.
+ */
+void
+_free_relationships(lxw_relationships *rels)
+{
+    lxw_rel_tuple *relationship;
+
+    if (!rels)
+        return;
+
+    while (!STAILQ_EMPTY(rels->relationships)) {
+        relationship = STAILQ_FIRST(rels->relationships);
+        STAILQ_REMOVE_HEAD(rels->relationships, list_pointers);
+        free(relationship->type);
+        free(relationship->target);
+        free(relationship->target_mode);
+        free(relationship);
+    }
+
+    free(rels->relationships);
+    free(rels);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_relationships_xml_declaration(lxw_relationships *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <Relationship> element.
+ */
+STATIC void
+_write_relationship(lxw_relationships *self, const char *type,
+                    const char *target, const char *target_mode)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char r_id[MAX_ATTRIBUTE_LENGTH] = { 0 };
+
+    self->rel_id++;
+    __builtin_snprintf(r_id, ATTR_32, "rId%d", self->rel_id);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("Id", r_id);
+    _PUSH_ATTRIBUTES_STR("Type", type);
+    _PUSH_ATTRIBUTES_STR("Target", target);
+
+    if (target_mode)
+        _PUSH_ATTRIBUTES_STR("TargetMode", target_mode);
+
+    _xml_empty_tag(self->file, "Relationship", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <Relationships> element.
+ */
+STATIC void
+_write_relationships(lxw_relationships *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_rel_tuple *rel;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", LXW_PACKAGE_SCHEMA);
+
+    _xml_start_tag(self->file, "Relationships", &attributes);
+
+    STAILQ_FOREACH(rel, self->relationships, list_pointers) {
+        _write_relationship(self, rel->type, rel->target, rel->target_mode);
+    }
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_relationships_assemble_xml_file(lxw_relationships *self)
+{
+    /* Write the XML declaration. */
+    _relationships_xml_declaration(self);
+
+    _write_relationships(self);
+
+    /* Close the relationships tag. */
+    _xml_end_tag(self->file, "Relationships");
+}
+
+/*
+ * Add a generic container relationship to XLSX .rels xml files.
+ */
+STATIC void
+_add_relationship(lxw_relationships *self, const char *schema,
+                  const char *type, const char *target,
+                  const char *target_mode)
+{
+    lxw_rel_tuple *relationship;
+
+    if (!schema || !type || !target)
+        return;
+
+    relationship = calloc(1, sizeof(lxw_rel_tuple));
+    GOTO_LABEL_ON_MEM_ERROR(relationship, mem_error);
+
+    relationship->type = calloc(1, MAX_ATTRIBUTE_LENGTH);
+    GOTO_LABEL_ON_MEM_ERROR(relationship->type, mem_error);
+
+    /* Add the schema to the relationship type. */
+    __builtin_snprintf(relationship->type, MAX_ATTRIBUTE_LENGTH, "%s%s",
+                       schema, type);
+
+    relationship->target = __builtin_strdup(target);
+    GOTO_LABEL_ON_MEM_ERROR(relationship->target, mem_error);
+
+    if (target_mode) {
+        relationship->target_mode = __builtin_strdup(target_mode);
+        GOTO_LABEL_ON_MEM_ERROR(relationship->target_mode, mem_error);
+    }
+
+    STAILQ_INSERT_TAIL(self->relationships, relationship, list_pointers);
+
+    return;
+
+mem_error:
+    if (relationship) {
+        free(relationship->type);
+        free(relationship->target);
+        free(relationship->target_mode);
+        free(relationship);
+    }
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Add a document relationship to XLSX .rels xml files.
+ */
+void
+_add_document_relationship(lxw_relationships *self, const char *type,
+                           const char *target)
+{
+    _add_relationship(self, LXW_DOCUMENT_SCHEMA, type, target, NULL);
+}
+
+/*
+ * Add a package relationship to XLSX .rels xml files.
+ */
+void
+_add_package_relationship(lxw_relationships *self, const char *type,
+                          const char *target)
+{
+    _add_relationship(self, LXW_PACKAGE_SCHEMA, type, target, NULL);
+}
+
+/*
+ * Add a MS schema package relationship to XLSX .rels xml files.
+ */
+void
+_add_ms_package_relationship(lxw_relationships *self, const char *type,
+                             const char *target)
+{
+    _add_relationship(self, LXW_MS_SCHEMA, type, target, NULL);
+}
+
+/*
+ * Add a worksheet relationship to sheet .rels xml files.
+ */
+void
+_add_worksheet_relationship(lxw_relationships *self, const char *type,
+                            const char *target, const char *target_mode)
+{
+    _add_relationship(self, LXW_DOCUMENT_SCHEMA, type, target, target_mode);
+}
diff --git a/src/shared_strings.c b/src/shared_strings.c
new file mode 100644
index 00000000..b131398a
--- /dev/null
+++ b/src/shared_strings.c
@@ -0,0 +1,306 @@
+/*****************************************************************************
+ * shared_strings - A library for creating Excel XLSX sst files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/shared_strings.h"
+#include "xlsxwriter/utility.h"
+#include <ctype.h>
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new SST SharedString hash table object.
+ */
+lxw_sst *
+_new_sst()
+{
+    /* Create the new hash table. */
+    lxw_sst *sst = calloc(1, sizeof(lxw_sst));
+    RETURN_ON_MEM_ERROR(sst, NULL);
+
+    /* Add the sst element buckets. */
+    sst->buckets = calloc(NUM_SST_BUCKETS, sizeof(struct sst_bucket_list *));
+    GOTO_LABEL_ON_MEM_ERROR(sst->buckets, mem_error1);
+
+    /* Add a list for tracking the insertion order. */
+    sst->order_list = calloc(1, sizeof(struct sst_order_list));
+    GOTO_LABEL_ON_MEM_ERROR(sst->order_list, mem_error2);
+
+    /* Initialise the order list. */
+    STAILQ_INIT(sst->order_list);
+
+    /* Store the number of buckets to calculate the load factor. */
+    sst->num_buckets = NUM_SST_BUCKETS;
+
+    return sst;
+
+mem_error2:
+    free(sst->order_list);
+
+mem_error1:
+    free(sst);
+
+    return NULL;
+}
+
+/*
+ * Free a SST SharedString hash table object.
+ */
+void
+_free_sst(lxw_sst *sst)
+{
+    size_t i;
+    struct sst_element *sst_element;
+    struct sst_element *sst_element_temp;
+
+    if (!sst)
+        return;
+
+    /* Free the sst_elements and their data using the ordered linked list. */
+    STAILQ_FOREACH_SAFE(sst_element, sst->order_list, sst_order_pointers,
+                        sst_element_temp) {
+        if (sst_element && sst_element->string)
+            free(sst_element->string);
+        if (sst_element)
+            free(sst_element);
+    }
+
+    /* Free the buckets from the hash table. */
+    for (i = 0; i < sst->num_buckets; i++) {
+        if (sst->buckets[i])
+            free(sst->buckets[i]);
+    }
+
+    if (sst->order_list)
+        free(sst->order_list);
+
+    if (sst->buckets)
+        free(sst->buckets);
+
+    free(sst);
+}
+
+/*
+ * FNV hash function for SST table string keys. See:
+ * http://en.wikipedia.org/wiki/Fowler-Noll-Vo_hash_function
+ */
+size_t
+_generate_sst_hash_key(const char *string)
+{
+    size_t string_len = strlen(string);
+    size_t hash = 2166136261;
+    size_t i;
+
+    for (i = 0; i < string_len; i++)
+        hash = (hash * 16777619) ^ (unsigned char) string[i];
+
+    return hash % NUM_SST_BUCKETS;
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_sst_xml_declaration(lxw_sst *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <t> element.
+ */
+void
+_write_t(lxw_sst *self, char *string)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    /* Add attribute to preserve leading or trailing whitespace. */
+    if (string && (isspace(string[0]) || isspace(string[strlen(string) - 1])))
+        _PUSH_ATTRIBUTES_STR("xml:space", "preserve");
+
+    _xml_data_element(self->file, "t", string, &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <si> element.
+ */
+void
+_write_si(lxw_sst *self, char *string)
+{
+    _xml_start_tag(self->file, "si", NULL);
+
+    /* Write the t element. */
+    _write_t(self, string);
+
+    _xml_end_tag(self->file, "si");
+}
+
+/*
+ * Write the <sst> element.
+ */
+void
+_write_sst(lxw_sst *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char xmlns[] =
+        "http://schemas.openxmlformats.org/spreadsheetml/2006/main";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", xmlns);
+    _PUSH_ATTRIBUTES_INT("count", self->string_count);
+    _PUSH_ATTRIBUTES_INT("uniqueCount", self->unique_count);
+
+    _xml_start_tag(self->file, "sst", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_write_sst_strings(lxw_sst *self)
+{
+    struct sst_element *sst_element;
+
+    STAILQ_FOREACH(sst_element, self->order_list, sst_order_pointers) {
+        /* Write the si element. */
+        _write_si(self, sst_element->string);
+    }
+}
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_sst_assemble_xml_file(lxw_sst *self)
+{
+    /* Write the XML declaration. */
+    _sst_xml_declaration(self);
+
+    /* Write the sst element. */
+    _write_sst(self);
+
+    /* Write the sst strings. */
+    _write_sst_strings(self);
+
+    /* Close the sst tag. */
+    _xml_end_tag(self->file, "sst");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+/*
+ * Add to or find a string in the SST SharedString table and return it's index.
+ */
+int32_t
+_get_sst_index(lxw_sst *sst, const char *string)
+{
+    size_t hash_key = _generate_sst_hash_key(string);
+    struct sst_bucket_list *list;
+    struct sst_element *element;
+
+    if (!sst->buckets[hash_key]) {
+        /* The string isn't in the SST SharedString hash table. */
+
+        /* Create a linked list in the bucket to hold the sst strings. */
+        list = calloc(1, sizeof(struct sst_bucket_list));
+        RETURN_ON_MEM_ERROR(list, -1);
+
+        /* Initialise the bucket linked list. */
+        SLIST_INIT(list);
+
+        /* Create an sst element to add to the linked list. */
+        element = calloc(1, sizeof(struct sst_element));
+        RETURN_ON_MEM_ERROR(element, -1);
+
+        /* Store the string and its index. */
+        element->index = sst->unique_count;
+        element->string = __builtin_strdup(string);
+
+        /* Add the sst element to the bucket linked list. */
+        SLIST_INSERT_HEAD(list, element, sst_list_pointers);
+
+        /* Also add it to the insertion order linked list. */
+        STAILQ_INSERT_TAIL(sst->order_list, element, sst_order_pointers);
+
+        /* Store the bucket list at the hash index. */
+        sst->buckets[hash_key] = list;
+
+        /* Update the bucket and SST string counts. */
+        sst->used_buckets++;
+        sst->string_count++;
+        sst->unique_count++;
+
+        return element->index;
+    }
+    else {
+        /* The sting is already in the table or there is a hash collision. */
+        list = sst->buckets[hash_key];
+
+        /* Iterate over the strings in the bucket's linked list. */
+        SLIST_FOREACH(element, list, sst_list_pointers) {
+            if (strcmp(element->string, string) == 0) {
+                /* The string already exists in the table. Update the
+                 * non-unique string count and return the index. */
+                sst->string_count++;
+                return element->index;
+            }
+        }
+
+        /* String doesn't exist in the list so this is a hash collision.
+         * Create an sst element to add to the linked list. */
+        element = calloc(1, sizeof(struct sst_element));
+        RETURN_ON_MEM_ERROR(element, -1);
+
+        /* Store the string and its index. */
+        element->index = sst->unique_count;
+        element->string = __builtin_strdup(string);
+
+        /* Add the sst element to the bucket linked list. */
+        SLIST_INSERT_HEAD(list, element, sst_list_pointers);
+
+        /* Also add it to the insertion order linked list. */
+        STAILQ_INSERT_TAIL(sst->order_list, element, sst_order_pointers);
+
+        /* Update the SST string counts. */
+        sst->string_count++;
+        sst->unique_count++;
+
+        return element->index;
+    }
+}
diff --git a/src/styles.c b/src/styles.c
new file mode 100644
index 00000000..cc803598
--- /dev/null
+++ b/src/styles.c
@@ -0,0 +1,1088 @@
+/*****************************************************************************
+ * styles - A library for creating Excel XLSX styles files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/styles.h"
+#include "xlsxwriter/utility.h"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new styles object.
+ */
+lxw_styles *
+_new_styles()
+{
+    lxw_styles *styles = calloc(1, sizeof(lxw_styles));
+    GOTO_LABEL_ON_MEM_ERROR(styles, mem_error);
+
+    styles->xf_formats = calloc(1, sizeof(struct lxw_formats));
+    GOTO_LABEL_ON_MEM_ERROR(styles->xf_formats, mem_error);
+
+    STAILQ_INIT(styles->xf_formats);
+
+    return styles;
+
+mem_error:
+    _free_styles(styles);
+    return NULL;
+}
+
+/*
+ * Free a styles object.
+ */
+void
+_free_styles(lxw_styles *styles)
+{
+    lxw_format *format;
+
+    if (!styles)
+        return;
+
+    /* Free the formats in the styles. */
+    while (!STAILQ_EMPTY(styles->xf_formats)) {
+        format = STAILQ_FIRST(styles->xf_formats);
+        STAILQ_REMOVE_HEAD(styles->xf_formats, list_pointers);
+        free(format);
+    }
+
+    free(styles->xf_formats);
+    free(styles);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_styles_xml_declaration(lxw_styles *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <styleSheet> element.
+ */
+STATIC void
+_write_style_sheet(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns",
+                         "http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+    _xml_start_tag(self->file, "styleSheet", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <numFmt> element.
+ */
+STATIC void
+_write_num_fmt(lxw_styles *self, uint8_t num_fmt_id, char *format_code)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("numFmtId", num_fmt_id);
+    _PUSH_ATTRIBUTES_STR("formatCode", format_code);
+
+    _xml_empty_tag(self->file, "numFmt", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <numFmts> element.
+ */
+STATIC void
+_write_num_fmts(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_format *format;
+
+    if (!self->num_format_count)
+        return;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("count", self->num_format_count);
+
+    _xml_start_tag(self->file, "numFmts", &attributes);
+
+    /* Write the numFmts elements. */
+    STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
+
+        /* Ignore built-in number formats, i.e., < 164. */
+        if (format->num_format_index < 164)
+            continue;
+
+        _write_num_fmt(self, format->num_format_index, format->num_format);
+    }
+
+    _xml_end_tag(self->file, "numFmts");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <sz> element.
+ */
+STATIC void
+_write_font_size(lxw_styles *self, uint16_t font_size)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("val", font_size);
+
+    _xml_empty_tag(self->file, "sz", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <color> element for themes.
+ */
+STATIC void
+_write_font_color_theme(lxw_styles *self, uint8_t theme)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("theme", theme);
+
+    _xml_empty_tag(self->file, "color", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <color> element for RGB colours.
+ */
+STATIC void
+_write_font_color_rgb(lxw_styles *self, int32_t rgb)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char rgb_str[ATTR_32];
+
+    __builtin_snprintf(rgb_str, ATTR_32, "FF%06X", rgb & LXW_COLOR_MASK);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("rgb", rgb_str);
+
+    _xml_empty_tag(self->file, "color", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <name> element.
+ */
+STATIC void
+_write_font_name(lxw_styles *self, const char *font_name)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    if (strlen(font_name))
+        _PUSH_ATTRIBUTES_STR("val", font_name);
+    else
+        _PUSH_ATTRIBUTES_STR("val", LXW_DEFAULT_FONT_NAME);
+
+    _xml_empty_tag(self->file, "name", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <family> element.
+ */
+STATIC void
+_write_font_family(lxw_styles *self, uint8_t font_family)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("val", font_family);
+
+    _xml_empty_tag(self->file, "family", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <scheme> element.
+ */
+STATIC void
+_write_font_scheme(lxw_styles *self, const char *font_scheme)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    if (strlen(font_scheme))
+        _PUSH_ATTRIBUTES_STR("val", font_scheme);
+    else
+        _PUSH_ATTRIBUTES_STR("val", "minor");
+
+    _xml_empty_tag(self->file, "scheme", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the underline font element.
+ */
+STATIC void
+_write_font_underline(lxw_styles *self, uint8_t underline)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    /* Handle the underline variants. */
+    if (underline == LXW_UNDERLINE_DOUBLE)
+        _PUSH_ATTRIBUTES_STR("val", "double");
+    else if (underline == LXW_UNDERLINE_SINGLE_ACCOUNTING)
+        _PUSH_ATTRIBUTES_STR("val", "singleAccounting");
+    else if (underline == LXW_UNDERLINE_DOUBLE_ACCOUNTING)
+        _PUSH_ATTRIBUTES_STR("val", "doubleAccounting");
+    /* Default to single underline. */
+
+    _xml_empty_tag(self->file, "u", &attributes);
+
+    _FREE_ATTRIBUTES();
+
+}
+
+/*
+ * Write the <vertAlign> font sub-element.
+ */
+STATIC void
+_write_vert_align(lxw_styles *self, const char *align)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("val", align);
+
+    _xml_empty_tag(self->file, "vertAlign", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <font> element.
+ */
+STATIC void
+_write_font(lxw_styles *self, lxw_format *format)
+{
+    _xml_start_tag(self->file, "font", NULL);
+
+    if (format->bold)
+        _xml_empty_tag(self->file, "b", NULL);
+
+    if (format->italic)
+        _xml_empty_tag(self->file, "i", NULL);
+
+    if (format->font_strikeout)
+        _xml_empty_tag(self->file, "strike", NULL);
+
+    if (format->font_outline)
+        _xml_empty_tag(self->file, "outline", NULL);
+
+    if (format->font_shadow)
+        _xml_empty_tag(self->file, "shadow", NULL);
+
+    if (format->underline)
+        _write_font_underline(self, format->underline);
+
+    if (format->font_script == LXW_FONT_SUPERSCRIPT)
+        _write_vert_align(self, "superscript");
+
+    if (format->font_script == LXW_FONT_SUBSCRIPT)
+        _write_vert_align(self, "subscript");
+
+    if (format->font_size)
+        _write_font_size(self, format->font_size);
+
+    if (format->theme)
+        _write_font_color_theme(self, format->theme);
+    else if (format->font_color != LXW_COLOR_UNSET)
+        _write_font_color_rgb(self, format->font_color);
+    else
+        _write_font_color_theme(self, LXW_DEFAULT_FONT_THEME);
+
+    _write_font_name(self, format->font_name);
+    _write_font_family(self, format->font_family);
+
+    /* Only write the scheme element for the default font type if it
+     * is a hyperlink. */
+    if ((!strlen(format->font_name)
+         || strcmp(LXW_DEFAULT_FONT_NAME, format->font_name) == 0)
+        && !format->hyperlink) {
+        _write_font_scheme(self, format->font_scheme);
+    }
+
+    _xml_end_tag(self->file, "font");
+}
+
+/*
+ * Write the <fonts> element.
+ */
+STATIC void
+_write_fonts(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_format *format;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("count", self->font_count);
+
+    _xml_start_tag(self->file, "fonts", &attributes);
+
+    STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
+        if (format->has_font)
+            _write_font(self, format);
+    }
+
+    _xml_end_tag(self->file, "fonts");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the default <fill> element.
+ */
+STATIC void
+_write_default_fill(lxw_styles *self, const char *pattern)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("patternType", pattern);
+
+    _xml_start_tag(self->file, "fill", NULL);
+    _xml_empty_tag(self->file, "patternFill", &attributes);
+    _xml_end_tag(self->file, "fill");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <fgColor> element.
+ */
+STATIC void
+_write_fg_color(lxw_styles *self, lxw_color_t color)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char rgb_str[ATTR_32];
+
+    _INIT_ATTRIBUTES();
+
+    __builtin_snprintf(rgb_str, ATTR_32, "FF%06X", color & LXW_COLOR_MASK);
+    _PUSH_ATTRIBUTES_STR("rgb", rgb_str);
+
+    _xml_empty_tag(self->file, "fgColor", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <bgColor> element.
+ */
+STATIC void
+_write_bg_color(lxw_styles *self, lxw_color_t color)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char rgb_str[ATTR_32];
+
+    _INIT_ATTRIBUTES();
+
+    if (color == LXW_COLOR_UNSET) {
+        _PUSH_ATTRIBUTES_STR("indexed", "64");
+    }
+    else {
+        __builtin_snprintf(rgb_str, ATTR_32, "FF%06X",
+                           color & LXW_COLOR_MASK);
+        _PUSH_ATTRIBUTES_STR("rgb", rgb_str);
+    }
+
+    _xml_empty_tag(self->file, "bgColor", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <fill> element.
+ */
+STATIC void
+_write_fill(lxw_styles *self, lxw_format *format)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    uint8_t pattern = format->pattern;
+    lxw_color_t bg_color = format->bg_color;
+    lxw_color_t fg_color = format->fg_color;
+
+    char *patterns[] = {
+        "none",
+        "solid",
+        "mediumGray",
+        "darkGray",
+        "lightGray",
+        "darkHorizontal",
+        "darkVertical",
+        "darkDown",
+        "darkUp",
+        "darkGrid",
+        "darkTrellis",
+        "lightHorizontal",
+        "lightVertical",
+        "lightDown",
+        "lightUp",
+        "lightGrid",
+        "lightTrellis",
+        "gray125",
+        "gray0625",
+    };
+
+    _INIT_ATTRIBUTES();
+
+    _xml_start_tag(self->file, "fill", NULL);
+
+    if (pattern)
+        _PUSH_ATTRIBUTES_STR("patternType", patterns[pattern]);
+
+    _xml_start_tag(self->file, "patternFill", &attributes);
+
+    if (fg_color != LXW_COLOR_UNSET)
+        _write_fg_color(self, fg_color);
+
+    _write_bg_color(self, bg_color);
+
+    _xml_end_tag(self->file, "patternFill");
+    _xml_end_tag(self->file, "fill");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <fills> element.
+ */
+STATIC void
+_write_fills(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_format *format;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("count", self->fill_count);
+
+    _xml_start_tag(self->file, "fills", &attributes);
+
+    /* Write the default fills. */
+    _write_default_fill(self, "none");
+    _write_default_fill(self, "gray125");
+
+    STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
+        if (format->has_fill)
+            _write_fill(self, format);
+    }
+
+    _xml_end_tag(self->file, "fills");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the border <color> element.
+ */
+STATIC void
+_write_border_color(lxw_styles *self, lxw_color_t color)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char rgb_str[ATTR_32];
+
+    _INIT_ATTRIBUTES();
+
+    if (color) {
+        __builtin_snprintf(rgb_str, ATTR_32, "FF%06X",
+                           color & LXW_COLOR_MASK);
+        _PUSH_ATTRIBUTES_STR("rgb", rgb_str);
+    }
+    else {
+        _PUSH_ATTRIBUTES_STR("auto", "1");
+    }
+
+    _xml_empty_tag(self->file, "color", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <border> sub elements such as <right>, <top>, etc.
+ */
+STATIC void
+_write_sub_border(lxw_styles *self, const char *type, uint8_t style,
+                  lxw_color_t color)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    char *border_styles[] = {
+        "none",
+        "thin",
+        "medium",
+        "dashed",
+        "dotted",
+        "thick",
+        "double",
+        "hair",
+        "mediumDashed",
+        "dashDot",
+        "mediumDashDot",
+        "dashDotDot",
+        "mediumDashDotDot",
+        "slantDashDot",
+    };
+
+    if (!style) {
+        _xml_empty_tag(self->file, type, NULL);
+        return;
+    }
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("style", border_styles[style]);
+
+    _xml_start_tag(self->file, type, &attributes);
+
+    _write_border_color(self, color);
+
+    _xml_end_tag(self->file, type);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <border> element.
+ */
+STATIC void
+_write_border(lxw_styles *self, lxw_format *format)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    /* Add attributes for diagonal borders. */
+    if (format->diag_type == LXW_DIAGONAL_BORDER_UP) {
+        _PUSH_ATTRIBUTES_STR("diagonalUp", "1");
+    }
+    else if (format->diag_type == LXW_DIAGONAL_BORDER_DOWN) {
+        _PUSH_ATTRIBUTES_STR("diagonalDown", "1");
+    }
+    else if (format->diag_type == LXW_DIAGONAL_BORDER_UP_DOWN) {
+        _PUSH_ATTRIBUTES_STR("diagonalUp", "1");
+        _PUSH_ATTRIBUTES_STR("diagonalDown", "1");
+    }
+
+    /* Ensure that a default diag border is set if the diag type is set. */
+    if (format->diag_type && !format->diag_border) {
+        format->diag_border = 1;
+    }
+
+    /* Write the start border tag. */
+    _xml_start_tag(self->file, "border", &attributes);
+
+    /* Write the <border> sub elements. */
+    _write_sub_border(self, "left", format->left, format->left_color);
+    _write_sub_border(self, "right", format->right, format->right_color);
+    _write_sub_border(self, "top", format->top, format->top_color);
+    _write_sub_border(self, "bottom", format->bottom, format->bottom_color);
+    _write_sub_border(self,
+                      "diagonal", format->diag_border, format->diag_color);
+
+    _xml_end_tag(self->file, "border");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <borders> element.
+ */
+STATIC void
+_write_borders(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_format *format;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("count", self->border_count);
+
+    _xml_start_tag(self->file, "borders", &attributes);
+
+    STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
+        if (format->has_border)
+            _write_border(self, format);
+    }
+
+    _xml_end_tag(self->file, "borders");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <xf> element for styles.
+ */
+STATIC void
+_write_style_xf(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("numFmtId", "0");
+    _PUSH_ATTRIBUTES_STR("fontId", "0");
+    _PUSH_ATTRIBUTES_STR("fillId", "0");
+    _PUSH_ATTRIBUTES_STR("borderId", "0");
+
+    _xml_empty_tag(self->file, "xf", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <cellStyleXfs> element.
+ */
+STATIC void
+_write_cell_style_xfs(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("count", "1");
+
+    _xml_start_tag(self->file, "cellStyleXfs", &attributes);
+    _write_style_xf(self);
+    _xml_end_tag(self->file, "cellStyleXfs");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Check if a format struct has alignment properties set and the
+ * "applyAlignment" attribute should be set.
+ */
+STATIC uint8_t
+_apply_alignment(lxw_format *format)
+{
+    return format->text_h_align != LXW_ALIGN_NONE
+        || format->text_v_align != LXW_ALIGN_NONE
+        || format->indent != 0
+        || format->rotation != 0
+        || format->text_wrap != 0
+        || format->shrink != 0 || format->reading_order != 0;
+}
+
+/*
+ * Check if a format struct has alignment properties set apart from the
+ * LXW_ALIGN_VERTICAL_BOTTOM which Excel treats as a default.
+ */
+STATIC uint8_t
+_has_alignment(lxw_format *format)
+{
+    return format->text_h_align != LXW_ALIGN_NONE
+        || !(format->text_v_align == LXW_ALIGN_NONE ||
+             format->text_v_align == LXW_ALIGN_VERTICAL_BOTTOM)
+        || format->indent != 0
+        || format->rotation != 0
+        || format->text_wrap != 0
+        || format->shrink != 0 || format->reading_order != 0;
+}
+
+/*
+ * Write the <alignment> element.
+ */
+STATIC void
+_write_alignment(lxw_styles *self, lxw_format *format)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    int16_t rotation = format->rotation;
+
+    _INIT_ATTRIBUTES();
+
+    /* Indent is only allowed for horizontal left, right and distributed. */
+    /* If it is defined for any other alignment or no alignment has been  */
+    /* set then default to left alignment. */
+    if (format->indent
+        && format->text_h_align != LXW_ALIGN_LEFT
+        && format->text_h_align != LXW_ALIGN_RIGHT
+        && format->text_h_align != LXW_ALIGN_DISTRIBUTED) {
+        format->text_h_align = LXW_ALIGN_LEFT;
+    }
+
+    /* Check for properties that are mutually exclusive. */
+    if (format->text_wrap)
+        format->shrink = 0;
+
+    if (format->text_h_align == LXW_ALIGN_FILL)
+        format->shrink = 0;
+
+    if (format->text_h_align == LXW_ALIGN_JUSTIFY)
+        format->shrink = 0;
+
+    if (format->text_h_align == LXW_ALIGN_DISTRIBUTED)
+        format->shrink = 0;
+
+    if (format->text_h_align != LXW_ALIGN_DISTRIBUTED)
+        format->just_distrib = 0;
+
+    if (format->indent)
+        format->just_distrib = 0;
+
+    if (format->text_h_align == LXW_ALIGN_LEFT)
+        _PUSH_ATTRIBUTES_STR("horizontal", "left");
+
+    if (format->text_h_align == LXW_ALIGN_CENTER)
+        _PUSH_ATTRIBUTES_STR("horizontal", "center");
+
+    if (format->text_h_align == LXW_ALIGN_RIGHT)
+        _PUSH_ATTRIBUTES_STR("horizontal", "right");
+
+    if (format->text_h_align == LXW_ALIGN_FILL)
+        _PUSH_ATTRIBUTES_STR("horizontal", "fill");
+
+    if (format->text_h_align == LXW_ALIGN_JUSTIFY)
+        _PUSH_ATTRIBUTES_STR("horizontal", "justify");
+
+    if (format->text_h_align == LXW_ALIGN_CENTER_ACROSS)
+        _PUSH_ATTRIBUTES_STR("horizontal", "centerContinuous");
+
+    if (format->text_h_align == LXW_ALIGN_DISTRIBUTED)
+        _PUSH_ATTRIBUTES_STR("horizontal", "distributed");
+
+    if (format->just_distrib)
+        _PUSH_ATTRIBUTES_STR("justifyLastLine", "1");
+
+    if (format->text_v_align == LXW_ALIGN_VERTICAL_TOP)
+        _PUSH_ATTRIBUTES_STR("vertical", "top");
+
+    if (format->text_v_align == LXW_ALIGN_VERTICAL_CENTER)
+        _PUSH_ATTRIBUTES_STR("vertical", "center");
+
+    if (format->text_v_align == LXW_ALIGN_VERTICAL_JUSTIFY)
+        _PUSH_ATTRIBUTES_STR("vertical", "justify");
+
+    if (format->text_v_align == LXW_ALIGN_VERTICAL_DISTRIBUTED)
+        _PUSH_ATTRIBUTES_STR("vertical", "distributed");
+
+    if (format->indent)
+        _PUSH_ATTRIBUTES_INT("indent", format->indent);
+
+    /* Map rotation to Excel values. */
+    if (rotation) {
+        if (rotation == 270)
+            rotation = 255;
+        else if (rotation < 0)
+            rotation = -rotation + 90;
+
+        _PUSH_ATTRIBUTES_INT("textRotation", rotation);
+    }
+
+    if (format->text_wrap)
+        _PUSH_ATTRIBUTES_STR("wrapText", "1");
+
+    if (format->shrink)
+        _PUSH_ATTRIBUTES_STR("shrinkToFit", "1");
+
+    if (format->reading_order == 1)
+        _PUSH_ATTRIBUTES_STR("readingOrder", "1");
+
+    if (format->reading_order == 2)
+        _PUSH_ATTRIBUTES_STR("readingOrder", "2");
+
+    if (!STAILQ_EMPTY(&attributes))
+        _xml_empty_tag(self->file, "alignment", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <protection> element.
+ */
+STATIC void
+_write_protection(lxw_styles *self, lxw_format *format)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    if (!format->locked)
+        _PUSH_ATTRIBUTES_STR("locked", "0");
+
+    if (format->hidden)
+        _PUSH_ATTRIBUTES_STR("hidden", "1");
+
+    _xml_empty_tag(self->file, "protection", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <xf> element.
+ */
+STATIC void
+_write_xf(lxw_styles *self, lxw_format *format)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    uint8_t has_protection = (!format->locked) | format->hidden;
+    uint8_t has_alignment = _has_alignment(format);
+    uint8_t apply_alignment = _apply_alignment(format);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("numFmtId", format->num_format_index);
+    _PUSH_ATTRIBUTES_INT("fontId", format->font_index);
+    _PUSH_ATTRIBUTES_INT("fillId", format->fill_index);
+    _PUSH_ATTRIBUTES_INT("borderId", format->border_index);
+    _PUSH_ATTRIBUTES_STR("xfId", "0");
+
+    if (format->num_format_index > 0)
+        _PUSH_ATTRIBUTES_STR("applyNumberFormat", "1");
+
+    /* Add applyFont attribute if XF format uses a font element. */
+    if (format->font_index > 0)
+        _PUSH_ATTRIBUTES_STR("applyFont", "1");
+
+    /* Add applyFill attribute if XF format uses a fill element. */
+    if (format->fill_index > 0)
+        _PUSH_ATTRIBUTES_STR("applyFill", "1");
+
+    /* Add applyBorder attribute if XF format uses a border element. */
+    if (format->border_index > 0)
+        _PUSH_ATTRIBUTES_STR("applyBorder", "1");
+
+    /* We can also have applyAlignment without a sub-element. */
+    if (apply_alignment)
+        _PUSH_ATTRIBUTES_STR("applyAlignment", "1");
+
+    if (has_protection)
+        _PUSH_ATTRIBUTES_STR("applyProtection", "1");
+
+    /* Write XF with sub-elements if required. */
+    if (has_alignment || has_protection) {
+        _xml_start_tag(self->file, "xf", &attributes);
+
+        if (has_alignment)
+            _write_alignment(self, format);
+
+        if (has_protection)
+            _write_protection(self, format);
+
+        _xml_end_tag(self->file, "xf");
+    }
+    else {
+        _xml_empty_tag(self->file, "xf", &attributes);
+    }
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <cellXfs> element.
+ */
+STATIC void
+_write_cell_xfs(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    lxw_format *format;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("count", self->xf_count);
+
+    _xml_start_tag(self->file, "cellXfs", &attributes);
+
+    STAILQ_FOREACH(format, self->xf_formats, list_pointers) {
+        _write_xf(self, format);
+    }
+
+    _xml_end_tag(self->file, "cellXfs");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <cellStyle> element.
+ */
+STATIC void
+_write_cell_style(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("name", "Normal");
+    _PUSH_ATTRIBUTES_STR("xfId", "0");
+    _PUSH_ATTRIBUTES_STR("builtinId", "0");
+
+    _xml_empty_tag(self->file, "cellStyle", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <cellStyles> element.
+ */
+STATIC void
+_write_cell_styles(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("count", "1");
+
+    _xml_start_tag(self->file, "cellStyles", &attributes);
+    _write_cell_style(self);
+    _xml_end_tag(self->file, "cellStyles");
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <dxfs> element.
+ */
+STATIC void
+_write_dxfs(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("count", "0");
+
+    _xml_empty_tag(self->file, "dxfs", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <tableStyles> element.
+ */
+STATIC void
+_write_table_styles(lxw_styles *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("count", "0");
+    _PUSH_ATTRIBUTES_STR("defaultTableStyle", "TableStyleMedium9");
+    _PUSH_ATTRIBUTES_STR("defaultPivotStyle", "PivotStyleLight16");
+
+    _xml_empty_tag(self->file, "tableStyles", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_styles_assemble_xml_file(lxw_styles *self)
+{
+    /* Write the XML declaration. */
+    _styles_xml_declaration(self);
+
+    /* Add the style sheet. */
+    _write_style_sheet(self);
+
+    /* Write the number formats. */
+    _write_num_fmts(self);
+
+    /* Write the fonts. */
+    _write_fonts(self);
+
+    /* Write the fills. */
+    _write_fills(self);
+
+    /* Write the borders element. */
+    _write_borders(self);
+
+    /* Write the cellStyleXfs element. */
+    _write_cell_style_xfs(self);
+
+    /* Write the cellXfs element. */
+    _write_cell_xfs(self);
+
+    /* Write the cellStyles element. */
+    _write_cell_styles(self);
+
+    /* Write the dxfs element. */
+    _write_dxfs(self);
+
+    /* Write the tableStyles element. */
+    _write_table_styles(self);
+
+    /* Write the colors element. */
+    /* _write_colors(self); */
+
+    /* Close the style sheet tag. */
+    _xml_end_tag(self->file, "styleSheet");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
diff --git a/src/theme.c b/src/theme.c
new file mode 100644
index 00000000..65714843
--- /dev/null
+++ b/src/theme.c
@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * theme - A library for creating Excel XLSX theme files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/theme.h"
+#include "xlsxwriter/utility.h"
+
+#pragma GCC diagnostic ignored "-Woverlength-strings"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new theme object.
+ */
+lxw_theme *
+_new_theme()
+{
+    lxw_theme *theme = calloc(1, sizeof(lxw_theme));
+    GOTO_LABEL_ON_MEM_ERROR(theme, mem_error);
+
+    return theme;
+
+mem_error:
+    _free_theme(theme);
+    return NULL;
+}
+
+/*
+ * Free a theme object.
+ */
+void
+_free_theme(lxw_theme *theme)
+{
+    if (!theme)
+        return;
+
+    free(theme);
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/* This library isn't a xmlwriter. */
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_theme_assemble_xml_file(lxw_theme *self)
+{
+    fputs(THEME_DATA, self->file);
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
diff --git a/src/utility.c b/src/utility.c
new file mode 100644
index 00000000..d34d1cb6
--- /dev/null
+++ b/src/utility.c
@@ -0,0 +1,248 @@
+/*****************************************************************************
+ * utility - Utility functions for libxlsxwriter.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include "xlsxwriter/utility.h"
+
+/*
+ * Convert Excel A-XFD style column name to zero based number.
+ */
+void
+_xl_col_to_name(char col_name[], int col_num, uint8_t absolute)
+{
+    uint8_t pos = 0;
+    uint8_t len;
+    uint8_t i;
+
+    /* Change from 0 index to 1 index. */
+    col_num++;
+
+    /* Convert the column number to a string in reverse order. */
+    while (col_num) {
+
+        /* Get the remainder in base 26. */
+        int remainder = col_num % 26;
+
+        if (remainder == 0)
+            remainder = 26;
+
+        /* Convert the remainder value to a character. */
+        col_name[pos++] = 'A' + remainder - 1;
+        col_name[pos] = '\0';
+
+        /* Get the next order of magnitude. */
+        col_num = (col_num - 1) / 26;
+    }
+
+    if (absolute) {
+        col_name[pos] = '$';
+        col_name[pos + 1] = '\0';
+    }
+
+    /* Reverse the column name string. */
+    len = strlen(col_name);
+    for (i = 0; i < (len / 2); i++) {
+        char tmp = col_name[i];
+        col_name[i] = col_name[len - i - 1];
+        col_name[len - i - 1] = tmp;
+    }
+}
+
+/*
+ * Convert zero indexed row and column to an Excel style A1 cell reference.
+ */
+void
+xl_rowcol_to_cell(char *cell_name, int row, int col)
+{
+    uint8_t pos;
+
+    /* Add the column to the cell. */
+    _xl_col_to_name(cell_name, col, 0);
+
+    /* Get the end of the cell. */
+    pos = strlen(cell_name);
+
+    /* Add the row to the cell. */
+    sprintf(&cell_name[pos], "%d", ++row);
+}
+
+/*
+ * Convert zero indexed row and column to an Excel style $A$1 cell with
+ * an absolute reference.
+ */
+void
+xl_rowcol_to_cell_abs(char *cell_name,
+                      int row, int col, uint8_t abs_row, uint8_t abs_col)
+{
+    uint8_t pos;
+
+    /* Add the column to the cell. */
+    _xl_col_to_name(cell_name, col, abs_col);
+
+    /* Get the end of the cell. */
+    pos = strlen(cell_name);
+
+    if (abs_row)
+        cell_name[pos++] = '$';
+
+    /* Add the row to the cell. */
+    sprintf(&cell_name[pos], "%d", ++row);
+}
+
+/*
+ * Convert zero indexed row and column pair to an Excel style A1:C5
+ * range reference.
+ */
+void
+xl_range(char *range,
+         int first_row, int first_col, int last_row, int last_col)
+{
+    uint8_t pos;
+
+    /* Add the first cell to the range. */
+    xl_rowcol_to_cell(range, first_row, first_col);
+
+    /* If the start and end cells are the same just return a single cell. */
+    if (first_row == last_row && first_col == last_col)
+        return;
+
+    /* Get the end of the cell. */
+    pos = strlen(range);
+
+    /* Add the range separator. */
+    range[pos++] = ':';
+
+    /* Add the first cell to the range. */
+    xl_rowcol_to_cell(&range[pos], last_row, last_col);
+}
+
+/*
+ * Convert zero indexed row and column pair to an Excel style A1:C5
+ * range reference with abosolute values.
+ */
+void
+xl_range_abs(char *range,
+             int first_row, int first_col, int last_row, int last_col)
+{
+    uint8_t pos;
+
+    /* Add the first cell to the range. */
+    xl_rowcol_to_cell_abs(range, first_row, first_col, 1, 1);
+
+    /* If the start and end cells are the same just return a single cell. */
+    if (first_row == last_row && first_col == last_col)
+        return;
+
+    /* Get the end of the cell. */
+    pos = strlen(range);
+
+    /* Add the range separator. */
+    range[pos++] = ':';
+
+    /* Add the first cell to the range. */
+    xl_rowcol_to_cell_abs(&range[pos], last_row, last_col, 1, 1);
+}
+
+/*
+ * Convert a lxw_datetime struct to an Excel serial date.
+ */
+double
+_datetime_to_excel_date(lxw_datetime *datetime, uint8_t date_1904)
+{
+    int year = datetime->year;
+    int month = datetime->month;
+    int day = datetime->day;
+    int hour = datetime->hour;
+    int min = datetime->min;
+    double sec = datetime->sec;
+    double seconds;
+    int epoch = date_1904 ? 1904 : 1900;
+    int offset = date_1904 ? 4 : 0;
+    int norm = 300;
+    int range;
+    /* Set month days and check for leap year. */
+    int mdays[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+    int leap = 0;
+    int days = 0;
+    int i;
+
+    /* For times without dates set the default date for the epoch. */
+    if (!year) {
+        if (!date_1904) {
+            year = 1899;
+            month = 12;
+            day = 31;
+        }
+        else {
+            year = 1904;
+            month = 1;
+            day = 1;
+        }
+    }
+
+    /* Convert the Excel seconds to a fraction of the seconds in 24 hours. */
+    seconds = (hour * 60 * 60 + min * 60 + sec) / (24 * 60 * 60.0);
+
+    /* Special cases for Excel dates in the 1900 epoch. */
+    if (!date_1904) {
+        /* Excel 1900 epoch. */
+        if (year == 1899 && month == 12 && day == 31)
+            return seconds;
+
+        /* Excel 1900 epoch. */
+        if (year == 1900 && month == 1 && day == 0)
+            return seconds;
+
+        /* Excel false leapday */
+        if (year == 1900 && month == 2 && day == 29)
+            return 60 + seconds;
+    }
+
+    /* We calculate the date by calculating the number of days since the */
+    /* epoch and adjust for the number of leap days. We calculate the */
+    /* number of leap days by normalising the year in relation to the */
+    /* epoch. Thus the year 2000 becomes 100 for 4-year and 100-year */
+    /* leapdays and 400 for 400-year leapdays. */
+    range = year - epoch;
+
+    if (year % 4 == 0 && (year % 100 > 0 || year % 400 == 0)) {
+        leap = 1;
+        mdays[2] = 29;
+    }
+
+    /*
+     * Caclcluate the serial date by accumulating the number of days
+     * since the epoch.
+     */
+
+    /* Add days for previous months. */
+    for (i = 0; i < month; i++) {
+        days += mdays[i];
+    }
+    /* Add days for current month. */
+    days += day;
+    /* Add days for all previous years.  */
+    days += range * 365;
+    /* Add 4 year leapdays. */
+    days += (range) / 4;
+    /* Remove 100 year leapdays. */
+    days -= (range + offset) / 100;
+    /* Add 400 year leapdays. */
+    days += (range + offset + norm) / 400;
+    /* Removee leap days already counted. */
+    days -= leap;
+
+    /* Adjust for Excel erroneously treating 1900 as a leap year. */
+    if (!date_1904 && days > 59)
+        days++;
+
+    return days + seconds;
+}
diff --git a/src/workbook.c b/src/workbook.c
new file mode 100644
index 00000000..6d5bff44
--- /dev/null
+++ b/src/workbook.c
@@ -0,0 +1,707 @@
+/*****************************************************************************
+ * workbook - A library for creating Excel XLSX workbook files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/workbook.h"
+#include "xlsxwriter/utility.h"
+#include "xlsxwriter/packager.h"
+#include "xlsxwriter/hash_table.h"
+
+/*
+ * Forward declarations.
+ */
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Free a workbook object.
+ */
+void
+_free_workbook(lxw_workbook *workbook)
+{
+    lxw_worksheet *worksheet;
+    lxw_format *format;
+
+    if (!workbook)
+        return;
+
+    if (workbook->properties) {
+        free(workbook->properties->title);
+        free(workbook->properties->subject);
+        free(workbook->properties->author);
+        free(workbook->properties->manager);
+        free(workbook->properties->company);
+        free(workbook->properties->category);
+        free(workbook->properties->keywords);
+        free(workbook->properties->comments);
+        free(workbook->properties->status);
+    }
+
+    free(workbook->properties);
+
+    /* Free the worksheets in the workbook. */
+    while (!STAILQ_EMPTY(workbook->worksheets)) {
+        worksheet = STAILQ_FIRST(workbook->worksheets);
+        STAILQ_REMOVE_HEAD(workbook->worksheets, list_pointers);
+        _free_worksheet(worksheet);
+    }
+
+    /* Free the formats in the workbook. */
+    while (!STAILQ_EMPTY(workbook->formats)) {
+        format = STAILQ_FIRST(workbook->formats);
+        STAILQ_REMOVE_HEAD(workbook->formats, list_pointers);
+        _free_format(format);
+    }
+
+    _free_lxw_hash(workbook->xf_format_indices);
+    _free_sst(workbook->sst);
+    free(workbook->worksheets);
+    free(workbook->formats);
+    free(workbook);
+}
+
+/*
+ * Iterate through the XF Format objects and give them an index to non-default
+ * font elements.
+ */
+STATIC void
+_prepare_fonts(lxw_workbook *self)
+{
+
+    lxw_hash_table *fonts = _new_lxw_hash(128, 1, 1);
+    lxw_hash_element *hash_element;
+    lxw_format *format;
+    uint16_t index = 0;
+
+    STAILQ_FOREACH(format, self->formats, list_pointers) {
+        lxw_font *key = _get_font_key(format);
+
+        if (key) {
+            /* Look up the format in the hash table. */
+            hash_element = _hash_key_exists(fonts, key, sizeof(lxw_font));
+
+            if (hash_element) {
+                /* Font has already been used. */
+                format->font_index = *(uint16_t *) hash_element->value;
+                format->has_font = LXW_FALSE;
+                free(key);
+            }
+            else {
+                /* This is a new font. */
+                uint16_t *font_index = calloc(1, sizeof(uint16_t));
+                *font_index = index;
+                format->font_index = index;
+                format->has_font = 1;
+                _insert_hash_element(fonts, key, font_index,
+                                     sizeof(lxw_font));
+                index++;
+            }
+        }
+    }
+
+    _free_lxw_hash(fonts);
+
+    self->font_count = index;
+}
+
+/*
+ * Iterate through the XF Format objects and give them an index to non-default
+ * border elements.
+ */
+STATIC void
+_prepare_borders(lxw_workbook *self)
+{
+
+    lxw_hash_table *borders = _new_lxw_hash(128, 1, 1);
+    lxw_hash_element *hash_element;
+    lxw_format *format;
+    uint16_t index = 0;
+
+    STAILQ_FOREACH(format, self->formats, list_pointers) {
+        lxw_border *key = _get_border_key(format);
+
+        if (key) {
+            /* Look up the format in the hash table. */
+            hash_element = _hash_key_exists(borders, key, sizeof(lxw_border));
+
+            if (hash_element) {
+                /* Border has already been used. */
+                format->border_index = *(uint16_t *) hash_element->value;
+                format->has_border = LXW_FALSE;
+                free(key);
+            }
+            else {
+                /* This is a new border. */
+                uint16_t *border_index = calloc(1, sizeof(uint16_t));
+                *border_index = index;
+                format->border_index = index;
+                format->has_border = 1;
+                _insert_hash_element(borders, key, border_index,
+                                     sizeof(lxw_border));
+                index++;
+            }
+        }
+    }
+
+    _free_lxw_hash(borders);
+
+    self->border_count = index;
+}
+
+/*
+ * Iterate through the XF Format objects and give them an index to non-default
+ * fill elements.
+ */
+STATIC void
+_prepare_fills(lxw_workbook *self)
+{
+
+    lxw_hash_table *fills = _new_lxw_hash(128, 1, 1);
+    lxw_hash_element *hash_element;
+    lxw_format *format;
+    uint16_t index = 2;
+    lxw_fill *default_fill_1 = calloc(1, sizeof(lxw_fill));
+    lxw_fill *default_fill_2 = calloc(1, sizeof(lxw_fill));
+    uint16_t *fill_index1 = calloc(1, sizeof(uint16_t));
+    uint16_t *fill_index2 = calloc(1, sizeof(uint16_t));
+
+    if (!default_fill_1 || !default_fill_2 || !fill_index1 || !fill_index2) {
+        MEM_ERROR();
+        return;
+    }
+
+    /* Add the default fills. */
+    default_fill_1->pattern = LXW_PATTERN_NONE;
+    default_fill_1->fg_color = LXW_COLOR_UNSET;
+    default_fill_1->bg_color = LXW_COLOR_UNSET;
+    *fill_index1 = 0;
+    _insert_hash_element(fills, default_fill_1, fill_index1,
+                         sizeof(lxw_fill));
+
+    default_fill_2->pattern = LXW_PATTERN_GRAY_125;
+    default_fill_2->fg_color = LXW_COLOR_UNSET;
+    default_fill_2->bg_color = LXW_COLOR_UNSET;
+    *fill_index2 = 1;
+    _insert_hash_element(fills, default_fill_2, fill_index2,
+                         sizeof(lxw_fill));
+
+    STAILQ_FOREACH(format, self->formats, list_pointers) {
+        lxw_fill *key = _get_fill_key(format);
+
+        /* The following logical statements jointly take care of special */
+        /* cases in relation to cell colours and patterns:               */
+        /* 1. For a solid fill (pattern == 1) Excel reverses the role of */
+        /*    foreground and background colours, and                     */
+        /* 2. If the user specifies a foreground or background colour    */
+        /*    withouth a pattern they probably wanted a solid fill, so   */
+        /*    we fill in the defaults.                                   */
+        if (format->pattern == LXW_PATTERN_SOLID
+            && format->bg_color != LXW_COLOR_UNSET
+            && format->fg_color != LXW_COLOR_UNSET) {
+            lxw_color_t tmp = format->fg_color;
+            format->fg_color = format->bg_color;
+            format->bg_color = tmp;
+        }
+
+        if (format->pattern <= LXW_PATTERN_SOLID
+            && format->bg_color != LXW_COLOR_UNSET
+            && format->fg_color == LXW_COLOR_UNSET) {
+            format->fg_color = format->bg_color;
+            format->bg_color = LXW_COLOR_UNSET;
+            format->pattern = LXW_PATTERN_SOLID;
+        }
+
+        if (format->pattern <= LXW_PATTERN_SOLID
+            && format->bg_color == LXW_COLOR_UNSET
+            && format->fg_color != LXW_COLOR_UNSET) {
+            format->bg_color = LXW_COLOR_UNSET;
+            format->pattern = LXW_PATTERN_SOLID;
+        }
+
+        if (key) {
+            /* Look up the format in the hash table. */
+            hash_element = _hash_key_exists(fills, key, sizeof(lxw_fill));
+
+            if (hash_element) {
+                /* Fill has already been used. */
+                format->fill_index = *(uint16_t *) hash_element->value;
+                format->has_fill = LXW_FALSE;
+                free(key);
+            }
+            else {
+                /* This is a new fill. */
+                uint16_t *fill_index = calloc(1, sizeof(uint16_t));
+                *fill_index = index;
+                format->fill_index = index;
+                format->has_fill = 1;
+                _insert_hash_element(fills, key, fill_index,
+                                     sizeof(lxw_fill));
+                index++;
+            }
+        }
+    }
+
+    _free_lxw_hash(fills);
+
+    self->fill_count = index;
+}
+
+/*
+ * Iterate through the XF Format objects and give them an index to non-default
+ * number format elements. Note, user defined records start from index 0xA4.
+ */
+STATIC void
+_prepare_num_formats(lxw_workbook *self)
+{
+
+    lxw_hash_table *num_formats = _new_lxw_hash(128, 0, 1);
+    lxw_hash_element *hash_element;
+    lxw_format *format;
+    uint16_t index = 0xA4;
+    uint16_t num_format_count = 0;
+    char *num_format;
+    uint16_t *num_format_index;
+
+    STAILQ_FOREACH(format, self->formats, list_pointers) {
+
+        /* Format already has a number format index. */
+        if (format->num_format_index)
+            continue;
+
+        /* Check if there is a user defined number format string. */
+        num_format = format->num_format;
+
+        if (strlen(num_format)) {
+            /* Look up the num_format in the hash table. */
+            hash_element = _hash_key_exists(num_formats, num_format,
+                                            strlen(num_format));
+
+            if (hash_element) {
+                /* Num_Format has already been used. */
+                format->num_format_index = *(uint16_t *) hash_element->value;
+            }
+            else {
+                /* This is a new num_format. */
+                num_format_index = calloc(1, sizeof(uint16_t));
+                *num_format_index = index;
+                format->num_format_index = index;
+                _insert_hash_element(num_formats, num_format,
+                                     num_format_index, strlen(num_format));
+                index++;
+                num_format_count++;
+            }
+        }
+    }
+
+    _free_lxw_hash(num_formats);
+
+    self->num_format_count = num_format_count;
+}
+
+/*
+ * Prepare workbook and sub-objects for writing.
+ */
+STATIC void
+_prepare_workbook(lxw_workbook *self)
+{
+    lxw_worksheet *worksheet;
+
+    /* Add a default worksheet if non have been added. */
+    if (!self->num_sheets)
+        workbook_add_worksheet(self, NULL);
+
+    /* Ensure that at least one worksheet has been selected. */
+    if (self->active_tab == 0) {
+        worksheet = STAILQ_FIRST(self->worksheets);
+        worksheet->selected = 1;
+        worksheet->hidden = 0;
+    }
+
+    /* Set the active sheet. */
+    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
+        if (worksheet->index == self->active_tab)
+            worksheet->active = 1;
+    }
+
+    /* Set the font index for the format objects. */
+    _prepare_fonts(self);
+
+    /* Set the number format index for the format objects. */
+    _prepare_num_formats(self);
+
+    /* Set the border index for the format objects. */
+    _prepare_borders(self);
+
+    /* Set the fill index for the format objects. */
+    _prepare_fills(self);
+
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_workbook_xml_declaration(lxw_workbook *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <workbook> element.
+ */
+STATIC void
+_write_workbook(lxw_workbook *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char xmlns[] = "http://schemas.openxmlformats.org"
+        "/spreadsheetml/2006/main";
+    char xmlns_r[] = "http://schemas.openxmlformats.org"
+        "/officeDocument/2006/relationships";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", xmlns);
+    _PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
+
+    _xml_start_tag(self->file, "workbook", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <fileVersion> element.
+ */
+STATIC void
+_write_file_version(lxw_workbook *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("appName", "xl");
+    _PUSH_ATTRIBUTES_STR("lastEdited", "4");
+    _PUSH_ATTRIBUTES_STR("lowestEdited", "4");
+    _PUSH_ATTRIBUTES_STR("rupBuild", "4505");
+
+    _xml_empty_tag(self->file, "fileVersion", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <workbookPr> element.
+ */
+STATIC void
+_write_workbook_pr(lxw_workbook *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("defaultThemeVersion", "124226");
+
+    _xml_empty_tag(self->file, "workbookPr", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <workbookView> element.
+ */
+STATIC void
+_write_workbook_view(lxw_workbook *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xWindow", "240");
+    _PUSH_ATTRIBUTES_STR("yWindow", "15");
+    _PUSH_ATTRIBUTES_STR("windowWidth", "16095");
+    _PUSH_ATTRIBUTES_STR("windowHeight", "9660");
+
+    if (self->first_sheet)
+        _PUSH_ATTRIBUTES_INT("firstSheet", self->first_sheet);
+
+    if (self->active_tab)
+        _PUSH_ATTRIBUTES_INT("activeTab", self->active_tab);
+
+    _xml_empty_tag(self->file, "workbookView", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <bookViews> element.
+ */
+STATIC void
+_write_book_views(lxw_workbook *self)
+{
+    _xml_start_tag(self->file, "bookViews", NULL);
+
+    _write_workbook_view(self);
+
+    _xml_end_tag(self->file, "bookViews");
+}
+
+/*
+ * Write the <sheet> element.
+ */
+STATIC void
+_write_sheet(lxw_workbook *self, const char *name, uint32_t sheet_id,
+             uint8_t hidden)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char r_id[MAX_ATTRIBUTE_LENGTH] = "rId1";
+
+    __builtin_snprintf(r_id, ATTR_32, "rId%d", sheet_id);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("name", name);
+    _PUSH_ATTRIBUTES_INT("sheetId", sheet_id);
+
+    if (hidden)
+        _PUSH_ATTRIBUTES_STR("state", "hidden");
+
+    _PUSH_ATTRIBUTES_STR("r:id", r_id);
+
+    _xml_empty_tag(self->file, "sheet", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <sheets> element.
+ */
+STATIC void
+_write_sheets(lxw_workbook *self)
+{
+    lxw_worksheet *worksheet;
+
+    _xml_start_tag(self->file, "sheets", NULL);
+
+    STAILQ_FOREACH(worksheet, self->worksheets, list_pointers) {
+        _write_sheet(self, worksheet->name, worksheet->index + 1,
+                     worksheet->hidden);
+    }
+
+    _xml_end_tag(self->file, "sheets");
+}
+
+/*
+ * Write the <calcPr> element.
+ */
+STATIC void
+_write_calc_pr(lxw_workbook *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("calcId", "124519");
+    _PUSH_ATTRIBUTES_STR("fullCalcOnLoad", "1");
+
+    _xml_empty_tag(self->file, "calcPr", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_workbook_assemble_xml_file(lxw_workbook *self)
+{
+    /* Write the XML declaration. */
+    _workbook_xml_declaration(self);
+
+    /* Write the root workbook element. */
+    _write_workbook(self);
+
+    /* Write the XLSX file version. */
+    _write_file_version(self);
+
+    /* Write the workbook properties. */
+    _write_workbook_pr(self);
+
+    /* Write the workbook view properties. */
+    _write_book_views(self);
+
+    /* Write the worksheet names and ids. */
+    _write_sheets(self);
+
+    /* Write the workbook calculation properties. */
+    _write_calc_pr(self);
+
+    /* Close the workbook tag. */
+    _xml_end_tag(self->file, "workbook");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new workbook object.
+ */
+lxw_workbook *
+new_workbook(const char *filename)
+{
+    lxw_format *format;
+    lxw_workbook *workbook;
+
+    /* Create the workbook object. */
+    workbook = calloc(1, sizeof(lxw_workbook));
+    GOTO_LABEL_ON_MEM_ERROR(workbook, mem_error);
+    workbook->filename = filename;
+
+    /* Add the worksheets list. */
+    workbook->worksheets = calloc(1, sizeof(struct lxw_worksheets));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->worksheets, mem_error);
+    STAILQ_INIT(workbook->worksheets);
+
+    /* Add the formats list. */
+    workbook->formats = calloc(1, sizeof(struct lxw_formats));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->formats, mem_error);
+    STAILQ_INIT(workbook->formats);
+
+    /* Add the shared strings table. */
+    workbook->sst = _new_sst();
+    GOTO_LABEL_ON_MEM_ERROR(workbook->sst, mem_error);
+
+    /* Add the default workbook properties. */
+    workbook->properties = calloc(1, sizeof(lxw_doc_properties));
+    GOTO_LABEL_ON_MEM_ERROR(workbook->properties, mem_error);
+
+    /* Add a hash table to track format indices. */
+    workbook->xf_format_indices = _new_lxw_hash(128, 1, 0);
+    GOTO_LABEL_ON_MEM_ERROR(workbook->xf_format_indices, mem_error);
+
+    /* Add the default cell format. */
+    format = workbook_add_format(workbook);
+    GOTO_LABEL_ON_MEM_ERROR(format, mem_error);
+
+    /* Initialise its index. */
+    _get_xf_index(format);
+
+    return workbook;
+
+mem_error:
+    _free_workbook(workbook);
+    return NULL;
+}
+
+/*
+ * Add a new worksheet to the Excel workbook.
+ */
+lxw_worksheet *
+workbook_add_worksheet(lxw_workbook *self, const char *sheetname)
+{
+    lxw_worksheet *worksheet;
+    lxw_worksheet_init_data init_data;
+    char *new_name = NULL;
+
+    if (sheetname) {
+        /* Use the user supplied name. */
+        if (strlen(sheetname) > XL_SHEETNAME_MAX)
+            return NULL;
+        else
+            init_data.name = __builtin_strdup(sheetname);
+    }
+    else {
+        /* Use the default SheetN name. */
+        new_name = malloc(LXW_SHEETNAME_LEN);
+        RETURN_ON_MEM_ERROR(new_name, NULL);
+        __builtin_snprintf(new_name, LXW_SHEETNAME_LEN, "Sheet%d",
+                           self->num_sheets + 1);
+        init_data.name = new_name;
+    }
+
+    init_data.hidden = 0;
+    init_data.index = self->num_sheets;
+    init_data.sst = self->sst;
+
+    /* Create a new worksheet object. */
+    worksheet = _new_worksheet(&init_data);
+
+    if (worksheet) {
+        self->num_sheets++;
+        STAILQ_INSERT_TAIL(self->worksheets, worksheet, list_pointers);
+    }
+    else {
+        free(new_name);
+    }
+
+    return worksheet;
+}
+
+/*
+ * Add a new format to the Excel workbook.
+ */
+lxw_format *
+workbook_add_format(lxw_workbook *self)
+{
+    /* Create a new format object. */
+    lxw_format *format = _new_format();
+
+    format->xf_format_indices = self->xf_format_indices;
+    format->num_xf_formats = &self->num_xf_formats;
+
+    if (format)
+        STAILQ_INSERT_TAIL(self->formats, format, list_pointers);
+
+    return format;
+}
+
+/*
+ * Call finalisation code and close file.
+ */
+uint8_t
+workbook_close(lxw_workbook *self)
+{
+    lxw_packager *packager;
+    uint8_t error = 0;
+
+    /* Prepare workbook and sub-objects for writing. */
+    _prepare_workbook(self);
+
+    packager = _new_packager(self->filename);
+    GOTO_LABEL_ON_MEM_ERROR(packager, mem_error);
+
+    packager->workbook = self;
+
+    error = _create_package(packager);
+
+    _free_packager(packager);
+    _free_workbook(self);
+
+    return error;
+
+mem_error:
+    return 1;
+}
diff --git a/src/worksheet.c b/src/worksheet.c
new file mode 100644
index 00000000..619c8418
--- /dev/null
+++ b/src/worksheet.c
@@ -0,0 +1,904 @@
+/*****************************************************************************
+ * worksheet - A library for creating Excel XLSX worksheet files.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include "xlsxwriter/xmlwriter.h"
+#include "xlsxwriter/worksheet.h"
+#include "xlsxwriter/format.h"
+#include "xlsxwriter/utility.h"
+
+#define XL_ROW_MAX 1048576
+#define XL_COL_MAX 16384
+#define XL_STR_MAX 32767
+
+/*
+ * Forward declarations.
+ */
+STATIC void _write_rows(lxw_worksheet *self);
+
+/*****************************************************************************
+ *
+ * Private functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Create a new worksheet object.
+ */
+lxw_worksheet *
+_new_worksheet(lxw_worksheet_init_data *init_data)
+{
+    lxw_worksheet *worksheet = calloc(1, sizeof(lxw_worksheet));
+    GOTO_LABEL_ON_MEM_ERROR(worksheet, mem_error);
+
+    worksheet->table = calloc(1, sizeof(struct lxw_table_rows));
+    GOTO_LABEL_ON_MEM_ERROR(worksheet->table, mem_error);
+
+    TAILQ_INIT(worksheet->table);
+
+    worksheet->file = NULL;
+    worksheet->dim_rowmax = 0;
+    worksheet->dim_colmax = 0;
+    worksheet->dim_rowmin = XL_ROW_MAX;
+    worksheet->dim_colmin = XL_COL_MAX;
+
+    if (init_data) {
+        worksheet->name = init_data->name;
+        worksheet->index = init_data->index;
+        worksheet->hidden = init_data->hidden;
+        worksheet->sst = init_data->sst;
+    }
+
+    return worksheet;
+
+mem_error:
+    _free_worksheet(worksheet);
+    return NULL;
+}
+
+/*
+ * Free a worksheet object.
+ */
+void
+_free_worksheet(lxw_worksheet *worksheet)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+
+    if (!worksheet)
+        return;
+
+    if (worksheet->table) {
+
+        while (!TAILQ_EMPTY(worksheet->table)) {
+            row = TAILQ_FIRST(worksheet->table);
+
+            while (!TAILQ_EMPTY(row->cells)) {
+                cell = TAILQ_FIRST(row->cells);
+                TAILQ_REMOVE(row->cells, cell, list_pointers);
+                if (cell->type == FORMULA_CELL) {
+                    free(cell->u.formula);
+                    /* free(cell->formula_result.string); */
+                }
+                free(cell);
+            }
+            TAILQ_REMOVE(worksheet->table, row, list_pointers);
+            free(row->cells);
+            free(row);
+        }
+
+        free(worksheet->table);
+    }
+
+    free(worksheet->name);
+    free(worksheet);
+}
+
+/*
+ * Create a new worksheet row object.
+ */
+STATIC lxw_row *
+_new_row(int32_t row_num)
+{
+    lxw_row *row = calloc(1, sizeof(lxw_row));
+
+    if (row) {
+        row->row_num = row_num;
+        row->cells = calloc(1, sizeof(struct lxw_table_cells));
+
+        if (row->cells)
+            TAILQ_INIT(row->cells);
+        else
+            MEM_ERROR();
+    }
+    else {
+        MEM_ERROR();
+    }
+
+    return row;
+}
+
+/*
+ * Create a new worksheet number cell object.
+ */
+STATIC lxw_cell *
+_new_number_cell(uint32_t row_num,
+                 uint16_t col_num, double value, lxw_format *format)
+{
+    lxw_cell *cell = calloc(1, sizeof(lxw_cell));
+    RETURN_ON_MEM_ERROR(cell, cell);
+
+    cell->row_num = row_num;
+    cell->col_num = col_num;
+    cell->type = NUMBER_CELL;
+    cell->format = format;
+    cell->u.number = value;
+
+    return cell;
+}
+
+/*
+ * Create a new worksheet string cell object.
+ */
+STATIC lxw_cell *
+_new_string_cell(uint32_t row_num,
+                 uint16_t col_num, int32_t string_id, lxw_format *format)
+{
+    lxw_cell *cell = calloc(1, sizeof(lxw_cell));
+    RETURN_ON_MEM_ERROR(cell, cell);
+
+    cell->row_num = row_num;
+    cell->col_num = col_num;
+    cell->type = STRING_CELL;
+    cell->format = format;
+    cell->u.string_id = string_id;
+
+    return cell;
+}
+
+/*
+ * Create a new worksheet formula cell object.
+ */
+STATIC lxw_cell *
+_new_formula_cell(uint32_t row_num,
+                  uint16_t col_num, char *formula, lxw_format *format)
+{
+    lxw_cell *cell = calloc(1, sizeof(lxw_cell));
+    RETURN_ON_MEM_ERROR(cell, cell);
+
+    cell->row_num = row_num;
+    cell->col_num = col_num;
+    cell->type = FORMULA_CELL;
+    cell->format = format;
+    cell->u.formula = formula;
+
+    return cell;
+}
+
+/*
+ * Create a new worksheet blank cell object.
+ */
+STATIC lxw_cell *
+_new_blank_cell(uint32_t row_num, uint16_t col_num, lxw_format *format)
+{
+    lxw_cell *cell = calloc(1, sizeof(lxw_cell));
+    RETURN_ON_MEM_ERROR(cell, cell);
+
+    cell->row_num = row_num;
+    cell->col_num = col_num;
+    cell->type = BLANK_CELL;
+    cell->format = format;
+
+    return cell;
+}
+
+/*
+ * Get or create the row object for a given row number.
+ */
+STATIC lxw_row *
+_get_row(struct lxw_table_rows *table, uint32_t row_num)
+{
+    lxw_row *new_row;
+    lxw_row *first_row = TAILQ_FIRST(table);
+    lxw_row *last_row = TAILQ_LAST(table, lxw_table_rows);
+    lxw_row *current_row;
+
+    /* If the data table has no rows add a new row and return it. */
+    if (!first_row) {
+        new_row = _new_row(row_num);
+        TAILQ_INSERT_HEAD(table, new_row, list_pointers);
+        return new_row;
+    }
+
+    /* If the row number is the last row then return it. */
+    if (row_num == last_row->row_num) {
+        return last_row;
+    }
+
+    /* If the row number is after the current last row we append */
+    /* a new row and return it. */
+    if (row_num > last_row->row_num) {
+        new_row = _new_row(row_num);
+        TAILQ_INSERT_TAIL(table, new_row, list_pointers);
+        return new_row;
+    }
+
+    /* If the row number is the first row then return it. */
+    if (row_num == first_row->row_num) {
+        return first_row;
+    }
+
+    /* If the row number is before the current first row we prepend */
+    /* a new row and return it. */
+    if (row_num < first_row->row_num) {
+        new_row = _new_row(row_num);
+        TAILQ_INSERT_HEAD(table, new_row, list_pointers);
+        return new_row;
+    }
+
+    /* Otherwise we iterate through the list of rows and either return */
+    /* and existing row or insert an new one in sorted order. */
+    TAILQ_FOREACH(current_row, table, list_pointers) {
+
+        if (row_num == current_row->row_num) {
+            return current_row;
+        }
+
+        if (row_num < TAILQ_NEXT(current_row, list_pointers)->row_num) {
+            /* Note: there is always a non-NULL _NEXT() since we already */
+            /* checked above that the row_num is less than _LAST(). */
+            new_row = _new_row(row_num);
+            TAILQ_INSERT_AFTER(table, current_row, new_row, list_pointers);
+            return new_row;
+        }
+    }
+
+    return NULL;
+}
+
+/*
+ * Insert a cell object in the cell list of a row object.
+ */
+STATIC void
+_insert_cell(struct lxw_table_cells *cell_list,
+             lxw_cell *cell, uint16_t col_num)
+{
+    lxw_cell *first_cell = TAILQ_FIRST(cell_list);
+    lxw_cell *last_cell = TAILQ_LAST(cell_list, lxw_table_cells);
+    lxw_cell *current_cell;
+
+    /* If the row has no cells add the new at the start of the cell list. */
+    if (!first_cell) {
+        TAILQ_INSERT_HEAD(cell_list, cell, list_pointers);
+        return;
+    }
+
+    /* If it is the last cell then replace it and free existing cell. */
+    if (col_num == last_cell->col_num) {
+        TAILQ_INSERT_TAIL(cell_list, cell, list_pointers);
+        TAILQ_REMOVE(cell_list, last_cell, list_pointers);
+        free(last_cell);
+        return;
+    }
+
+    /* Append the cell if the col number is after the last cell. */
+    if (col_num > last_cell->col_num) {
+        TAILQ_INSERT_TAIL(cell_list, cell, list_pointers);
+        return;
+    }
+
+    /* If it is the first cell then replace it and free existing cell. */
+    if (col_num == first_cell->col_num) {
+        TAILQ_INSERT_HEAD(cell_list, cell, list_pointers);
+        TAILQ_REMOVE(cell_list, first_cell, list_pointers);
+        free(first_cell);
+        return;
+    }
+
+    /* Prepend the cell if the col number is before the first cell. */
+    if (col_num < first_cell->col_num) {
+        TAILQ_INSERT_HEAD(cell_list, cell, list_pointers);
+        return;
+    }
+
+    /* Otherwise we iterate through the list of cells and either replace */
+    /* an existing cell or insert an new one in sorted order. */
+    TAILQ_FOREACH(current_cell, cell_list, list_pointers) {
+
+        if (col_num == current_cell->col_num) {
+            TAILQ_INSERT_AFTER(cell_list, current_cell, cell, list_pointers);
+            TAILQ_REMOVE(cell_list, current_cell, list_pointers);
+            free(current_cell);
+            return;
+        }
+
+        if (col_num < TAILQ_NEXT(current_cell, list_pointers)->col_num) {
+            /* Note: there is always a non-NULL _NEXT() since we already */
+            /* checked above that the col_num is less than _LAST(). */
+            TAILQ_INSERT_AFTER(cell_list, current_cell, cell, list_pointers);
+            return;
+        }
+    }
+
+    return;
+}
+
+/*****************************************************************************
+ *
+ * XML functions.
+ *
+ ****************************************************************************/
+/*
+ * Write the XML declaration.
+ */
+STATIC void
+_worksheet_xml_declaration(lxw_worksheet *self)
+{
+    _xml_declaration(self->file);
+}
+
+/*
+ * Write the <worksheet> element.
+ */
+STATIC void
+_worksheet_write_worksheet(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char xmlns[] = "http://schemas.openxmlformats.org/"
+        "spreadsheetml/2006/main";
+    char xmlns_r[] = "http://schemas.openxmlformats.org/"
+        "officeDocument/2006/relationships";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("xmlns", xmlns);
+    _PUSH_ATTRIBUTES_STR("xmlns:r", xmlns_r);
+
+    _xml_start_tag(self->file, "worksheet", &attributes);
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <dimension> element.
+ */
+STATIC void
+_worksheet_write_dimension(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    /* Default range ref for empty worksheet. */
+    char ref[MAX_CELL_RANGE_LENGTH] = "A1";
+
+    /* For non-empty worksheet fill in the cell range. */
+    if (!TAILQ_EMPTY(self->table)) {
+        xl_range(ref,
+                 self->dim_rowmin, self->dim_colmin,
+                 self->dim_rowmax, self->dim_colmax);
+    }
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("ref", ref);
+
+    _xml_empty_tag(self->file, "dimension", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <sheetView> element.
+ */
+STATIC void
+_worksheet_write_sheet_view(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+
+    if (self->selected)
+        _PUSH_ATTRIBUTES_STR("tabSelected", "1");
+
+    _PUSH_ATTRIBUTES_STR("workbookViewId", "0");
+
+    _xml_empty_tag(self->file, "sheetView", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <sheetViews> element.
+ */
+STATIC void
+_worksheet_write_sheet_views(lxw_worksheet *self)
+{
+    _xml_start_tag(self->file, "sheetViews", NULL);
+
+    /* Write the sheetView element. */
+    _worksheet_write_sheet_view(self);
+
+    _xml_end_tag(self->file, "sheetViews");
+}
+
+/*
+ * Write the <sheetFormatPr> element.
+ */
+STATIC void
+_worksheet_write_sheet_format_pr(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char default_row_height[] = "15";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("defaultRowHeight", default_row_height);
+
+    _xml_empty_tag(self->file, "sheetFormatPr", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <sheetData> element.
+ */
+STATIC void
+_worksheet_write_sheet_data(lxw_worksheet *self)
+{
+    if (TAILQ_EMPTY(self->table)) {
+        _xml_empty_tag(self->file, "sheetData", NULL);
+    }
+    else {
+        _xml_start_tag(self->file, "sheetData", NULL);
+        _write_rows(self);
+        _xml_end_tag(self->file, "sheetData");
+    }
+}
+
+/*
+ * Write the <pageMargins> element.
+ */
+STATIC void
+_worksheet_write_page_margins(lxw_worksheet *self)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char left[] = "0.7";
+    char right[] = "0.7";
+    char top[] = "0.75";
+    char bottom[] = "0.75";
+    char header[] = "0.3";
+    char footer[] = "0.3";
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("left", left);
+    _PUSH_ATTRIBUTES_STR("right", right);
+    _PUSH_ATTRIBUTES_STR("top", top);
+    _PUSH_ATTRIBUTES_STR("bottom", bottom);
+    _PUSH_ATTRIBUTES_STR("header", header);
+    _PUSH_ATTRIBUTES_STR("footer", footer);
+
+    _xml_empty_tag(self->file, "pageMargins", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write the <row> element.
+ */
+STATIC void
+_write_row(lxw_worksheet *self, lxw_row *row, char *spans)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_INT("r", row->row_num + 1);
+
+    if (spans)
+        _PUSH_ATTRIBUTES_STR("spans", spans);
+
+    if (TAILQ_EMPTY(row->cells))
+        _xml_empty_tag(self->file, "row", &attributes);
+    else
+        _xml_start_tag(self->file, "row", &attributes);
+
+    _FREE_ATTRIBUTES();
+}
+
+/*****************************************************************************
+ *
+ * XML file assembly functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write out a number worksheet cell.
+ */
+STATIC void
+_write_number_cell(lxw_worksheet *self, lxw_cell *cell)
+{
+    char data[ATTR_32];
+
+    __builtin_snprintf(data, ATTR_32, "%.16g", cell->u.number);
+
+    _xml_data_element(self->file, "v", data, NULL);
+
+}
+
+/*
+ * Write out a string worksheet cell.
+ */
+STATIC void
+_write_string_cell(lxw_worksheet *self, lxw_cell *cell)
+{
+    char data[ATTR_32];
+
+    __builtin_snprintf(data, ATTR_32, "%d", cell->u.string_id);
+
+    _xml_data_element(self->file, "v", data, NULL);
+}
+
+/*
+ * Write out a formula worksheet cell with a numeric result.
+ */
+STATIC void
+_write_formula_num_cell(lxw_worksheet *self, lxw_cell *cell)
+{
+    char data[ATTR_32];
+
+    __builtin_snprintf(data, ATTR_32, "%.16g", cell->formula_result.number);
+
+    _xml_data_element(self->file, "f", cell->u.formula, NULL);
+    _xml_data_element(self->file, "v", data, NULL);
+}
+
+/*
+ *  Calculate the "spans" attribute of the <row> tag. This is an XLSX
+ * optimisation and isn't strictly required. However, it makes comparing
+ * files easier.
+ *
+ * The span is the same for each block of 16 rows.
+ */
+STATIC void
+_calculate_spans(struct lxw_row *row, char *span, int32_t *block_num)
+{
+    uint16_t span_col_min = TAILQ_FIRST(row->cells)->col_num;
+    uint16_t span_col_max = TAILQ_LAST(row->cells, lxw_table_cells)->col_num;
+    uint16_t col_min;
+    uint16_t col_max;
+    *block_num = row->row_num / 16;
+
+    row = TAILQ_NEXT(row, list_pointers);
+
+    while (row && (int32_t) (row->row_num / 16) == *block_num) {
+
+        if (!TAILQ_EMPTY(row->cells)) {
+            col_min = TAILQ_FIRST(row->cells)->col_num;
+            col_max = TAILQ_LAST(row->cells, lxw_table_cells)->col_num;
+
+            if (col_min < span_col_min)
+                span_col_min = col_min;
+
+            if (col_max > span_col_max)
+                span_col_max = col_max;
+        }
+
+        row = TAILQ_NEXT(row, list_pointers);
+    }
+
+    __builtin_snprintf(span, MAX_CELL_RANGE_LENGTH,
+                       "%d:%d", span_col_min + 1, span_col_max + 1);
+}
+
+/*
+ * Write out a generic worksheet cell.
+ */
+STATIC void
+_write_cell(lxw_worksheet *self, lxw_cell *cell)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+    char range[MAX_CELL_NAME_LENGTH] = { 0 };
+
+    xl_rowcol_to_cell_abs(range, cell->row_num, cell->col_num, 0, 0);
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("r", range);
+
+    if (cell->format) {
+        int32_t index = _get_xf_index(cell->format);
+        if (index)
+            _PUSH_ATTRIBUTES_INT("s", index);
+    }
+
+    if (cell->type == STRING_CELL)
+        _PUSH_ATTRIBUTES_STR("t", "s");
+
+    if (cell->type == NUMBER_CELL) {
+        _xml_start_tag(self->file, "c", &attributes);
+        _write_number_cell(self, cell);
+        _xml_end_tag(self->file, "c");
+    }
+    else if (cell->type == STRING_CELL) {
+        _xml_start_tag(self->file, "c", &attributes);
+        _write_string_cell(self, cell);
+        _xml_end_tag(self->file, "c");
+    }
+    else if (cell->type == FORMULA_CELL) {
+        _xml_start_tag(self->file, "c", &attributes);
+        _write_formula_num_cell(self, cell);
+        _xml_end_tag(self->file, "c");
+    }
+    else if (cell->type == BLANK_CELL) {
+        _xml_empty_tag(self->file, "c", &attributes);
+    }
+
+    _FREE_ATTRIBUTES();
+}
+
+/*
+ * Write out the worksheet data as a series of rows and cells.
+ */
+STATIC void
+_write_rows(lxw_worksheet *self)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    int32_t block_num = -1;
+    char spans[MAX_CELL_RANGE_LENGTH] = { 0 };
+
+    TAILQ_FOREACH(row, self->table, list_pointers) {
+
+        if ((int32_t) row->row_num / 16 > block_num)
+            _calculate_spans(row, spans, &block_num);
+
+        if (!TAILQ_EMPTY(row->cells)) {
+            _write_row(self, row, spans);
+
+            TAILQ_FOREACH(cell, row->cells, list_pointers) {
+                _write_cell(self, cell);
+            }
+        }
+        _xml_end_tag(self->file, "row");
+    }
+}
+
+/*
+ * Check that row and col are within the allowed Excel range and store max
+ * and min values for use in other methods/elements.
+ *
+ * The ignore_row/ignore_col flags are used to indicate that we wish to
+ * perform the dimension check without storing the value.
+ */
+STATIC int8_t
+_check_dimensions(lxw_worksheet *self,
+                  uint32_t row_num,
+                  uint16_t col_num, int8_t ignore_row, int8_t ignore_col)
+{
+    if (row_num >= XL_ROW_MAX)
+        return LXW_RANGE_ERROR;
+
+    if (col_num >= XL_COL_MAX)
+        return LXW_RANGE_ERROR;
+
+    if (!ignore_row) {
+        if (row_num < self->dim_rowmin)
+            self->dim_rowmin = row_num;
+        if (row_num > self->dim_rowmax)
+            self->dim_rowmax = row_num;
+    }
+
+    if (!ignore_col) {
+        if (col_num < self->dim_colmin)
+            self->dim_colmin = col_num;
+        if (col_num > self->dim_colmax)
+            self->dim_colmax = col_num;
+    }
+
+    return 0;
+}
+
+/*
+ * Assemble and write the XML file.
+ */
+void
+_worksheet_assemble_xml_file(lxw_worksheet *self)
+{
+    /* Write the XML declaration. */
+    _worksheet_xml_declaration(self);
+
+    /* Write the worksheet element. */
+    _worksheet_write_worksheet(self);
+
+    /* Write the worksheet dimensions. */
+    _worksheet_write_dimension(self);
+
+    /* Write the sheet view properties. */
+    _worksheet_write_sheet_views(self);
+
+    /* Write the sheet format properties. */
+    _worksheet_write_sheet_format_pr(self);
+
+    /* Write the sheetData element. */
+    _worksheet_write_sheet_data(self);
+
+    /* Write the worksheet page_margins. */
+    _worksheet_write_page_margins(self);
+
+    /* Close the worksheet tag. */
+    _xml_end_tag(self->file, "worksheet");
+}
+
+/*****************************************************************************
+ *
+ * Public functions.
+ *
+ ****************************************************************************/
+
+/*
+ * Write a number to a cell in Excel.
+ */
+int8_t
+worksheet_write_number(lxw_worksheet *worksheet,
+                       uint32_t row_num,
+                       uint16_t col_num, double value, lxw_format *format)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    int8_t err = _check_dimensions(worksheet, row_num, col_num, 0, 0);
+
+    if (err)
+        return err;
+
+    row = _get_row(worksheet->table, row_num);
+    cell = _new_number_cell(row_num, col_num, value, format);
+
+    _insert_cell(row->cells, cell, col_num);
+
+    return 0;
+}
+
+/*
+ * Write a string to an Excel file.
+ */
+int8_t
+worksheet_write_string(lxw_worksheet *worksheet,
+                       uint32_t row_num,
+                       uint16_t col_num, const char *string,
+                       lxw_format *format)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    int32_t string_id;
+    int8_t err = _check_dimensions(worksheet, row_num, col_num, 0, 0);
+
+    if (err)
+        return err;
+
+    /* Treat a NULL string with formatting as a blank cell. */
+    if (!string && format)
+        return worksheet_write_blank(worksheet, row_num, col_num, format);
+
+    /* Get the SST string ID for the string. */
+    string_id = _get_sst_index(worksheet->sst, string);
+
+    if (string_id < 0)
+        return LXW_STRING_HASH_ERROR;
+
+    if (strlen(string) > XL_STR_MAX)
+        return LXW_STRING_LENGTH_ERROR;
+
+    row = _get_row(worksheet->table, row_num);
+    cell = _new_string_cell(row_num, col_num, string_id, format);
+
+    _insert_cell(row->cells, cell, col_num);
+
+    return 0;
+}
+
+/*
+ * Write a formula with a numerical result to a cell in Excel.
+ */
+int8_t
+worksheet_write_formula_num(lxw_worksheet *worksheet,
+                            uint32_t row_num,
+                            uint16_t col_num,
+                            const char *formula,
+                            lxw_format *format, double result)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    char *formula_copy;
+    int8_t err = _check_dimensions(worksheet, row_num, col_num, 0, 0);
+
+    if (err)
+        return err;
+
+    /* Strip leading "=" from formula. */
+    if (formula[0] == '=')
+        formula_copy = __builtin_strdup(formula + 1);
+    else
+        formula_copy = __builtin_strdup(formula);
+
+    row = _get_row(worksheet->table, row_num);
+    cell = _new_formula_cell(row_num, col_num, formula_copy, format);
+    cell->formula_result.number = result;
+
+    _insert_cell(row->cells, cell, col_num);
+
+    return 0;
+}
+
+/*
+ *Write a formula with a default result to a cell in Excel .
+
+ */ int8_t
+worksheet_write_formula(lxw_worksheet *worksheet,
+                        uint32_t row_num,
+                        uint16_t col_num, const char *formula,
+                        lxw_format *format)
+{
+    return worksheet_write_formula_num(worksheet, row_num, col_num, formula,
+                                       format, 0);
+}
+
+/*
+ * Write a blank cell with a format to a cell in Excel.
+
+ */
+int8_t
+worksheet_write_blank(lxw_worksheet *worksheet,
+                      uint32_t row_num, uint16_t col_num, lxw_format *format)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    int8_t err;
+
+    /* Blank cells without formatting are ignored by Excel. */
+    if (!format)
+        return 0;
+
+    err = _check_dimensions(worksheet, row_num, col_num, 0, 0);
+
+    if (err)
+        return err;
+
+    row = _get_row(worksheet->table, row_num);
+    cell = _new_blank_cell(row_num, col_num, format);
+
+    _insert_cell(row->cells, cell, col_num);
+
+    return 0;
+}
+
+/*
+ * Write a date and or time to a cell in Excel.
+ */
+int8_t
+worksheet_write_datetime(lxw_worksheet *worksheet,
+                         uint32_t row_num,
+                         uint16_t col_num, lxw_datetime *datetime,
+                         lxw_format *format)
+{
+    lxw_row *row;
+    lxw_cell *cell;
+    double excel_date;
+    int8_t err = _check_dimensions(worksheet, row_num, col_num, 0, 0);
+
+    if (err)
+        return err;
+
+    excel_date = _datetime_to_excel_date(datetime, EPOCH_1900);
+
+    row = _get_row(worksheet->table, row_num);
+    cell = _new_number_cell(row_num, col_num, excel_date, format);
+
+    _insert_cell(row->cells, cell, col_num);
+
+    return 0;
+}
diff --git a/src/xmlwriter.c b/src/xmlwriter.c
new file mode 100644
index 00000000..90127f52
--- /dev/null
+++ b/src/xmlwriter.c
@@ -0,0 +1,294 @@
+/*****************************************************************************
+ * xmlwriter - A base library for libxlsxwriter libraries.
+ *
+ * Used in conjunction with the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "xlsxwriter/xmlwriter.h"
+
+/* Defines. */
+#define MAX_ENCODED_ATTRIBUTE_LENGTH (MAX_ATTRIBUTE_LENGTH*6)
+
+/* Forward declarations. */
+char *_escape_attributes(struct xml_attribute *attribute);
+
+char *_escape_data(const char *data);
+
+void _fprint_escaped_attributes(FILE * xmlfile,
+                                struct xml_attribute_list *attributes);
+
+void _fprint_escaped_data(FILE * xmlfile, const char *data);
+
+/*
+ * Write the XML declaration.
+ */
+void
+_xml_declaration(FILE * xmlfile)
+{
+    fprintf(xmlfile, "<?xml version=\"1.0\" "
+            "encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+}
+
+/*
+ * Write an XML start tag with optional attributes.
+ */
+void
+_xml_start_tag(FILE * xmlfile,
+               const char *tag, struct xml_attribute_list *attributes)
+{
+    fprintf(xmlfile, "<%s", tag);
+
+    _fprint_escaped_attributes(xmlfile, attributes);
+
+    fprintf(xmlfile, ">");
+}
+
+/*
+ * Write an XML start tag with optional, unencoded, attributes.
+ * This is a minor speed optimisation for elements that don't need encoding.
+ */
+void
+_xml_start_tag_unencoded(FILE * xmlfile,
+                         const char *tag,
+                         struct xml_attribute_list *attributes)
+{
+    struct xml_attribute *attribute;
+
+    fprintf(xmlfile, "<%s", tag);
+
+    if (attributes) {
+        STAILQ_FOREACH(attribute, attributes, list_entries) {
+            fprintf(xmlfile, " %s=\"%s\"", attribute->key, attribute->value);
+        }
+    }
+
+    fprintf(xmlfile, ">");
+}
+
+/*
+ * Write an XML end tag.
+ */
+void
+_xml_end_tag(FILE * xmlfile, const char *tag)
+{
+    fprintf(xmlfile, "</%s>", tag);
+}
+
+/*
+ * Write an empty XML tag with optional attributes.
+ */
+void
+_xml_empty_tag(FILE * xmlfile,
+               const char *tag, struct xml_attribute_list *attributes)
+{
+    fprintf(xmlfile, "<%s", tag);
+
+    _fprint_escaped_attributes(xmlfile, attributes);
+
+    fprintf(xmlfile, "/>");
+}
+
+/*
+ * Write an XML start tag with optional, unencoded, attributes.
+ * This is a minor speed optimisation for elements that don't need encoding.
+ */
+void
+_xml_empty_tag_unencoded(FILE * xmlfile,
+                         const char *tag,
+                         struct xml_attribute_list *attributes)
+{
+    struct xml_attribute *attribute;
+
+    fprintf(xmlfile, "<%s", tag);
+
+    if (attributes) {
+        STAILQ_FOREACH(attribute, attributes, list_entries) {
+            fprintf(xmlfile, " %s=\"%s\"", attribute->key, attribute->value);
+        }
+    }
+
+    fprintf(xmlfile, "/>");
+}
+
+/*
+ * Write an XML element containing data with optional attributes.
+ */
+void
+_xml_data_element(FILE * xmlfile,
+                  const char *tag,
+                  const char *data, struct xml_attribute_list *attributes)
+{
+    fprintf(xmlfile, "<%s", tag);
+
+    _fprint_escaped_attributes(xmlfile, attributes);
+
+    fprintf(xmlfile, ">");
+
+    _fprint_escaped_data(xmlfile, data);
+
+    fprintf(xmlfile, "</%s>", tag);
+}
+
+/*
+ * Escape XML characters in attributes.
+ */
+char *
+_escape_attributes(struct xml_attribute *attribute)
+{
+    char *encoded = (char *) calloc(MAX_ENCODED_ATTRIBUTE_LENGTH, 1);
+    char *p_encoded = encoded;
+    char *p_attr = attribute->value;
+
+    while (*p_attr) {
+        switch (*p_attr) {
+            case '&':
+                strcat(p_encoded, "&amp;");
+                p_encoded += 5;
+                break;
+            case '<':
+                strcat(p_encoded, "&lt;");
+                p_encoded += 4;
+                break;
+            case '>':
+                strcat(p_encoded, "&gt;");
+                p_encoded += 4;
+                break;
+            case '"':
+                strcat(p_encoded, "&quot;");
+                p_encoded += 6;
+                break;
+            default:
+                *p_encoded = *p_attr;
+                p_encoded++;
+                break;
+        }
+        p_attr++;
+    }
+
+    return encoded;
+}
+
+/*
+ * Escape XML characters in data sections of tags.
+ * Note, this is different from _escape_attributes()
+ * in that double quotes are not escaped by Excel.
+ */
+char *
+_escape_data(const char *data)
+{
+    int encoded_len = (strlen(data) * 5 + 1);
+
+    char *encoded = (char *) calloc(encoded_len, 1);
+    char *p_encoded = encoded;
+
+    while (*data) {
+        switch (*data) {
+            case '&':
+                strcat(p_encoded, "&amp;");
+                p_encoded += 5;
+                break;
+            case '<':
+                strcat(p_encoded, "&lt;");
+                p_encoded += 4;
+                break;
+            case '>':
+                strcat(p_encoded, "&gt;");
+                p_encoded += 4;
+                break;
+            default:
+                *p_encoded = *data;
+                p_encoded++;
+                break;
+        }
+        data++;
+    }
+
+    return encoded;
+}
+
+/* TODO */
+void
+_fprint_escaped_attributes(FILE * xmlfile,
+                           struct xml_attribute_list *attributes)
+{
+    struct xml_attribute *attribute;
+
+    if (attributes) {
+        STAILQ_FOREACH(attribute, attributes, list_entries) {
+            fprintf(xmlfile, " %s=", attribute->key);
+
+            if (!strpbrk(attribute->value, "&<>\"")) {
+                fprintf(xmlfile, "\"%s\"", attribute->value);
+            }
+            else {
+                char *encoded = _escape_attributes(attribute);
+
+                if (encoded) {
+                    fprintf(xmlfile, "\"%s\"", encoded);
+
+                    free(encoded);
+                }
+            }
+        }
+    }
+}
+
+/* TODO */
+void
+_fprint_escaped_data(FILE * xmlfile, const char *data)
+{
+    /* Escape the data section of the XML element. */
+    if (!strpbrk(data, "&<>")) {
+        fprintf(xmlfile, "%s", data);
+    }
+    else {
+        char *encoded = _escape_data(data);
+        if (encoded) {
+            fprintf(xmlfile, "%s", encoded);
+            free(encoded);
+        }
+    }
+}
+
+/* TODO */
+struct xml_attribute *
+_new_attribute_str(const char *key, const char *value)
+{
+    struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
+
+    strcpy(attribute->key, key);
+    strcpy(attribute->value, value);
+
+    return attribute;
+}
+
+/* TODO */
+struct xml_attribute *
+_new_attribute_int(const char *key, uint32_t value)
+{
+    struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
+
+    strcpy(attribute->key, key);
+    __builtin_snprintf(attribute->value, MAX_ATTRIBUTE_LENGTH, "%d", value);
+
+    return attribute;
+}
+
+/* TODO */
+struct xml_attribute *
+_new_attribute_dbl(const char *key, double value)
+{
+    struct xml_attribute *attribute = malloc(sizeof(struct xml_attribute));
+
+    strcpy(attribute->key, key);
+    __builtin_snprintf(attribute->value, MAX_ATTRIBUTE_LENGTH, "%.16g",
+                       value);
+
+    return attribute;
+}
diff --git a/test/functional/base_test_class.py b/test/functional/base_test_class.py
new file mode 100644
index 00000000..f1ca7a76
--- /dev/null
+++ b/test/functional/base_test_class.py
@@ -0,0 +1,57 @@
+###############################################################################
+#
+# Base test class for libxlsxwriter functional tests.
+#
+# Copyright (c), 2014, John McNamara, jmcnamara@cpan.org
+#
+
+import unittest
+import os
+from helper_functions import _compare_xlsx_files
+
+
+class XLSXBaseTest(unittest.TestCase):
+    """
+    Test file created with libxlsxwriter against a file created by Excel.
+
+    """
+
+    def setUp(self):
+        self.maxDiff = None
+
+        self.no_system_error = 0
+        self.got_filename = ''
+        self.exp_filename = ''
+        self.ignore_files = []
+        self.ignore_elements = {}
+
+    def run_exe_test(self, exe_name, got_filename=None):
+        """Run C exe and compare output xlsx file with the Excel file."""
+
+        # Run the C executable to generate the "got" xlsx file.
+        got = os.system("cd test/functional/src; ./%s" % exe_name)
+        self.assertEqual(got, self.no_system_error)
+
+        # Create the path/file names for the xlsx files to compare.
+        exp_filename = exe_name.replace('test_', '') + '.xlsx'
+
+        if not got_filename:
+            got_filename = exp_filename
+
+        self.got_filename = 'test/functional/src/test_' + got_filename
+        self.exp_filename = 'test/functional/xlsx_files/' + exp_filename
+
+        # Do the comparison between the files.
+        got, exp = _compare_xlsx_files(self.got_filename,
+                                       self.exp_filename,
+                                       self.ignore_files,
+                                       self.ignore_elements)
+        self.assertEqual(got, exp)
+
+    def tearDown(self):
+        # Cleanup.
+        if os.path.exists(self.got_filename):
+            os.remove(self.got_filename)
+
+        self.ignore_files = []
+        self.ignore_elements = {}
diff --git a/test/functional/helper_functions.py b/test/functional/helper_functions.py
new file mode 100644
index 00000000..0e83ed25
--- /dev/null
+++ b/test/functional/helper_functions.py
@@ -0,0 +1,226 @@
+###############################################################################
+#
+# Helper functions for testing libxlsxwriter.
+#
+# Copyright (c), 2014, John McNamara, jmcnamara@cpan.org
+#
+
+import re
+import sys
+import os.path
+from zipfile import ZipFile
+from zipfile import BadZipfile
+from zipfile import LargeZipFile
+
+
+def _xml_to_list(xml_str):
+    # Convert test generated XML strings into lists for comparison testing.
+
+    # Split the XML string at tag boundaries.
+    parser = re.compile(r'>\s*<')
+    elements = parser.split(xml_str.strip())
+
+    elements = [s.replace("\r", "") for s in elements]
+
+    # Add back the removed brackets.
+    for index, element in enumerate(elements):
+        if not element[0] == '<':
+            elements[index] = '<' + elements[index]
+        if not element[-1] == '>':
+            elements[index] = elements[index] + '>'
+
+    return elements
+
+
+def _vml_to_list(vml_str):
+    # Convert an Excel generated VML string into a list for comparison testing.
+    #
+    # The VML data in the testcases is taken from Excel 2007 files. The data
+    # has to be massaged significantly to make it suitable for comparison.
+    #
+    # The VML produced by XlsxWriter can be parsed as ordinary XML.
+    vml_str = vml_str.replace("\r", "")
+
+    vml = vml_str.split("\n")
+    vml_str = ''
+
+    for line in vml:
+        # Skip blank lines.
+        if not line:
+            continue
+
+        # Strip leading and trailing whitespace.
+        line = line.strip()
+
+        # Convert VMLs attribute quotes.
+        line = line.replace("'", '"')
+
+        # Add space between attributes.
+        if re.search('"$', line):
+            line += " "
+
+        # Add newline after element end.
+        if re.search('>$', line):
+            line += "\n"
+
+        # Split multiple elements.
+        line = line.replace('><', ">\n<")
+
+        # Put all of Anchor on one line.
+        if line == "<x:Anchor>\n":
+            line = line.strip()
+
+        vml_str += line
+
+    # Remove the final newline.
+    vml_str = vml_str.rstrip()
+
+    return vml_str.split("\n")
+
+
+def _sort_rel_file_data(xml_elements):
+    # Re-order the relationship elements in an array of XLSX XML rel
+    # (relationship) data. This is necessary for comparison since
+    # Excel can produce the elements in a semi-random order.
+
+    # We don't want to sort the first or last elements.
+    first = xml_elements.pop(0)
+    last = xml_elements.pop()
+
+    # Sort the relationship elements.
+    xml_elements.sort()
+
+    # Add back the first and last elements.
+    xml_elements.insert(0, first)
+    xml_elements.append(last)
+
+    return xml_elements
+
+
+def _compare_xlsx_files(got_file, exp_file, ignore_files, ignore_elements):
+    # Compare two XLSX files by extracting the XML files from each
+    # zip archive and comparing them.
+    #
+    # This is used to compare an "expected" file produced by Excel
+    # with a "got" file produced by XlsxWriter.
+    #
+    # In order to compare the XLSX files we convert the data in each
+    # XML file into an list of XML elements.
+    try:
+        # Open the XlsxWriter as a zip file for testing.
+        got_zip = ZipFile(got_file, 'r')
+    except IOError:
+        # For Python 2.5+ compatibility.
+        e = sys.exc_info()[1]
+        error = "XlsxWriter file error: " + str(e)
+        return error, ''
+    except (BadZipfile, LargeZipFile):
+        e = sys.exc_info()[1]
+        error = "XlsxWriter zipfile error, '" + exp_file + "': " + str(e)
+        return error, ''
+
+    try:
+        # Open the Excel as a zip file for testing.
+        exp_zip = ZipFile(exp_file, 'r')
+    except IOError:
+        e = sys.exc_info()[1]
+        error = "Excel file error: " + str(e)
+        return error, ''
+    except (BadZipfile, LargeZipFile):
+        e = sys.exc_info()[1]
+        error = "Excel zipfile error, '" + exp_file + "': " + str(e)
+        return error, ''
+
+    # Get the filenames from the zip files.
+    got_files = sorted(got_zip.namelist())
+    exp_files = sorted(exp_zip.namelist())
+
+    # Ignore some test specific filenames.
+    got_files = [name for name in got_files if name not in ignore_files]
+    exp_files = [name for name in exp_files if name not in ignore_files]
+
+    # Check that each XLSX container has the same files.
+    if got_files != exp_files:
+        return got_files, exp_files
+
+    # Compare each file in the XLSX containers.
+    for filename in exp_files:
+
+        got_xml_str = got_zip.read(filename)
+        exp_xml_str = exp_zip.read(filename)
+
+        # Compare binary files with string comparison based on extension.
+        extension = os.path.splitext(filename)[1]
+        if extension in ('.png', '.jpeg', '.bmp'):
+            if got_xml_str == exp_xml_str:
+                return 'Ok', 'Ok'
+            else:
+                return 'got: %s' % filename, 'exp: %s' % filename
+
+        if sys.version_info >= (3, 0, 0):
+            got_xml_str = got_xml_str.decode('utf-8')
+            exp_xml_str = exp_xml_str.decode('utf-8')
+
+        # Remove dates and user specific data from the core.xml data.
+        if filename == 'docProps/core.xml':
+            exp_xml_str = re.sub(r' ?John', '', exp_xml_str)
+            exp_xml_str = re.sub(r'\d\d\d\d-\d\d-\d\dT\d\d\:\d\d:\d\dZ',
+                                 '', exp_xml_str)
+            got_xml_str = re.sub(r'\d\d\d\d-\d\d-\d\dT\d\d\:\d\d:\d\dZ',
+                                 '', got_xml_str)
+
+        # Remove workbookView dimensions which are almost always different
+        # and calcPr which can have different Excel version ids.
+        if filename == 'xl/workbook.xml':
+            exp_xml_str = re.sub(r'<workbookView[^>]*>',
+                                 '<workbookView/>', exp_xml_str)
+            got_xml_str = re.sub(r'<workbookView[^>]*>',
+                                 '<workbookView/>', got_xml_str)
+            exp_xml_str = re.sub(r'<calcPr[^>]*>',
+                                 '<calcPr/>', exp_xml_str)
+            got_xml_str = re.sub(r'<calcPr[^>]*>',
+                                 '<calcPr/>', got_xml_str)
+
+        # Remove printer specific settings from Worksheet pageSetup elements.
+        if re.match(r'xl/worksheets/sheet\d.xml', filename):
+            exp_xml_str = re.sub(r'horizontalDpi="200" ', '', exp_xml_str)
+            exp_xml_str = re.sub(r'verticalDpi="200" ', '', exp_xml_str)
+            exp_xml_str = re.sub(r'(<pageSetup.*) r:id="rId1"',
+                                 r'\1', exp_xml_str)
+
+        # Remove Chart pageMargin dimensions which are almost always different.
+        if re.match(r'xl/charts/chart\d.xml', filename):
+            exp_xml_str = re.sub(r'<c:pageMargins[^>]*>',
+                                 '<c:pageMargins/>', exp_xml_str)
+            got_xml_str = re.sub(r'<c:pageMargins[^>]*>',
+                                 '<c:pageMargins/>', got_xml_str)
+
+        # Convert the XML string to lists for comparison.
+        if re.search('.vml$', filename):
+            got_xml = _xml_to_list(got_xml_str)
+            exp_xml = _vml_to_list(exp_xml_str)
+        else:
+            got_xml = _xml_to_list(got_xml_str)
+            exp_xml = _xml_to_list(exp_xml_str)
+
+        # Ignore test specific XML elements for defined filenames.
+        if filename in ignore_elements:
+            patterns = ignore_elements[filename]
+
+            for pattern in patterns:
+                exp_xml = [tag for tag in exp_xml if not re.match(pattern, tag)]
+                got_xml = [tag for tag in got_xml if not re.match(pattern, tag)]
+
+        # Reorder the XML elements in the XLSX relationship files.
+        if filename == '[Content_Types].xml' or re.search('.rels$', filename):
+            got_xml = _sort_rel_file_data(got_xml)
+            exp_xml = _sort_rel_file_data(exp_xml)
+
+        # Compared the XML elements in each file.
+        if got_xml != exp_xml:
+            got_xml.insert(0, filename)
+            exp_xml.insert(0, filename)
+            return got_xml, exp_xml
+
+    # If we got here the files are the same.
+    return 'Ok', 'Ok'
diff --git a/test/functional/src/Makefile b/test/functional/src/Makefile
new file mode 100644
index 00000000..01da3e7a
--- /dev/null
+++ b/test/functional/src/Makefile
@@ -0,0 +1,44 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter functional test executables.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Directory variables.
+INC_DIR     = ../../../include
+
+# Flags passed to the C++ compiler.
+CFLAGS += -g -Wall -Wextra
+
+# Source files to compile.
+SRCS = $(wildcard *.c)
+EXES = $(patsubst %.c,%,$(SRCS))
+
+LIBXLSXWRITER = ../../../src/libxlsxwriter.a
+
+LIBS = $(LIBXLSXWRITER) -lz
+
+all : $(LIBXLSXWRITER) $(EXES)
+
+$(LIBXLSXWRITER):
+	$(Q)make -C ../../../third_party/minizip
+	$(Q)make -C ../../../src
+
+clean :
+	$(Q)rm -f $(EXES)
+
+# Executable targets.
+%: %.c $(LIBXLSXWRITER)
+	$(Q)$(CC) -I$(INC_DIR) $(CFLAGS) $< -o $@ $(LIBS)
+
+test_valgrind: all
+	$(Q)for exe in $(EXES); do \
+	    valgrind -q --error-exitcode=1 --leak-check=full ./$$exe; \
+	done
diff --git a/test/functional/src/test_data01.c b/test/functional/src/test_data01.c
new file mode 100644
index 00000000..2d68a538
--- /dev/null
+++ b/test/functional/src/test_data01.c
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data01.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_string(worksheet, 0, 0, "Hello", NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_data02.c b/test/functional/src/test_data02.c
new file mode 100644
index 00000000..67b878ee
--- /dev/null
+++ b/test/functional/src/test_data02.c
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data02.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    /* Tests for the row range. */
+    worksheet_write_number(worksheet, 0,       0, 123, NULL);
+    worksheet_write_number(worksheet, 1048575, 0, 456, NULL);
+
+    /* These should be ignored. */
+    worksheet_write_number(worksheet, -1,      0, 123, NULL);
+    worksheet_write_number(worksheet, 1048576, 0, 456, NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_data03.c b/test/functional/src/test_data03.c
new file mode 100644
index 00000000..a9493bbd
--- /dev/null
+++ b/test/functional/src/test_data03.c
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data03.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_number(worksheet, 0,       16383, 123, NULL);
+    worksheet_write_number(worksheet, 1048575, 16383, 456, NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_data04.c b/test/functional/src/test_data04.c
new file mode 100644
index 00000000..b91fb05a
--- /dev/null
+++ b/test/functional/src/test_data04.c
@@ -0,0 +1,24 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data04.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_string(worksheet, 0,       0, "Foo",  NULL);
+    worksheet_write_string(worksheet, 0,       1, "Bar",  NULL);
+    worksheet_write_string(worksheet, 1,       0, "Bing", NULL);
+    worksheet_write_string(worksheet, 2,       0, "Buzz", NULL);
+    worksheet_write_string(worksheet, 1048575, 0, "End",  NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_data05.c b/test/functional/src/test_data05.c
new file mode 100644
index 00000000..f93e1273
--- /dev/null
+++ b/test/functional/src/test_data05.c
@@ -0,0 +1,23 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data05.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_format    *format    = workbook_add_format(workbook);
+
+    format->bold = 1;
+
+    worksheet_write_string(worksheet, 0, 0, "Foo", format);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_data06.c b/test/functional/src/test_data06.c
new file mode 100644
index 00000000..4259bbfd
--- /dev/null
+++ b/test/functional/src/test_data06.c
@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data06.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_format    *format1   = workbook_add_format(workbook);
+    lxw_format    *format2   = workbook_add_format(workbook);
+    lxw_format    *format3   = workbook_add_format(workbook);
+
+    format1->bold = 1;
+
+    format2->italic = 1;
+
+    format3->bold = 1;
+    format3->italic = 1;
+
+    worksheet_write_string(worksheet, 0, 0, "Foo", format1);
+    worksheet_write_string(worksheet, 1, 0, "Bar", format2);
+    worksheet_write_string(worksheet, 2, 0, "Baz", format3);
+
+    return workbook_close(workbook);
+}
+
diff --git a/test/functional/src/test_data07.c b/test/functional/src/test_data07.c
new file mode 100644
index 00000000..0c1a89ae
--- /dev/null
+++ b/test/functional/src/test_data07.c
@@ -0,0 +1,20 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_data07.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    worksheet_write_formula_num(worksheet, 0, 0, "=1+2", NULL, 3);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format01.c b/test/functional/src/test_format01.c
new file mode 100644
index 00000000..1bbeeaa1
--- /dev/null
+++ b/test/functional/src/test_format01.c
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+/* Ignore warnings about unused variables since this file is testing how
+ * unused formats are handled.
+ */
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format01.xlsx");
+    lxw_worksheet *worksheet1 = workbook_add_worksheet(workbook, NULL);
+    lxw_worksheet *worksheet2 = workbook_add_worksheet(workbook, "Data Sheet");
+    lxw_worksheet *worksheet3 = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *unused1    = workbook_add_format(workbook);
+    lxw_format    *format     = workbook_add_format(workbook);
+    lxw_format    *unused2    = workbook_add_format(workbook);
+    lxw_format    *unused3    = workbook_add_format(workbook);
+
+    format_set_bold(format);
+
+    worksheet_write_string(worksheet1, 0, 0, "Foo", NULL);
+    worksheet_write_number(worksheet1, 1, 0, 123, NULL);
+
+    worksheet_write_string(worksheet3, 1, 1, "Foo", NULL);
+    worksheet_write_string(worksheet3, 2, 1, "Bar", format);
+    worksheet_write_number(worksheet3, 3, 2, 234, NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format02.c b/test/functional/src/test_format02.c
new file mode 100644
index 00000000..5b16b472
--- /dev/null
+++ b/test/functional/src/test_format02.c
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+/* Ignore warnings about unused variables since this file is testing how
+ * unused formats are handled.
+ */
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format02.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *format1    = workbook_add_format(workbook);
+    lxw_format    *format2    = workbook_add_format(workbook);
+
+    format_set_font_name(format1, "Arial");
+    format_set_bold(format1);
+    format_set_align(format1, LXW_ALIGN_LEFT);
+    format_set_align(format1, LXW_ALIGN_VERTICAL_BOTTOM);
+
+    format_set_font_name(format2, "Arial");
+    format_set_bold(format2);
+    format_set_rotation(format2, 90);
+    format_set_align(format2, LXW_ALIGN_CENTER);
+    format_set_align(format2, LXW_ALIGN_VERTICAL_BOTTOM);
+
+    worksheet_write_string(worksheet, 0, 0, "Foo", format1);
+    worksheet_write_string(worksheet, 0, 1, "Bar", format2);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format06.c b/test/functional/src/test_format06.c
new file mode 100644
index 00000000..4a6d30e6
--- /dev/null
+++ b/test/functional/src/test_format06.c
@@ -0,0 +1,31 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format06.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *format1    = workbook_add_format(workbook);
+    lxw_format    *format2    = workbook_add_format(workbook);
+
+
+    format_set_num_format_index(format1, 2);
+    format_set_num_format_index(format2, 12);
+
+    worksheet_write_number(worksheet, 0, 0, 1.2222, NULL);
+    worksheet_write_number(worksheet, 1, 0, 1.2222, format1);
+    worksheet_write_number(worksheet, 2, 0, 1.2222, format2);
+    worksheet_write_number(worksheet, 3, 0, 1.2222, NULL);
+    worksheet_write_number(worksheet, 4, 0, 1.2222, NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format07.c b/test/functional/src/test_format07.c
new file mode 100644
index 00000000..26b55adf
--- /dev/null
+++ b/test/functional/src/test_format07.c
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format07.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *format1    = workbook_add_format(workbook);
+    lxw_format    *format2    = workbook_add_format(workbook);
+    lxw_format    *format3    = workbook_add_format(workbook);
+
+
+    format_set_num_format(format1, "0.000");
+    format_set_num_format(format2, "0.00000");
+    format_set_num_format(format3, "0.000000");
+
+
+    worksheet_write_number(worksheet, 0, 0, 1.2222, NULL);
+    worksheet_write_number(worksheet, 1, 0, 1.2222, format1);
+    worksheet_write_number(worksheet, 2, 0, 1.2222, format2);
+    worksheet_write_number(worksheet, 3, 0, 1.2222, format3);
+    worksheet_write_number(worksheet, 4, 0, 1.2222, NULL);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format08.c b/test/functional/src/test_format08.c
new file mode 100644
index 00000000..8bcd60db
--- /dev/null
+++ b/test/functional/src/test_format08.c
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format08.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *border1   = workbook_add_format(workbook);
+    lxw_format    *border2   = workbook_add_format(workbook);
+    lxw_format    *border3   = workbook_add_format(workbook);
+    lxw_format    *border4   = workbook_add_format(workbook);
+    lxw_format    *border5   = workbook_add_format(workbook);
+
+
+    format_set_bottom(border1, LXW_BORDER_THIN);
+    format_set_bottom_color(border1, LXW_COLOR_RED);
+
+    format_set_top(border2, LXW_BORDER_THIN);
+    format_set_top_color(border2, LXW_COLOR_RED);
+
+    format_set_left(border3, LXW_BORDER_THIN);
+    format_set_left_color(border3, LXW_COLOR_RED);
+
+    format_set_right(border4, LXW_BORDER_THIN);
+    format_set_right_color(border4, LXW_COLOR_RED);
+
+    format_set_border(border5, LXW_BORDER_THIN);
+    format_set_border_color(border5, LXW_COLOR_RED);
+
+    worksheet_write_blank(worksheet, 1, 1, border1);
+    worksheet_write_blank(worksheet, 3, 1, border2);
+    worksheet_write_blank(worksheet, 5, 1, border3);
+    worksheet_write_blank(worksheet, 7, 1, border4);
+    worksheet_write_blank(worksheet, 9, 1, border5);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format09.c b/test/functional/src/test_format09.c
new file mode 100644
index 00000000..f6bdc7c5
--- /dev/null
+++ b/test/functional/src/test_format09.c
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format09.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *border1   = workbook_add_format(workbook);
+    lxw_format    *border2   = workbook_add_format(workbook);
+    lxw_format    *border3   = workbook_add_format(workbook);
+    lxw_format    *border4   = workbook_add_format(workbook);
+
+
+    format_set_border      (border1, LXW_BORDER_HAIR);
+    format_set_border_color(border1, LXW_COLOR_RED);
+
+    format_set_diag_type (border2, LXW_DIAGONAL_BORDER_UP);
+    format_set_diag_color(border2, LXW_COLOR_RED);
+
+    format_set_diag_type (border3, LXW_DIAGONAL_BORDER_DOWN);
+    format_set_diag_color(border3, LXW_COLOR_RED);
+
+    format_set_diag_type (border4, LXW_DIAGONAL_BORDER_UP_DOWN);
+    format_set_diag_color(border4, LXW_COLOR_RED);
+
+    worksheet_write_blank(worksheet, 1, 1, border1);
+    worksheet_write_blank(worksheet, 3, 1, border2);
+    worksheet_write_blank(worksheet, 5, 1, border3);
+    worksheet_write_blank(worksheet, 7, 1, border4);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/src/test_format10.c b/test/functional/src/test_format10.c
new file mode 100644
index 00000000..5818fc78
--- /dev/null
+++ b/test/functional/src/test_format10.c
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Simple test case to test data writing.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_format10.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+
+    lxw_format    *border1   = workbook_add_format(workbook);
+    lxw_format    *border2   = workbook_add_format(workbook);
+    lxw_format    *border3   = workbook_add_format(workbook);
+
+
+    format_set_bg_color(border1, LXW_COLOR_RED);
+
+    format_set_bg_color(border2, LXW_COLOR_YELLOW);
+    format_set_pattern (border2, LXW_PATTERN_DARK_VERTICAL);
+
+    format_set_bg_color(border3, LXW_COLOR_YELLOW);
+    format_set_fg_color(border3, LXW_COLOR_RED);
+    format_set_pattern (border3, LXW_PATTERN_GRAY_0625);
+
+    worksheet_write_blank(worksheet, 1, 1, border1);
+    worksheet_write_blank(worksheet, 3, 1, border2);
+    worksheet_write_blank(worksheet, 5, 1, border3);
+
+    return workbook_close(workbook);
+}
diff --git a/test/functional/test_formatting.py b/test/functional/test_formatting.py
new file mode 100644
index 00000000..81fb30e6
--- /dev/null
+++ b/test/functional/test_formatting.py
@@ -0,0 +1,37 @@
+###############################################################################
+#
+# Tests for libxlsxwriter.
+#
+# Copyright (c), 2014, John McNamara, jmcnamara@cpan.org
+#
+
+import base_test_class
+
+class TestCompareXLSXFiles(base_test_class.XLSXBaseTest):
+    """
+    Test file created with libxlsxwriter against a file created by Excel.
+
+    """
+
+    def test_format01(self):
+        self.run_exe_test('test_format01')
+
+    def test_format02(self):
+        # TODO. Ignore row height for now until set_row is implemented.
+        self.ignore_elements = {'xl/worksheets/sheet1.xml': ['<row']}
+        self.run_exe_test('test_format02')
+
+    def test_format06(self):
+        self.run_exe_test('test_format06')
+
+    def test_format07(self):
+        self.run_exe_test('test_format07')
+
+    def test_format08(self):
+        self.run_exe_test('test_format08')
+
+    def test_format09(self):
+        self.run_exe_test('test_format09')
+
+    def test_format10(self):
+        self.run_exe_test('test_format10')
diff --git a/test/functional/test_write_data.py b/test/functional/test_write_data.py
new file mode 100644
index 00000000..e6cd82de
--- /dev/null
+++ b/test/functional/test_write_data.py
@@ -0,0 +1,38 @@
+###############################################################################
+#
+# Tests for libxlsxwriter.
+#
+# Copyright (c), 2014, John McNamara, jmcnamara@cpan.org
+#
+
+import base_test_class
+
+class TestCompareXLSXFiles(base_test_class.XLSXBaseTest):
+    """
+    Test file created with libxlsxwriter against a file created by Excel.
+
+    """
+
+    def test_data01(self):
+        self.run_exe_test('test_data01')
+
+    def test_data02(self):
+        self.run_exe_test('test_data02')
+
+    def test_data03(self):
+        self.run_exe_test('test_data03')
+
+    def test_data04(self):
+        self.run_exe_test('test_data04')
+
+    def test_data05(self):
+        self.run_exe_test('test_data05')
+
+    def test_data06(self):
+        self.run_exe_test('test_data06')
+
+    def test_data07(self):
+        self.ignore_files = ['xl/calcChain.xml',
+                             '[Content_Types].xml',
+                             'xl/_rels/workbook.xml.rels']
+        self.run_exe_test('test_data07')
diff --git a/test/functional/xlsx_files/data01.xlsx b/test/functional/xlsx_files/data01.xlsx
new file mode 100644
index 00000000..7c7ab258
Binary files /dev/null and b/test/functional/xlsx_files/data01.xlsx differ
diff --git a/test/functional/xlsx_files/data02.xlsx b/test/functional/xlsx_files/data02.xlsx
new file mode 100644
index 00000000..e6211ed4
Binary files /dev/null and b/test/functional/xlsx_files/data02.xlsx differ
diff --git a/test/functional/xlsx_files/data03.xlsx b/test/functional/xlsx_files/data03.xlsx
new file mode 100644
index 00000000..6fcd0222
Binary files /dev/null and b/test/functional/xlsx_files/data03.xlsx differ
diff --git a/test/functional/xlsx_files/data04.xlsx b/test/functional/xlsx_files/data04.xlsx
new file mode 100644
index 00000000..227bd877
Binary files /dev/null and b/test/functional/xlsx_files/data04.xlsx differ
diff --git a/test/functional/xlsx_files/data05.xlsx b/test/functional/xlsx_files/data05.xlsx
new file mode 100644
index 00000000..42c2e854
Binary files /dev/null and b/test/functional/xlsx_files/data05.xlsx differ
diff --git a/test/functional/xlsx_files/data06.xlsx b/test/functional/xlsx_files/data06.xlsx
new file mode 100644
index 00000000..e8753321
Binary files /dev/null and b/test/functional/xlsx_files/data06.xlsx differ
diff --git a/test/functional/xlsx_files/data07.xlsx b/test/functional/xlsx_files/data07.xlsx
new file mode 100644
index 00000000..50d6054e
Binary files /dev/null and b/test/functional/xlsx_files/data07.xlsx differ
diff --git a/test/functional/xlsx_files/format01.xlsx b/test/functional/xlsx_files/format01.xlsx
new file mode 100644
index 00000000..be7a8c95
Binary files /dev/null and b/test/functional/xlsx_files/format01.xlsx differ
diff --git a/test/functional/xlsx_files/format02.xlsx b/test/functional/xlsx_files/format02.xlsx
new file mode 100644
index 00000000..76a26a72
Binary files /dev/null and b/test/functional/xlsx_files/format02.xlsx differ
diff --git a/test/functional/xlsx_files/format06.xlsx b/test/functional/xlsx_files/format06.xlsx
new file mode 100644
index 00000000..04e0ff54
Binary files /dev/null and b/test/functional/xlsx_files/format06.xlsx differ
diff --git a/test/functional/xlsx_files/format07.xlsx b/test/functional/xlsx_files/format07.xlsx
new file mode 100644
index 00000000..0bf15a6e
Binary files /dev/null and b/test/functional/xlsx_files/format07.xlsx differ
diff --git a/test/functional/xlsx_files/format08.xlsx b/test/functional/xlsx_files/format08.xlsx
new file mode 100644
index 00000000..920b1419
Binary files /dev/null and b/test/functional/xlsx_files/format08.xlsx differ
diff --git a/test/functional/xlsx_files/format09.xlsx b/test/functional/xlsx_files/format09.xlsx
new file mode 100644
index 00000000..e62f7d53
Binary files /dev/null and b/test/functional/xlsx_files/format09.xlsx differ
diff --git a/test/functional/xlsx_files/format10.xlsx b/test/functional/xlsx_files/format10.xlsx
new file mode 100644
index 00000000..18542ee1
Binary files /dev/null and b/test/functional/xlsx_files/format10.xlsx differ
diff --git a/test/unit/Makefile b/test/unit/Makefile
new file mode 100644
index 00000000..ba9edd15
--- /dev/null
+++ b/test/unit/Makefile
@@ -0,0 +1,96 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Directory variables.
+INC_DIR        = ../../include
+LIB_DIR        = ../../src$
+GTEST_DIR      = /usr/lib
+
+# Conditional includes for testing.
+TESTING = -DTESTING
+
+# Flags passed to the preprocessor.
+CPPFLAGS += $(TESTING)
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra
+
+
+# All tests produced by this Makefile.
+TESTS = test_all
+
+# Objects to link for test_all executable.
+SRCS  = $(wildcard utility/test*.cpp)
+SRCS += $(wildcard xmlwriter/test*.cpp)
+SRCS += $(wildcard worksheet/test*.cpp)
+SRCS += $(wildcard sst/test*.cpp)
+SRCS += $(wildcard workbook/test*.cpp)
+SRCS += $(wildcard app/test*.cpp)
+SRCS += $(wildcard content_types/test*.cpp)
+SRCS += $(wildcard core/test*.cpp)
+SRCS += $(wildcard relationships/test*.cpp)
+SRCS += $(wildcard format/test*.cpp)
+SRCS += $(wildcard styles/test*.cpp)
+# End of SRCS
+
+OBJS  = $(patsubst %.cpp,%.o,$(SRCS))
+
+# Libs to link.
+LIBS_A = $(LIB_DIR)/libxlsxwriter.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
+LIBS_O = -lpthread -lz
+# End of LIBS
+
+# House-keeping build targets.
+all :
+	$(Q)make -C utility
+	$(Q)make -C xmlwriter
+	$(Q)make -C worksheet
+	$(Q)make -C sst
+	$(Q)make -C workbook
+	$(Q)make -C app
+	$(Q)make -C content_types
+	$(Q)make -C core
+	$(Q)make -C relationships
+	$(Q)make -C styles
+# END make all
+
+clean :
+	$(Q)rm -f $(TESTS) test_all
+	$(Q)make clean -C utility
+	$(Q)make clean -C xmlwriter
+	$(Q)make clean -C worksheet
+	$(Q)make clean -C sst
+	$(Q)make clean -C workbook
+	$(Q)make clean -C app
+	$(Q)make clean -C content_types
+	$(Q)make clean -C core
+	$(Q)make clean -C relationships
+	$(Q)make clean -C styles
+# END make clean
+
+
+###############################################################################
+#
+# Builds the tests.
+#
+test_all : $(OBJS) $(LIBS_A)
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(INC_DIR) -o $@ $^ $(LIBS_O)
+
+
+###############################################################################
+#
+# Run the tests.
+#
+test : all test_all
+	$(Q)./test_all
+
diff --git a/test/unit/Makefile.unit b/test/unit/Makefile.unit
new file mode 100644
index 00000000..f5a9b294
--- /dev/null
+++ b/test/unit/Makefile.unit
@@ -0,0 +1,57 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+# Directory variables.
+INC_DIR        = ../../../include
+LIB_DIR        = ../../../src
+GTEST_DIR      = /usr/lib
+
+# Conditional includes for testing.
+TESTING = -DTESTING
+
+# Flags passed to the preprocessor.
+CPPFLAGS += $(TESTING)
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra
+
+# Make targets and objects.
+SRCS  = $(wildcard test*.cpp)
+TESTS = $(patsubst %.cpp,%,$(SRCS))
+OBJS  = $(patsubst %.cpp,%.o,$(SRCS))
+
+# Libs to link.
+LIBS_A = $(LIB_DIR)/libxlsxwriter.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
+LIBS_O = -lpthread -lz
+
+# Make all the individual tests.
+all : $(TESTS)
+
+# Clean all the things!
+clean :
+	$(Q)rm -f $(TESTS) test_all test*.o
+
+# Build the testscases.
+test_%.o: test_%.cpp
+	$(Q)$(CXX) -I$(INC_DIR) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+test_%: test_%.o $(LIBS_A)
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS_O)
+
+# Link all the tests into one test executable.
+test_all : $(OBJS) $(LIBS_A)
+	$(Q)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS_O)
+
+# Run the tests.
+test : all test_all
+	$(Q)./test_all
diff --git a/test/unit/app/Makefile b/test/unit/app/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/app/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/app/test_app.cpp b/test/unit/app/test_app.cpp
new file mode 100644
index 00000000..335fbd56
--- /dev/null
+++ b/test/unit/app/test_app.cpp
@@ -0,0 +1,168 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/app.h"
+
+// Test assembling a complete App file.
+TEST(app, app01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\">"
+          "<Application>Microsoft Excel</Application>"
+          "<DocSecurity>0</DocSecurity>"
+          "<ScaleCrop>false</ScaleCrop>"
+          "<HeadingPairs>"
+            "<vt:vector size=\"2\" baseType=\"variant\">"
+              "<vt:variant>"
+                "<vt:lpstr>Worksheets</vt:lpstr>"
+              "</vt:variant>"
+              "<vt:variant>"
+                "<vt:i4>1</vt:i4>"
+              "</vt:variant>"
+            "</vt:vector>"
+          "</HeadingPairs>"
+          "<TitlesOfParts>"
+            "<vt:vector size=\"1\" baseType=\"lpstr\">"
+              "<vt:lpstr>Sheet1</vt:lpstr>"
+            "</vt:vector>"
+          "</TitlesOfParts>"
+          "<Company>"
+          "</Company>"
+          "<LinksUpToDate>false</LinksUpToDate>"
+          "<SharedDoc>false</SharedDoc>"
+          "<HyperlinksChanged>false</HyperlinksChanged>"
+          "<AppVersion>12.0000</AppVersion>"
+        "</Properties>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_app *app = _new_app();
+    app->file = testfile;
+
+    _add_part_name(app,"Sheet1");
+    _add_heading_pair(app, "Worksheets", "1");
+
+    _app_assemble_xml_file(app);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_app(app);
+}
+
+// Test assembling a complete App file.
+TEST(app, app02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\">"
+          "<Application>Microsoft Excel</Application>"
+          "<DocSecurity>0</DocSecurity>"
+          "<ScaleCrop>false</ScaleCrop>"
+          "<HeadingPairs>"
+            "<vt:vector size=\"2\" baseType=\"variant\">"
+              "<vt:variant>"
+                "<vt:lpstr>Worksheets</vt:lpstr>"
+              "</vt:variant>"
+              "<vt:variant>"
+                "<vt:i4>2</vt:i4>"
+              "</vt:variant>"
+            "</vt:vector>"
+          "</HeadingPairs>"
+          "<TitlesOfParts>"
+            "<vt:vector size=\"2\" baseType=\"lpstr\">"
+              "<vt:lpstr>Sheet1</vt:lpstr>"
+              "<vt:lpstr>Sheet2</vt:lpstr>"
+            "</vt:vector>"
+          "</TitlesOfParts>"
+          "<Company>"
+          "</Company>"
+          "<LinksUpToDate>false</LinksUpToDate>"
+          "<SharedDoc>false</SharedDoc>"
+          "<HyperlinksChanged>false</HyperlinksChanged>"
+          "<AppVersion>12.0000</AppVersion>"
+        "</Properties>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_app *app = _new_app();
+    app->file = testfile;
+
+    _add_part_name(app,"Sheet1");
+    _add_part_name(app,"Sheet2");
+    _add_heading_pair(app, "Worksheets", "2");
+
+    _app_assemble_xml_file(app);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_app(app);
+}
+
+
+// Test assembling a complete App file.
+TEST(app, app03) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\">"
+          "<Application>Microsoft Excel</Application>"
+          "<DocSecurity>0</DocSecurity>"
+          "<ScaleCrop>false</ScaleCrop>"
+          "<HeadingPairs>"
+            "<vt:vector size=\"4\" baseType=\"variant\">"
+              "<vt:variant>"
+                "<vt:lpstr>Worksheets</vt:lpstr>"
+              "</vt:variant>"
+              "<vt:variant>"
+                "<vt:i4>1</vt:i4>"
+              "</vt:variant>"
+              "<vt:variant>"
+                "<vt:lpstr>Named Ranges</vt:lpstr>"
+              "</vt:variant>"
+              "<vt:variant>"
+                "<vt:i4>1</vt:i4>"
+              "</vt:variant>"
+            "</vt:vector>"
+          "</HeadingPairs>"
+          "<TitlesOfParts>"
+            "<vt:vector size=\"2\" baseType=\"lpstr\">"
+              "<vt:lpstr>Sheet1</vt:lpstr>"
+              "<vt:lpstr>Sheet1!Print_Titles</vt:lpstr>"
+            "</vt:vector>"
+          "</TitlesOfParts>"
+          "<Company>"
+          "</Company>"
+          "<LinksUpToDate>false</LinksUpToDate>"
+          "<SharedDoc>false</SharedDoc>"
+          "<HyperlinksChanged>false</HyperlinksChanged>"
+          "<AppVersion>12.0000</AppVersion>"
+        "</Properties>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_app *app = _new_app();
+    app->file = testfile;
+
+    _add_part_name(app,"Sheet1");
+    _add_part_name(app,"Sheet1!Print_Titles");
+    _add_heading_pair(app, "Worksheets", "1");
+    _add_heading_pair(app, "Named Ranges", "1");
+
+    _app_assemble_xml_file(app);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_app(app);
+}
+
diff --git a/test/unit/app/test_app_xml_declaration.cpp b/test/unit/app/test_app_xml_declaration.cpp
new file mode 100644
index 00000000..965f3a8f
--- /dev/null
+++ b/test/unit/app/test_app_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/app.h"
+
+// Test _xml_declaration().
+TEST(app, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_app *app = _new_app();
+    app->file = testfile;
+
+    _app_xml_declaration(app);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_app(app);
+}
diff --git a/test/unit/content_types/Makefile b/test/unit/content_types/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/content_types/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/content_types/test_content_types.cpp b/test/unit/content_types/test_content_types.cpp
new file mode 100644
index 00000000..96801dac
--- /dev/null
+++ b/test/unit/content_types/test_content_types.cpp
@@ -0,0 +1,50 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/content_types.h"
+
+// Test assembling a complete ContentTypes file.
+TEST(content_types, content_types01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Types xmlns=\"http://schemas.openxmlformats.org/package/2006/content-types\">"
+
+          "<Default Extension=\"rels\" ContentType=\"application/vnd.openxmlformats-package.relationships+xml\"/>"
+          "<Default Extension=\"xml\" ContentType=\"application/xml\"/>"
+          "<Default Extension=\"jpeg\" ContentType=\"image/jpeg\"/>"
+
+          "<Override PartName=\"/docProps/app.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.extended-properties+xml\"/>"
+          "<Override PartName=\"/docProps/core.xml\" ContentType=\"application/vnd.openxmlformats-package.core-properties+xml\"/>"
+          "<Override PartName=\"/xl/styles.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml\"/>"
+          "<Override PartName=\"/xl/theme/theme1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.theme+xml\"/>"
+          "<Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>"
+          "<Override PartName=\"/xl/worksheets/sheet1.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/>"
+          "<Override PartName=\"/xl/sharedStrings.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml\"/>"
+          "<Override PartName=\"/xl/calcChain.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml\"/>"
+        "</Types>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_content_types *content_types = _new_content_types();
+    content_types->file = testfile;
+
+    _ct_add_worksheet_name(content_types, "sheet1");
+    _ct_add_default(content_types, "jpeg", "image/jpeg");
+    _ct_add_shared_strings(content_types);
+    _ct_add_calc_chain(content_types);
+
+    _content_types_assemble_xml_file(content_types);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_content_types(content_types);
+}
diff --git a/test/unit/content_types/test_content_types_write_default.cpp b/test/unit/content_types/test_content_types_write_default.cpp
new file mode 100644
index 00000000..0e0dda53
--- /dev/null
+++ b/test/unit/content_types/test_content_types_write_default.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/content_types.h"
+
+// Test the _write_default() function.
+TEST(content_types, write_default) {
+
+    char* got;
+    char exp[] = "<Default Extension=\"xml\" ContentType=\"application/xml\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_content_types *content_types = _new_content_types();
+    content_types->file = testfile;
+
+    _write_default(content_types, "xml", "application/xml");
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_content_types(content_types);
+}
+
diff --git a/test/unit/content_types/test_content_types_write_override.cpp b/test/unit/content_types/test_content_types_write_override.cpp
new file mode 100644
index 00000000..b52a9fd8
--- /dev/null
+++ b/test/unit/content_types/test_content_types_write_override.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/content_types.h"
+
+// Test the _write_override() function.
+TEST(content_types, write_override) {
+
+    char* got;
+    char exp[] = "<Override PartName=\"/docProps/core.xml\" ContentType=\"app...\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_content_types *content_types = _new_content_types();
+    content_types->file = testfile;
+
+    _write_override(content_types, "/docProps/core.xml", "app...");
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_content_types(content_types);
+}
+
diff --git a/test/unit/content_types/test_content_types_xml_declaration.cpp b/test/unit/content_types/test_content_types_xml_declaration.cpp
new file mode 100644
index 00000000..ed352820
--- /dev/null
+++ b/test/unit/content_types/test_content_types_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/content_types.h"
+
+// Test _xml_declaration().
+TEST(content_types, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_content_types *content_types = _new_content_types();
+    content_types->file = testfile;
+
+    _content_types_xml_declaration(content_types);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_content_types(content_types);
+}
diff --git a/test/unit/core/Makefile b/test/unit/core/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/core/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/core/test_core.cpp b/test/unit/core/test_core.cpp
new file mode 100644
index 00000000..b1dca05a
--- /dev/null
+++ b/test/unit/core/test_core.cpp
@@ -0,0 +1,109 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/core.h"
+#include "xlsxwriter/workbook.h"
+
+// Test assembling a complete core file.
+TEST(core, core01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<cp:coreProperties xmlns:cp=\"http://schemas.openxmlformats.org/package/2006/metadata/core-properties\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcmitype=\"http://purl.org/dc/dcmitype/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
+          "<dc:creator>A User</dc:creator>"
+          "<cp:lastModifiedBy>A User</cp:lastModifiedBy>"
+          "<dcterms:created xsi:type=\"dcterms:W3CDTF\">2010-01-01T00:00:00Z</dcterms:created>"
+          "<dcterms:modified xsi:type=\"dcterms:W3CDTF\">2010-01-01T00:00:00Z</dcterms:modified>"
+        "</cp:coreProperties>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_core *core = _new_core();
+    lxw_workbook *workbook = new_workbook(NULL);
+
+    core->file = testfile;
+    core->properties = workbook->properties;
+
+    // Add data to the core->properties.
+    struct tm tmp_tm;
+    tmp_tm.tm_year  = 110;
+    tmp_tm.tm_mon   = 0;
+    tmp_tm.tm_mday  = 1;
+    tmp_tm.tm_hour  = 0;
+    tmp_tm.tm_min   = 0;
+    tmp_tm.tm_sec   = 0;
+    tmp_tm.tm_isdst = -1;
+
+    core->properties->created = mktime(&tmp_tm);
+    core->properties->author  = strdup("A User");
+
+    _core_assemble_xml_file(core);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_workbook(workbook);
+    _free_core(core);
+}
+
+
+// Test assembling a complete core file.
+TEST(core, core02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<cp:coreProperties xmlns:cp=\"http://schemas.openxmlformats.org/package/2006/metadata/core-properties\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:dcterms=\"http://purl.org/dc/terms/\" xmlns:dcmitype=\"http://purl.org/dc/dcmitype/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
+          "<dc:title>This is an example spreadsheet</dc:title>"
+          "<dc:subject>With document properties</dc:subject>"
+          "<dc:creator>A Person</dc:creator>"
+          "<cp:keywords>Sample, Example, Properties</cp:keywords>"
+          "<dc:description>Created with libxlsxwriter</dc:description>"
+          "<cp:lastModifiedBy>A Person</cp:lastModifiedBy>"
+          "<dcterms:created xsi:type=\"dcterms:W3CDTF\">2011-04-06T19:45:15Z</dcterms:created>"
+          "<dcterms:modified xsi:type=\"dcterms:W3CDTF\">2011-04-06T19:45:15Z</dcterms:modified>"
+          "<cp:category>Example spreadsheets</cp:category>"
+          "<cp:contentStatus>Quo</cp:contentStatus>"
+        "</cp:coreProperties>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_core *core = _new_core();
+    lxw_workbook *workbook = new_workbook(NULL);
+
+    core->file = testfile;
+    core->properties = workbook->properties;
+
+    // Add data to the core->properties.
+    struct tm tmp_tm;
+    tmp_tm.tm_year  = 111;
+    tmp_tm.tm_mon   = 3;
+    tmp_tm.tm_mday  = 6;
+    tmp_tm.tm_hour  = 19;
+    tmp_tm.tm_min   = 45;
+    tmp_tm.tm_sec   = 15;
+    tmp_tm.tm_isdst = -1;
+
+    core->properties->created  = mktime(&tmp_tm);
+    core->properties->title    = strdup("This is an example spreadsheet");
+    core->properties->subject  = strdup("With document properties");
+    core->properties->author   = strdup("A Person");
+    core->properties->keywords = strdup("Sample, Example, Properties");
+    core->properties->comments = strdup("Created with libxlsxwriter");
+    core->properties->category = strdup("Example spreadsheets");
+    core->properties->status   = strdup("Quo");
+
+    _core_assemble_xml_file(core);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_workbook(workbook);
+    _free_core(core);
+}
diff --git a/test/unit/core/test_core_xml_declaration.cpp b/test/unit/core/test_core_xml_declaration.cpp
new file mode 100644
index 00000000..3e3b3567
--- /dev/null
+++ b/test/unit/core/test_core_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/core.h"
+
+// Test _xml_declaration().
+TEST(core, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_core *core = _new_core();
+    core->file = testfile;
+
+    _core_xml_declaration(core);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_core(core);
+}
diff --git a/test/unit/helper.h b/test/unit/helper.h
new file mode 100644
index 00000000..002696c2
--- /dev/null
+++ b/test/unit/helper.h
@@ -0,0 +1,124 @@
+
+#ifndef TESTING
+#define TESTING
+#endif
+
+/* Compare expected results with the XML data written to the output
+ * test file.
+ */
+#define RUN_XLSX_STREQ(exp, got)                                    \
+    fflush(testfile);                                               \
+    int file_size = ftell(testfile);                                \
+                                                                    \
+    got = (char*)calloc(file_size + 1, 1);                          \
+                                                                    \
+    rewind(testfile);                                               \
+    fread(got, file_size, 1, testfile);                             \
+                                                                    \
+    EXPECT_STREQ((exp), (got));                                     \
+                                                                    \
+    if (got)                                                        \
+        free(got);                                                  \
+                                                                    \
+    fclose(testfile)
+
+/* Compare expected results with the XML data written to the output
+ * test file. Same as the previous macro but only shows the difference
+ * from where it starts. Suitable for long strings of XML data.
+ */
+#define RUN_XLSX_STREQ_SHORT(exp, got)                              \
+    fflush(testfile);                                               \
+    int file_size = ftell(testfile);                                \
+                                                                    \
+    got = (char*)calloc(file_size + 1, 1);                          \
+                                                                    \
+    rewind(testfile);                                               \
+    fread(got, file_size, 1, testfile);                             \
+                                                                    \
+    /* Start comparison from first difference. */                   \
+    char *got_short = got;                                          \
+    char *exp_short = exp;                                          \
+    while (*exp_short && *exp_short == *got_short) {                \
+        exp_short++;                                                \
+        got_short++;                                                \
+    }                                                               \
+                                                                    \
+    EXPECT_STREQ(exp_short, got_short);                             \
+                                                                    \
+    if (got)                                                        \
+        free(got);                                                  \
+                                                                    \
+    fclose(testfile)
+
+
+#define TEST_COL_TO_NAME(num, abs, exp)                             \
+    _xl_col_to_name(got, num, abs);                                 \
+    EXPECT_STREQ(exp, got);
+
+
+#define TEST_ROWCOL_TO_CELL(row, col, exp)                          \
+    xl_rowcol_to_cell(got, row, col);                               \
+    EXPECT_STREQ(exp, got);
+
+
+#define TEST_ROWCOL_TO_CELL_ABS(row, col, row_abs, col_abs, exp)    \
+    xl_rowcol_to_cell_abs(got, row, col, row_abs, col_abs);         \
+    EXPECT_STREQ(exp, got);
+
+
+#define TEST_XL_RANGE(row1, col1, row2, col2, exp)                  \
+    xl_range(got, row1, col1, row2, col2);                          \
+    EXPECT_STREQ(exp, got);
+
+
+#define TEST_XL_RANGE_ABS(row1, col1, row2, col2, exp)              \
+    xl_range_abs(got, row1, col1, row2, col2);                      \
+    EXPECT_STREQ(exp, got);
+
+
+#define TEST_DATETIME_TIME(_hour, _min, _sec, exp)                  \
+    datetime = (lxw_datetime*)calloc(1, sizeof(lxw_datetime));      \
+    datetime->hour  = _hour;                                        \
+    datetime->min   = _min;                                         \
+    datetime->sec   = _sec;                                         \
+                                                                    \
+    got = _datetime_to_excel_date(datetime, 0);                     \
+                                                                    \
+    ASSERT_DOUBLE_EQ(exp, got);                                     \
+    free(datetime);
+
+#define TEST_DATETIME_DATE(_year, _month, _day, exp)                \
+    datetime = (lxw_datetime*)calloc(1, sizeof(lxw_datetime));      \
+    datetime->year  = _year;                                        \
+    datetime->month = _month;                                       \
+    datetime->day   = _day;                                         \
+                                                                    \
+    got = _datetime_to_excel_date(datetime, 0);                     \
+                                                                    \
+    ASSERT_DOUBLE_EQ(exp, got);                                     \
+    free(datetime);
+
+#define TEST_DATETIME_DATE_1904(_year, _month, _day, exp)           \
+    datetime = (lxw_datetime*)calloc(1, sizeof(lxw_datetime));      \
+    datetime->year  = _year;                                        \
+    datetime->month = _month;                                       \
+    datetime->day   = _day;                                         \
+                                                                    \
+    got = _datetime_to_excel_date(datetime, 1);                     \
+                                                                    \
+    ASSERT_DOUBLE_EQ(exp, got);                                     \
+    free(datetime);
+
+#define TEST_DATETIME(_year, _month, _day, _hour, _min, _sec, exp)  \
+    datetime = (lxw_datetime*)calloc(1, sizeof(lxw_datetime));      \
+    datetime->year  = _year;                                        \
+    datetime->month = _month;                                       \
+    datetime->day   = _day;                                         \
+    datetime->hour  = _hour;                                        \
+    datetime->min   = _min;                                         \
+    datetime->sec   = _sec;                                         \
+                                                                    \
+    got = _datetime_to_excel_date(datetime, 0);                     \
+                                                                    \
+    ASSERT_DOUBLE_EQ(exp, got);                                     \
+    free(datetime);
diff --git a/test/unit/relationships/Makefile b/test/unit/relationships/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/relationships/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/relationships/test_relationships.cpp b/test/unit/relationships/test_relationships.cpp
new file mode 100644
index 00000000..bd3b29a0
--- /dev/null
+++ b/test/unit/relationships/test_relationships.cpp
@@ -0,0 +1,70 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/relationships.h"
+
+// Test assembling a complete Relationships file.
+TEST(relationships, relationships01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
+          "<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet\" Target=\"worksheets/sheet1.xml\"/>"
+          "<Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme\" Target=\"theme/theme1.xml\"/>"
+          "<Relationship Id=\"rId3\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/>"
+          "<Relationship Id=\"rId4\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings\" Target=\"sharedStrings.xml\"/>"
+          "<Relationship Id=\"rId5\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain\" Target=\"calcChain.xml\"/>"
+        "</Relationships>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_relationships *rels = _new_relationships();
+    rels->file = testfile;
+
+    _add_document_relationship(rels, "/worksheet",     "worksheets/sheet1.xml");
+    _add_document_relationship(rels, "/theme",         "theme/theme1.xml");
+    _add_document_relationship(rels, "/styles",        "styles.xml");
+    _add_document_relationship(rels, "/sharedStrings", "sharedStrings.xml");
+    _add_document_relationship(rels, "/calcChain",     "calcChain.xml");
+
+
+    _relationships_assemble_xml_file(rels);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_relationships(rels);
+}
+
+// Test assembling a complete Relationships file.
+TEST(relationships, relationships02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">"
+          "<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink\" Target=\"www.foo.com\" TargetMode=\"External\"/>"
+          "<Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink\" Target=\"link00.xlsx\" TargetMode=\"External\"/>"
+        "</Relationships>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_relationships *rels = _new_relationships();
+    rels->file = testfile;
+
+    _add_worksheet_relationship(rels, "/hyperlink", "www.foo.com", "External");
+    _add_worksheet_relationship(rels, "/hyperlink", "link00.xlsx", "External");
+
+    _relationships_assemble_xml_file(rels);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_relationships(rels);
+}
diff --git a/test/unit/relationships/test_relationships_xml_declaration.cpp b/test/unit/relationships/test_relationships_xml_declaration.cpp
new file mode 100644
index 00000000..8f0df583
--- /dev/null
+++ b/test/unit/relationships/test_relationships_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/relationships.h"
+
+// Test _xml_declaration().
+TEST(relationships, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_relationships *relationships = _new_relationships();
+    relationships->file = testfile;
+
+    _relationships_xml_declaration(relationships);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_relationships(relationships);
+}
diff --git a/test/unit/sst/Makefile b/test/unit/sst/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/sst/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/sst/test_shared_strings.cpp b/test/unit/sst/test_shared_strings.cpp
new file mode 100644
index 00000000..dfb5f67f
--- /dev/null
+++ b/test/unit/sst/test_shared_strings.cpp
@@ -0,0 +1,85 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/shared_strings.h"
+
+// Test assembling a complete SharedStrings file.
+TEST(sst, sst01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<sst xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" count=\"7\" uniqueCount=\"3\">"
+          "<si>"
+            "<t>neptune</t>"
+          "</si>"
+          "<si>"
+            "<t>mars</t>"
+          "</si>"
+          "<si>"
+            "<t>venus</t>"
+          "</si>"
+        "</sst>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_sst *sst = _new_sst();
+    sst->file = testfile;
+
+    _get_sst_index(sst, "neptune");
+    _get_sst_index(sst, "neptune");
+    _get_sst_index(sst, "neptune");
+    _get_sst_index(sst, "mars");
+    _get_sst_index(sst, "mars");
+    _get_sst_index(sst, "venus");
+    _get_sst_index(sst, "venus");
+
+    _sst_assemble_xml_file(sst);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_sst(sst);
+}
+
+// Test assembling a complete SharedStrings file.
+TEST(sst, sst02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<sst xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" count=\"3\" uniqueCount=\"3\">"
+          "<si>"
+            "<t>abcdefg</t>"
+          "</si>"
+          "<si>"
+            "<t xml:space=\"preserve\">   abcdefg</t>"
+          "</si>"
+          "<si>"
+            "<t xml:space=\"preserve\">abcdefg   </t>"
+          "</si>"
+        "</sst>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_sst *sst = _new_sst();
+    sst->file = testfile;
+
+    // Test strings with whitespace that must be preserved.
+    _get_sst_index(sst, "abcdefg");
+    _get_sst_index(sst, "   abcdefg");
+    _get_sst_index(sst, "abcdefg   ");
+
+    _sst_assemble_xml_file(sst);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_sst(sst);
+}
+
diff --git a/test/unit/sst/test_sst_xml_declaration.cpp b/test/unit/sst/test_sst_xml_declaration.cpp
new file mode 100644
index 00000000..dec0f0a3
--- /dev/null
+++ b/test/unit/sst/test_sst_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/shared_strings.h"
+
+// Test _xml_declaration().
+TEST(sst, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_sst *sst = _new_sst();
+    sst->file = testfile;
+
+    _sst_xml_declaration(sst);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_sst(sst);
+}
diff --git a/test/unit/styles/Makefile b/test/unit/styles/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/styles/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/styles/test_styles.cpp b/test/unit/styles/test_styles.cpp
new file mode 100644
index 00000000..526f8415
--- /dev/null
+++ b/test/unit/styles/test_styles.cpp
@@ -0,0 +1,197 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test assembling a complete Styles file.
+TEST(styles, styles01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">"
+          "<fonts count=\"1\">"
+            "<font>"
+              "<sz val=\"11\"/>"
+              "<color theme=\"1\"/>"
+              "<name val=\"Calibri\"/>"
+              "<family val=\"2\"/>"
+              "<scheme val=\"minor\"/>"
+            "</font>"
+          "</fonts>"
+          "<fills count=\"2\">"
+            "<fill>"
+              "<patternFill patternType=\"none\"/>"
+            "</fill>"
+            "<fill>"
+              "<patternFill patternType=\"gray125\"/>"
+            "</fill>"
+          "</fills>"
+          "<borders count=\"1\">"
+            "<border>"
+              "<left/>"
+              "<right/>"
+              "<top/>"
+              "<bottom/>"
+              "<diagonal/>"
+            "</border>"
+          "</borders>"
+          "<cellStyleXfs count=\"1\">"
+            "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/>"
+          "</cellStyleXfs>"
+          "<cellXfs count=\"1\">"
+            "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/>"
+          "</cellXfs>"
+          "<cellStyles count=\"1\">"
+            "<cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/>"
+          "</cellStyles>"
+          "<dxfs count=\"0\"/>"
+          "<tableStyles count=\"0\" defaultTableStyle=\"TableStyleMedium9\" defaultPivotStyle=\"PivotStyleLight16\"/>"
+        "</styleSheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format->has_font   = 1;
+    format->has_border = 1;
+
+    styles->file = testfile;
+    styles->font_count = 1;
+    styles->border_count = 1;
+    styles->fill_count = 2;
+    styles->xf_count = 1;
+
+    STAILQ_INSERT_TAIL(styles->xf_formats, format, list_pointers);
+
+    _styles_assemble_xml_file(styles);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_styles(styles);
+}
+
+// Test assembling a complete Styles file.
+TEST(styles, styles02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">"
+          "<fonts count=\"4\">"
+            "<font>"
+              "<sz val=\"11\"/>"
+              "<color theme=\"1\"/>"
+              "<name val=\"Calibri\"/>"
+              "<family val=\"2\"/>"
+              "<scheme val=\"minor\"/>"
+            "</font>"
+            "<font>"
+              "<b/>"
+              "<sz val=\"11\"/>"
+              "<color theme=\"1\"/>"
+              "<name val=\"Calibri\"/>"
+              "<family val=\"2\"/>"
+              "<scheme val=\"minor\"/>"
+            "</font>"
+            "<font>"
+              "<i/>"
+              "<sz val=\"11\"/>"
+              "<color theme=\"1\"/>"
+              "<name val=\"Calibri\"/>"
+              "<family val=\"2\"/>"
+              "<scheme val=\"minor\"/>"
+            "</font>"
+            "<font>"
+              "<b/>"
+              "<i/>"
+              "<sz val=\"11\"/>"
+              "<color theme=\"1\"/>"
+              "<name val=\"Calibri\"/>"
+              "<family val=\"2\"/>"
+              "<scheme val=\"minor\"/>"
+            "</font>"
+          "</fonts>"
+          "<fills count=\"2\">"
+            "<fill>"
+              "<patternFill patternType=\"none\"/>"
+            "</fill>"
+            "<fill>"
+              "<patternFill patternType=\"gray125\"/>"
+            "</fill>"
+          "</fills>"
+          "<borders count=\"1\">"
+            "<border>"
+              "<left/>"
+              "<right/>"
+              "<top/>"
+              "<bottom/>"
+              "<diagonal/>"
+            "</border>"
+          "</borders>"
+          "<cellStyleXfs count=\"1\">"
+            "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/>"
+          "</cellStyleXfs>"
+          "<cellXfs count=\"4\">"
+            "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/>"
+            "<xf numFmtId=\"0\" fontId=\"1\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>"
+            "<xf numFmtId=\"0\" fontId=\"2\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>"
+            "<xf numFmtId=\"0\" fontId=\"3\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>"
+          "</cellXfs>"
+          "<cellStyles count=\"1\">"
+            "<cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/>"
+          "</cellStyles>"
+          "<dxfs count=\"0\"/>"
+          "<tableStyles count=\"0\" defaultTableStyle=\"TableStyleMedium9\" defaultPivotStyle=\"PivotStyleLight16\"/>"
+        "</styleSheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format1 = _new_format();
+    lxw_format *format2 = _new_format();
+    lxw_format *format3 = _new_format();
+    lxw_format *format4 = _new_format();
+
+
+    format1->has_font = 1;
+    format1->has_border = 1;
+
+    format2->bold = 1;
+    format2->font_index = 1;
+    format2->has_font = 1;
+
+    format3->italic = 1;
+    format3->font_index = 2;
+    format3->has_font = 1;
+
+    format4->bold = 1;
+    format4->italic = 1;
+    format4->font_index = 3;
+    format4->has_font = 1;
+
+    styles->file = testfile;
+    styles->font_count = 4;
+    styles->border_count = 1;
+    styles->fill_count = 2;
+    styles->xf_count = 4;
+
+    STAILQ_INSERT_TAIL(styles->xf_formats, format1, list_pointers);
+    STAILQ_INSERT_TAIL(styles->xf_formats, format2, list_pointers);
+    STAILQ_INSERT_TAIL(styles->xf_formats, format3, list_pointers);
+    STAILQ_INSERT_TAIL(styles->xf_formats, format4, list_pointers);
+
+    _styles_assemble_xml_file(styles);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_styles(styles);
+}
diff --git a/test/unit/styles/test_styles_write_border.cpp b/test/unit/styles/test_styles_write_border.cpp
new file mode 100644
index 00000000..c8e093c1
--- /dev/null
+++ b/test/unit/styles/test_styles_write_border.cpp
@@ -0,0 +1,31 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_border() function.
+TEST(styles, write_border) {
+
+    char* got;
+    char exp[] = "<border><left/><right/><top/><bottom/><diagonal/></border>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    styles->file = testfile;
+
+    _write_border(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_borders.cpp b/test/unit/styles/test_styles_write_borders.cpp
new file mode 100644
index 00000000..225d694e
--- /dev/null
+++ b/test/unit/styles/test_styles_write_borders.cpp
@@ -0,0 +1,37 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_borders() function.
+TEST(styles, write_borders) {
+
+    char* got;
+    char exp[] = "<borders count=\"1\"><border><left/><right/><top/><bottom/><diagonal/></border></borders>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format->has_border = 1;
+
+    STAILQ_INSERT_TAIL(styles->xf_formats, format, list_pointers);
+
+    styles->file = testfile;
+
+    styles->border_count = 1;
+
+    _write_borders(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_cell_style.cpp b/test/unit/styles/test_styles_write_cell_style.cpp
new file mode 100644
index 00000000..dc14736e
--- /dev/null
+++ b/test/unit/styles/test_styles_write_cell_style.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_cell_style() function.
+TEST(styles, write_cell_style) {
+
+    char* got;
+    char exp[] = "<cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_cell_style(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_cell_style_xfs.cpp b/test/unit/styles/test_styles_write_cell_style_xfs.cpp
new file mode 100644
index 00000000..96078f3f
--- /dev/null
+++ b/test/unit/styles/test_styles_write_cell_style_xfs.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_cell_style_xfs() function.
+TEST(styles, write_cell_style_xfs) {
+
+    char* got;
+    char exp[] = "<cellStyleXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/></cellStyleXfs>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_cell_style_xfs(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_cell_styles.cpp b/test/unit/styles/test_styles_write_cell_styles.cpp
new file mode 100644
index 00000000..943852be
--- /dev/null
+++ b/test/unit/styles/test_styles_write_cell_styles.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_cell_styles() function.
+TEST(styles, write_cell_styles) {
+
+    char* got;
+    char exp[] = "<cellStyles count=\"1\"><cellStyle name=\"Normal\" xfId=\"0\" builtinId=\"0\"/></cellStyles>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_cell_styles(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_cell_xfs.cpp b/test/unit/styles/test_styles_write_cell_xfs.cpp
new file mode 100644
index 00000000..e444d73d
--- /dev/null
+++ b/test/unit/styles/test_styles_write_cell_xfs.cpp
@@ -0,0 +1,35 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_cell_xfs() function.
+TEST(styles, write_cell_xfs) {
+
+    char* got;
+    char exp[] = "<cellXfs count=\"1\"><xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/></cellXfs>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    STAILQ_INSERT_TAIL(styles->xf_formats, format, list_pointers);
+
+    styles->file = testfile;
+
+    styles->xf_count = 1;
+
+    _write_cell_xfs(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_default_fill.cpp b/test/unit/styles/test_styles_write_default_fill.cpp
new file mode 100644
index 00000000..a3652751
--- /dev/null
+++ b/test/unit/styles/test_styles_write_default_fill.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_default_fill() function.
+TEST(styles, write_default_fill) {
+
+    char* got;
+    char exp[] = "<fill><patternFill patternType=\"none\"/></fill>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_default_fill(styles, "none");
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_dxfs.cpp b/test/unit/styles/test_styles_write_dxfs.cpp
new file mode 100644
index 00000000..73398515
--- /dev/null
+++ b/test/unit/styles/test_styles_write_dxfs.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_dxfs() function.
+TEST(styles, write_dxfs) {
+
+    char* got;
+    char exp[] = "<dxfs count=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_dxfs(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_fills.cpp b/test/unit/styles/test_styles_write_fills.cpp
new file mode 100644
index 00000000..faf93e9a
--- /dev/null
+++ b/test/unit/styles/test_styles_write_fills.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_fills() function.
+TEST(styles, write_fills) {
+
+    char* got;
+    char exp[] = "<fills count=\"2\"><fill><patternFill patternType=\"none\"/></fill><fill><patternFill patternType=\"gray125\"/></fill></fills>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->fill_count = 2;
+    styles->file = testfile;
+
+    _write_fills(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_font.cpp b/test/unit/styles/test_styles_write_font.cpp
new file mode 100644
index 00000000..49accee9
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font.cpp
@@ -0,0 +1,415 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_font() function.
+TEST(styles, write_font01) {
+
+
+    char* got;
+    char exp[] = "<font><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font02) {
+
+
+    char* got;
+    char exp[] = "<font><b/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_bold(format);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font03) {
+
+
+    char* got;
+    char exp[] = "<font><i/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_italic(format);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font04) {
+
+
+    char* got;
+    char exp[] = "<font><u/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_underline(format, LXW_UNDERLINE_SINGLE);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font05) {
+
+
+    char* got;
+    char exp[] = "<font><strike/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_strikeout(format);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font06) {
+
+
+    char* got;
+    char exp[] = "<font><vertAlign val=\"superscript\"/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_script(format, LXW_FONT_SUPERSCRIPT);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font07) {
+
+
+    char* got;
+    char exp[] = "<font><vertAlign val=\"subscript\"/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_script(format, LXW_FONT_SUBSCRIPT);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font08) {
+
+
+    char* got;
+    char exp[] = "<font><sz val=\"11\"/><color theme=\"1\"/><name val=\"Arial\"/><family val=\"2\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_name(format, "Arial");
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font09) {
+
+
+    char* got;
+    char exp[] = "<font><sz val=\"12\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_size(format, 12);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font10) {
+
+
+    char* got;
+    char exp[] = "<font><outline/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_outline(format);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font11) {
+
+
+    char* got;
+    char exp[] = "<font><shadow/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_shadow(format);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font12) {
+
+
+    char* got;
+    char exp[] = "<font><sz val=\"11\"/><color rgb=\"FFFF0000\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_font_color(format, LXW_COLOR_RED);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font13) {
+
+
+    char* got;
+    char exp[] = "<font><b/><i/><strike/><outline/><shadow/><u/><vertAlign val=\"superscript\"/><sz val=\"12\"/><color rgb=\"FFFF0000\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_bold(format);
+    format_set_italic(format);
+    format_set_font_size(format, 12);
+    format_set_font_color(format, LXW_COLOR_RED);
+    format_set_font_strikeout(format);
+    format_set_font_outline(format);
+    format_set_font_shadow(format);
+    format_set_font_script(format, LXW_FONT_SUPERSCRIPT);
+    format_set_underline(format, LXW_UNDERLINE_SINGLE);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font14) {
+
+
+    char* got;
+    char exp[] = "<font><u val=\"double\"/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_underline(format, LXW_UNDERLINE_DOUBLE);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font15) {
+
+
+    char* got;
+    char exp[] = "<font><u val=\"singleAccounting\"/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_underline(format, LXW_UNDERLINE_SINGLE_ACCOUNTING);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+// Test the _write_font() function.
+TEST(styles, write_font16) {
+
+
+    char* got;
+    char exp[] = "<font><u val=\"doubleAccounting\"/><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_underline(format, LXW_UNDERLINE_DOUBLE_ACCOUNTING);
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+
+// Test the _write_font() function.
+TEST(styles, write_font17) {
+
+
+    char* got;
+    char exp[] = "<font><u/><sz val=\"11\"/><color theme=\"10\"/><name val=\"Calibri\"/><family val=\"2\"/></font>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_underline(format, LXW_UNDERLINE_SINGLE);
+    format_set_theme(format, 10);
+    format->hyperlink = 1;
+
+    styles->file = testfile;
+
+    _write_font(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+
diff --git a/test/unit/styles/test_styles_write_font_color.cpp b/test/unit/styles/test_styles_write_font_color.cpp
new file mode 100644
index 00000000..1a66874d
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font_color.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_color() function.
+TEST(styles, write_color) {
+
+
+    char* got;
+    char exp[] = "<color theme=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_font_color_theme(styles, 1);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_font_family.cpp b/test/unit/styles/test_styles_write_font_family.cpp
new file mode 100644
index 00000000..7703886a
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font_family.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_family() function.
+TEST(styles, write_family) {
+
+
+    char* got;
+    char exp[] = "<family val=\"2\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_font_family(styles, 2);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_font_name.cpp b/test/unit/styles/test_styles_write_font_name.cpp
new file mode 100644
index 00000000..a3e2bf5d
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font_name.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_name() function.
+TEST(styles, write_name) {
+
+
+    char* got;
+    char exp[] = "<name val=\"Calibri\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_font_name(styles, "Calibri");
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_font_scheme.cpp b/test/unit/styles/test_styles_write_font_scheme.cpp
new file mode 100644
index 00000000..a45bcd92
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font_scheme.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_scheme() function.
+TEST(styles, write_scheme) {
+
+
+    char* got;
+    char exp[] = "<scheme val=\"minor\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_font_scheme(styles, "minor");
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_font_sz.cpp b/test/unit/styles/test_styles_write_font_sz.cpp
new file mode 100644
index 00000000..9e07fd10
--- /dev/null
+++ b/test/unit/styles/test_styles_write_font_sz.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_sz() function.
+TEST(styles, write_sz) {
+
+
+    char* got;
+    char exp[] = "<sz val=\"11\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_font_size(styles, 11);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_fonts.cpp b/test/unit/styles/test_styles_write_fonts.cpp
new file mode 100644
index 00000000..126ed290
--- /dev/null
+++ b/test/unit/styles/test_styles_write_fonts.cpp
@@ -0,0 +1,35 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_font() function.
+TEST(styles, write_fonts01) {
+
+    char* got;
+    char exp[] = "<fonts count=\"1\"><font><sz val=\"11\"/><color theme=\"1\"/><name val=\"Calibri\"/><family val=\"2\"/><scheme val=\"minor\"/></font></fonts>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format->has_font = 1;
+
+    STAILQ_INSERT_TAIL(styles->xf_formats, format, list_pointers);
+
+    styles->file = testfile;
+    styles->font_count = 1;
+
+    _write_fonts(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
diff --git a/test/unit/styles/test_styles_write_style_sheet.cpp b/test/unit/styles/test_styles_write_style_sheet.cpp
new file mode 100644
index 00000000..afd29134
--- /dev/null
+++ b/test/unit/styles/test_styles_write_style_sheet.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_style_sheet() function.
+TEST(styles, write_style_sheet) {
+
+
+    char* got;
+    char exp[] = "<styleSheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\">";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_style_sheet(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_style_xf.cpp b/test/unit/styles/test_styles_write_style_xf.cpp
new file mode 100644
index 00000000..f26d955b
--- /dev/null
+++ b/test/unit/styles/test_styles_write_style_xf.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_style_xf() function.
+TEST(styles, write_style_xf) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_style_xf(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_table_styles.cpp b/test/unit/styles/test_styles_write_table_styles.cpp
new file mode 100644
index 00000000..4b60780e
--- /dev/null
+++ b/test/unit/styles/test_styles_write_table_styles.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test the _write_table_styles() function.
+TEST(styles, write_table_styles) {
+
+    char* got;
+    char exp[] = "<tableStyles count=\"0\" defaultTableStyle=\"TableStyleMedium9\" defaultPivotStyle=\"PivotStyleLight16\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _write_table_styles(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
+
diff --git a/test/unit/styles/test_styles_write_xf.cpp b/test/unit/styles/test_styles_write_xf.cpp
new file mode 100644
index 00000000..e5243e75
--- /dev/null
+++ b/test/unit/styles/test_styles_write_xf.cpp
@@ -0,0 +1,851 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+#include "xlsxwriter/format.h"
+
+// Test the _write_xf() method. Default properties.
+TEST(styles, write_xf01) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Has font but is first XF.
+TEST(styles, write_xf02) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format->has_font = 1;
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Has font but isn't first XF.
+TEST(styles, write_xf03) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"1\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyFont=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format->has_font = 1;
+    format->font_index = 1;
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Uses built-in number format.
+TEST(styles, write_xf04) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"2\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyNumberFormat=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_num_format_index(format, 2);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Uses built-in number format + font.
+TEST(styles, write_xf05) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"2\" fontId=\"1\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyNumberFormat=\"1\" applyFont=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_num_format_index(format, 2);
+    format->has_font = 1;
+    format->font_index = 1;
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Vertical alignment = top.
+TEST(styles, write_xf06) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment vertical=\"top\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_VERTICAL_TOP);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Vertical alignment = centre.
+TEST(styles, write_xf07) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment vertical=\"center\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_VERTICAL_CENTER);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Vertical alignment = bottom.
+TEST(styles, write_xf08) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_VERTICAL_BOTTOM);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Vertical alignment = justify.
+TEST(styles, write_xf09) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment vertical=\"justify\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_VERTICAL_JUSTIFY);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Vertical alignment = distributed.
+TEST(styles, write_xf10) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment vertical=\"distributed\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_VERTICAL_DISTRIBUTED);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = left.
+TEST(styles, write_xf11) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"left\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_LEFT);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = center.
+TEST(styles, write_xf12) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"center\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_CENTER);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = right.
+TEST(styles, write_xf13) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"right\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_RIGHT);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = left + indent.
+TEST(styles, write_xf14) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"left\" indent=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_LEFT);
+    format->indent = 1;
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = right + indent.
+TEST(styles, write_xf15) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"right\" indent=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_RIGHT);
+    format_set_indent(format, 1);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = fill.
+TEST(styles, write_xf16) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"fill\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_FILL);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = justify.
+TEST(styles, write_xf17) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"justify\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_JUSTIFY);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = center across.
+TEST(styles, write_xf18) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"centerContinuous\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_CENTER_ACROSS);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = distributed.
+TEST(styles, write_xf19) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"distributed\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_DISTRIBUTED);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = distributed + indent.
+TEST(styles, write_xf20) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"distributed\" indent=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_DISTRIBUTED);
+    format_set_indent(format, 1);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = justify distributed.
+TEST(styles, write_xf21) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"distributed\" justifyLastLine=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_DISTRIBUTED);
+    format->just_distrib = 1;
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = indent only.
+// This should default to left alignment.
+TEST(styles, write_xf22) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"left\" indent=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_indent(format, 1);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Horizontal alignment = distributed + indent.
+// The justify_distributed should drop back to plain distributed if there
+// is an indent.
+TEST(styles, write_xf23) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment horizontal=\"distributed\" indent=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_DISTRIBUTED);
+    format_set_indent(format, 1);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = text wrap
+TEST(styles, write_xf24) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment wrapText=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_text_wrap(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = shrink to fit
+TEST(styles, write_xf25) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment shrinkToFit=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_shrink(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = reading order
+TEST(styles, write_xf26) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment readingOrder=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_reading_order(format, 1);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = reading order
+TEST(styles, write_xf27) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment readingOrder=\"2\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_reading_order(format, 2);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = rotation
+TEST(styles, write_xf28) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment textRotation=\"45\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_rotation(format, 45);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = rotation
+TEST(styles, write_xf29) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment textRotation=\"135\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_rotation(format, -45);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = rotation
+TEST(styles, write_xf30) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment textRotation=\"255\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_rotation(format, 270);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = rotation
+TEST(styles, write_xf31) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment textRotation=\"90\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_rotation(format, 90);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. Alignment = rotation
+TEST(styles, write_xf32) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\"><alignment textRotation=\"180\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_rotation(format, -90);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. With cell protection.
+TEST(styles, write_xf33) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyProtection=\"1\"><protection locked=\"0\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_unlocked(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. With cell protection.
+TEST(styles, write_xf34) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyProtection=\"1\"><protection hidden=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_hidden(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. With cell protection.
+TEST(styles, write_xf35) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyProtection=\"1\"><protection locked=\"0\" hidden=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_unlocked(format);
+    format_set_hidden(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
+
+
+// Test the _write_xf() method. With cell protection + align.
+TEST(styles, write_xf36) {
+
+    char* got;
+    char exp[] = "<xf numFmtId=\"0\" fontId=\"0\" fillId=\"0\" borderId=\"0\" xfId=\"0\" applyAlignment=\"1\" applyProtection=\"1\"><alignment horizontal=\"right\"/><protection locked=\"0\" hidden=\"1\"/></xf>";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    lxw_format *format = _new_format();
+
+    format_set_align(format, LXW_ALIGN_RIGHT);
+    format_set_unlocked(format);
+    format_set_hidden(format);
+
+    styles->file = testfile;
+
+    _write_xf(styles, format);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+    _free_format(format);
+}
diff --git a/test/unit/styles/test_styles_xml_declaration.cpp b/test/unit/styles/test_styles_xml_declaration.cpp
new file mode 100644
index 00000000..4ae85e5b
--- /dev/null
+++ b/test/unit/styles/test_styles_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/styles.h"
+
+// Test _xml_declaration().
+TEST(styles, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_styles *styles = _new_styles();
+    styles->file = testfile;
+
+    _styles_xml_declaration(styles);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_styles(styles);
+}
diff --git a/test/unit/utility/Makefile b/test/unit/utility/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/utility/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/utility/test_datetime_to_excel.cpp b/test/unit/utility/test_datetime_to_excel.cpp
new file mode 100644
index 00000000..59553ddd
--- /dev/null
+++ b/test/unit/utility/test_datetime_to_excel.cpp
@@ -0,0 +1,638 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/utility.h"
+
+
+// Test _datetime_to_excel_date().
+TEST(utility, _datetime_date_and_time) {
+
+    double got;
+    lxw_datetime *datetime;
+
+    TEST_DATETIME(1899, 12, 31,  0,  0,  0.000, 0);
+    TEST_DATETIME(1982,  8, 25,  0, 15, 20.213, 30188.010650613425);
+    TEST_DATETIME(2065,  4, 19,  0, 16, 48.290, 60376.011670023145);
+    TEST_DATETIME(2147, 12, 15,  0, 55, 25.446, 90565.038488958337);
+    TEST_DATETIME(2230,  8, 10,  1,  2, 46.891, 120753.04359827546);
+    TEST_DATETIME(2313,  4,  6,  1,  4, 15.597, 150942.04462496529);
+    TEST_DATETIME(2395, 11, 30,  1,  9, 40.889, 181130.04838991899);
+    TEST_DATETIME(2478,  7, 25,  1, 11, 32.560, 211318.04968240741);
+    TEST_DATETIME(2561,  3, 21,  1, 30, 19.169, 241507.06272186342);
+    TEST_DATETIME(2643, 11, 15,  1, 48, 25.580, 271695.07529606484);
+    TEST_DATETIME(2726,  7, 12,  2,  3, 31.919, 301884.08578609955);
+    TEST_DATETIME(2809,  3,  6,  2, 11, 11.986, 332072.09111094906);
+    TEST_DATETIME(2891, 10, 31,  2, 24, 37.095, 362261.10042934027);
+    TEST_DATETIME(2974,  6, 26,  2, 35,  7.220, 392449.10772245371);
+    TEST_DATETIME(3057,  2, 19,  2, 45, 12.109, 422637.1147234838);
+    TEST_DATETIME(3139, 10, 17,  3,  6, 39.990, 452826.12962951389);
+    TEST_DATETIME(3222,  6, 11,  3,  8,  8.251, 483014.13065105322);
+    TEST_DATETIME(3305,  2,  5,  3, 19, 12.576, 513203.13834);
+    TEST_DATETIME(3387, 10,  1,  3, 29, 42.574, 543391.14563164348);
+    TEST_DATETIME(3470,  5, 27,  3, 37, 30.813, 573579.15105107636);
+    TEST_DATETIME(3553,  1, 21,  4, 14, 38.231, 603768.17683137732);
+    TEST_DATETIME(3635,  9, 16,  4, 16, 28.559, 633956.17810832174);
+    TEST_DATETIME(3718,  5, 13,  4, 17, 58.222, 664145.17914608796);
+    TEST_DATETIME(3801,  1,  6,  4, 21, 41.794, 694333.18173372687);
+    TEST_DATETIME(3883,  9,  2,  4, 56, 35.792, 724522.20596981479);
+    TEST_DATETIME(3966,  4, 28,  5, 25, 14.885, 754710.2258667245);
+    TEST_DATETIME(4048, 12, 21,  5, 26,  5.724, 784898.22645513888);
+    TEST_DATETIME(4131,  8, 18,  5, 46, 44.068, 815087.24078782403);
+    TEST_DATETIME(4214,  4, 13,  5, 48,  1.141, 845275.24167987274);
+    TEST_DATETIME(4296, 12,  7,  5, 53, 52.315, 875464.24574438657);
+    TEST_DATETIME(4379,  8,  3,  6, 14, 48.580, 905652.26028449077);
+    TEST_DATETIME(4462,  3, 28,  6, 46, 15.738, 935840.28212659725);
+    TEST_DATETIME(4544, 11, 22,  7, 31, 20.407, 966029.31343063654);
+    TEST_DATETIME(4627,  7, 19,  7, 58, 33.754, 996217.33233511576);
+    TEST_DATETIME(4710,  3, 15,  8,  7, 43.130, 1026406.3386936343);
+    TEST_DATETIME(4792, 11,  7,  8, 29, 11.091, 1056594.3536005903);
+    TEST_DATETIME(4875,  7,  4,  9,  8, 15.328, 1086783.3807329629);
+    TEST_DATETIME(4958,  2, 27,  9, 30, 41.781, 1116971.3963169097);
+    TEST_DATETIME(5040, 10, 23,  9, 34,  4.462, 1147159.3986627546);
+    TEST_DATETIME(5123,  6, 20,  9, 37, 23.945, 1177348.4009715857);
+    TEST_DATETIME(5206,  2, 12,  9, 37, 56.655, 1207536.4013501736);
+    TEST_DATETIME(5288, 10,  8,  9, 45, 12.230, 1237725.406391551);
+    TEST_DATETIME(5371,  6,  4,  9, 54, 14.782, 1267913.412671088);
+    TEST_DATETIME(5454,  1, 28,  9, 54, 22.108, 1298101.4127558796);
+    TEST_DATETIME(5536,  9, 24, 10,  1, 36.151, 1328290.4177795255);
+    TEST_DATETIME(5619,  5, 20, 12,  9, 48.602, 1358478.5068125231);
+    TEST_DATETIME(5702,  1, 14, 12, 34,  8.549, 1388667.5237100578);
+    TEST_DATETIME(5784,  9,  8, 12, 56,  6.495, 1418855.5389640625);
+    TEST_DATETIME(5867,  5,  6, 12, 58, 58.217, 1449044.5409515856);
+    TEST_DATETIME(5949, 12, 30, 12, 59, 54.263, 1479232.5416002662);
+    TEST_DATETIME(6032,  8, 24, 13, 34, 41.331, 1509420.5657561459);
+    TEST_DATETIME(6115,  4, 21, 13, 58, 28.601, 1539609.5822754744);
+    TEST_DATETIME(6197, 12, 14, 14,  2, 16.899, 1569797.5849178126);
+    TEST_DATETIME(6280,  8, 10, 14, 36, 17.444, 1599986.6085352316);
+    TEST_DATETIME(6363,  4,  6, 14, 37, 57.451, 1630174.60969272);
+    TEST_DATETIME(6445, 11, 30, 14, 57, 42.757, 1660363.6234115392);
+    TEST_DATETIME(6528,  7, 26, 15, 10, 48.307, 1690551.6325035533);
+    TEST_DATETIME(6611,  3, 22, 15, 14, 39.890, 1720739.635183912);
+    TEST_DATETIME(6693, 11, 15, 15, 19, 47.988, 1750928.6387498612);
+    TEST_DATETIME(6776,  7, 11, 16,  4, 24.344, 1781116.6697262037);
+    TEST_DATETIME(6859,  3,  7, 16, 22, 23.952, 1811305.6822216667);
+    TEST_DATETIME(6941, 10, 31, 16, 29, 55.999, 1841493.6874536921);
+    TEST_DATETIME(7024,  6, 26, 16, 58, 20.259, 1871681.7071789235);
+    TEST_DATETIME(7107,  2, 21, 17,  4,  2.415, 1901870.7111390624);
+    TEST_DATETIME(7189, 10, 16, 17, 18, 29.630, 1932058.7211762732);
+    TEST_DATETIME(7272,  6, 11, 17, 47, 21.323, 1962247.7412190163);
+    TEST_DATETIME(7355,  2,  5, 17, 53, 29.866, 1992435.7454845603);
+    TEST_DATETIME(7437, 10,  2, 17, 53, 41.076, 2022624.7456143056);
+    TEST_DATETIME(7520,  5, 28, 17, 55,  6.044, 2052812.7465977315);
+    TEST_DATETIME(7603,  1, 21, 18, 14, 49.151, 2083000.7602910995);
+    TEST_DATETIME(7685,  9, 16, 18, 17, 45.738, 2113189.7623349307);
+    TEST_DATETIME(7768,  5, 12, 18, 29, 59.700, 2143377.7708298611);
+    TEST_DATETIME(7851,  1,  7, 18, 33, 21.233, 2173566.773162419);
+    TEST_DATETIME(7933,  9,  2, 19, 14, 24.673, 2203754.8016744559);
+    TEST_DATETIME(8016,  4, 27, 19, 17, 12.816, 2233942.8036205554);
+    TEST_DATETIME(8098, 12, 22, 19, 23, 36.418, 2264131.8080603937);
+    TEST_DATETIME(8181,  8, 17, 19, 46, 25.908, 2294319.8239109721);
+    TEST_DATETIME(8264,  4, 13, 20,  7, 47.314, 2324508.8387420601);
+    TEST_DATETIME(8346, 12,  8, 20, 31, 37.603, 2354696.855296331);
+    TEST_DATETIME(8429,  8,  3, 20, 39, 57.770, 2384885.8610853008);
+    TEST_DATETIME(8512,  3, 29, 20, 50, 17.067, 2415073.8682530904);
+    TEST_DATETIME(8594, 11, 22, 21,  2, 57.827, 2445261.8770581828);
+    TEST_DATETIME(8677,  7, 19, 21, 23,  5.519, 2475450.8910360998);
+    TEST_DATETIME(8760,  3, 14, 21, 34, 49.572, 2505638.8991848612);
+    TEST_DATETIME(8842, 11,  8, 21, 39,  5.944, 2535827.9021521294);
+    TEST_DATETIME(8925,  7,  4, 21, 39, 18.426, 2566015.9022965971);
+    TEST_DATETIME(9008,  2, 28, 21, 46,  7.769, 2596203.9070343636);
+    TEST_DATETIME(9090, 10, 24, 21, 57, 55.662, 2626392.9152275696);
+    TEST_DATETIME(9173,  6, 19, 22, 19, 11.732, 2656580.9299968979);
+    TEST_DATETIME(9256,  2, 13, 22, 23, 51.376, 2686769.9332335186);
+    TEST_DATETIME(9338, 10,  9, 22, 27, 58.771, 2716957.9360968866);
+    TEST_DATETIME(9421,  6,  5, 22, 43, 30.392, 2747146.9468795368);
+    TEST_DATETIME(9504,  1, 30, 22, 48, 25.834, 2777334.9502990046);
+    TEST_DATETIME(9586,  9, 24, 22, 53, 51.727, 2807522.9540709145);
+    TEST_DATETIME(9669,  5, 20, 23, 12, 56.536, 2837711.9673210187);
+    TEST_DATETIME(9752,  1, 14, 23, 15, 54.109, 2867899.9693762613);
+    TEST_DATETIME(9834,  9, 10, 23, 17, 12.632, 2898088.9702850925);
+    TEST_DATETIME(9999, 12, 31, 23, 59, 59.000, 2958465.999988426);
+}
+
+TEST(utility, _datetime_date_only) {
+
+    double got;
+    lxw_datetime *datetime;
+
+    // Params = (year, month, day, excel_date).
+    TEST_DATETIME_DATE(1899, 12, 31, 0);
+    TEST_DATETIME_DATE(1900,  1,  1, 1);
+    TEST_DATETIME_DATE(1900,  2, 27, 58);
+    TEST_DATETIME_DATE(1900,  2, 28, 59);
+    TEST_DATETIME_DATE(1900,  3,  1, 61);
+    TEST_DATETIME_DATE(1900,  3,  2, 62);
+    TEST_DATETIME_DATE(1900,  3, 11, 71);
+    TEST_DATETIME_DATE(1900,  4,  8, 99);
+    TEST_DATETIME_DATE(1900,  9, 12, 256);
+    TEST_DATETIME_DATE(1901,  5,  3, 489);
+    TEST_DATETIME_DATE(1901, 10, 13, 652);
+    TEST_DATETIME_DATE(1902,  2, 15, 777);
+    TEST_DATETIME_DATE(1902,  6,  6, 888);
+    TEST_DATETIME_DATE(1902,  9, 25, 999);
+    TEST_DATETIME_DATE(1902,  9, 27, 1001);
+    TEST_DATETIME_DATE(1903,  4, 26, 1212);
+    TEST_DATETIME_DATE(1903,  8,  5, 1313);
+    TEST_DATETIME_DATE(1903, 12, 31, 1461);
+    TEST_DATETIME_DATE(1904,  1,  1, 1462);
+    TEST_DATETIME_DATE(1904,  2, 28, 1520);
+    TEST_DATETIME_DATE(1904,  2, 29, 1521);
+    TEST_DATETIME_DATE(1904,  3,  1, 1522);
+    TEST_DATETIME_DATE(1907,  2, 27, 2615);
+    TEST_DATETIME_DATE(1907,  2, 28, 2616);
+    TEST_DATETIME_DATE(1907,  3,  1, 2617);
+    TEST_DATETIME_DATE(1907,  3,  2, 2618);
+    TEST_DATETIME_DATE(1907,  3,  3, 2619);
+    TEST_DATETIME_DATE(1907,  3,  4, 2620);
+    TEST_DATETIME_DATE(1907,  3,  5, 2621);
+    TEST_DATETIME_DATE(1907,  3,  6, 2622);
+    TEST_DATETIME_DATE(1999,  1,  1, 36161);
+    TEST_DATETIME_DATE(1999,  1, 31, 36191);
+    TEST_DATETIME_DATE(1999,  2,  1, 36192);
+    TEST_DATETIME_DATE(1999,  2, 28, 36219);
+    TEST_DATETIME_DATE(1999,  3,  1, 36220);
+    TEST_DATETIME_DATE(1999,  3, 31, 36250);
+    TEST_DATETIME_DATE(1999,  4,  1, 36251);
+    TEST_DATETIME_DATE(1999,  4, 30, 36280);
+    TEST_DATETIME_DATE(1999,  5,  1, 36281);
+    TEST_DATETIME_DATE(1999,  5, 31, 36311);
+    TEST_DATETIME_DATE(1999,  6,  1, 36312);
+    TEST_DATETIME_DATE(1999,  6, 30, 36341);
+    TEST_DATETIME_DATE(1999,  7,  1, 36342);
+    TEST_DATETIME_DATE(1999,  7, 31, 36372);
+    TEST_DATETIME_DATE(1999,  8,  1, 36373);
+    TEST_DATETIME_DATE(1999,  8, 31, 36403);
+    TEST_DATETIME_DATE(1999,  9,  1, 36404);
+    TEST_DATETIME_DATE(1999,  9, 30, 36433);
+    TEST_DATETIME_DATE(1999, 10,  1, 36434);
+    TEST_DATETIME_DATE(1999, 10, 31, 36464);
+    TEST_DATETIME_DATE(1999, 11,  1, 36465);
+    TEST_DATETIME_DATE(1999, 11, 30, 36494);
+    TEST_DATETIME_DATE(1999, 12,  1, 36495);
+    TEST_DATETIME_DATE(1999, 12, 31, 36525);
+    TEST_DATETIME_DATE(2000,  1,  1, 36526);
+    TEST_DATETIME_DATE(2000,  1, 31, 36556);
+    TEST_DATETIME_DATE(2000,  2,  1, 36557);
+    TEST_DATETIME_DATE(2000,  2, 29, 36585);
+    TEST_DATETIME_DATE(2000,  3,  1, 36586);
+    TEST_DATETIME_DATE(2000,  3, 31, 36616);
+    TEST_DATETIME_DATE(2000,  4,  1, 36617);
+    TEST_DATETIME_DATE(2000,  4, 30, 36646);
+    TEST_DATETIME_DATE(2000,  5,  1, 36647);
+    TEST_DATETIME_DATE(2000,  5, 31, 36677);
+    TEST_DATETIME_DATE(2000,  6,  1, 36678);
+    TEST_DATETIME_DATE(2000,  6, 30, 36707);
+    TEST_DATETIME_DATE(2000,  7,  1, 36708);
+    TEST_DATETIME_DATE(2000,  7, 31, 36738);
+    TEST_DATETIME_DATE(2000,  8,  1, 36739);
+    TEST_DATETIME_DATE(2000,  8, 31, 36769);
+    TEST_DATETIME_DATE(2000,  9,  1, 36770);
+    TEST_DATETIME_DATE(2000,  9, 30, 36799);
+    TEST_DATETIME_DATE(2000, 10,  1, 36800);
+    TEST_DATETIME_DATE(2000, 10, 31, 36830);
+    TEST_DATETIME_DATE(2000, 11,  1, 36831);
+    TEST_DATETIME_DATE(2000, 11, 30, 36860);
+    TEST_DATETIME_DATE(2000, 12,  1, 36861);
+    TEST_DATETIME_DATE(2000, 12, 31, 36891);
+    TEST_DATETIME_DATE(2001,  1,  1, 36892);
+    TEST_DATETIME_DATE(2001,  1, 31, 36922);
+    TEST_DATETIME_DATE(2001,  2,  1, 36923);
+    TEST_DATETIME_DATE(2001,  2, 28, 36950);
+    TEST_DATETIME_DATE(2001,  3,  1, 36951);
+    TEST_DATETIME_DATE(2001,  3, 31, 36981);
+    TEST_DATETIME_DATE(2001,  4,  1, 36982);
+    TEST_DATETIME_DATE(2001,  4, 30, 37011);
+    TEST_DATETIME_DATE(2001,  5,  1, 37012);
+    TEST_DATETIME_DATE(2001,  5, 31, 37042);
+    TEST_DATETIME_DATE(2001,  6,  1, 37043);
+    TEST_DATETIME_DATE(2001,  6, 30, 37072);
+    TEST_DATETIME_DATE(2001,  7,  1, 37073);
+    TEST_DATETIME_DATE(2001,  7, 31, 37103);
+    TEST_DATETIME_DATE(2001,  8,  1, 37104);
+    TEST_DATETIME_DATE(2001,  8, 31, 37134);
+    TEST_DATETIME_DATE(2001,  9,  1, 37135);
+    TEST_DATETIME_DATE(2001,  9, 30, 37164);
+    TEST_DATETIME_DATE(2001, 10,  1, 37165);
+    TEST_DATETIME_DATE(2001, 10, 31, 37195);
+    TEST_DATETIME_DATE(2001, 11,  1, 37196);
+    TEST_DATETIME_DATE(2001, 11, 30, 37225);
+    TEST_DATETIME_DATE(2001, 12,  1, 37226);
+    TEST_DATETIME_DATE(2001, 12, 31, 37256);
+    TEST_DATETIME_DATE(2400,  1,  1, 182623);
+    TEST_DATETIME_DATE(2400,  1, 31, 182653);
+    TEST_DATETIME_DATE(2400,  2,  1, 182654);
+    TEST_DATETIME_DATE(2400,  2, 29, 182682);
+    TEST_DATETIME_DATE(2400,  3,  1, 182683);
+    TEST_DATETIME_DATE(2400,  3, 31, 182713);
+    TEST_DATETIME_DATE(2400,  4,  1, 182714);
+    TEST_DATETIME_DATE(2400,  4, 30, 182743);
+    TEST_DATETIME_DATE(2400,  5,  1, 182744);
+    TEST_DATETIME_DATE(2400,  5, 31, 182774);
+    TEST_DATETIME_DATE(2400,  6,  1, 182775);
+    TEST_DATETIME_DATE(2400,  6, 30, 182804);
+    TEST_DATETIME_DATE(2400,  7,  1, 182805);
+    TEST_DATETIME_DATE(2400,  7, 31, 182835);
+    TEST_DATETIME_DATE(2400,  8,  1, 182836);
+    TEST_DATETIME_DATE(2400,  8, 31, 182866);
+    TEST_DATETIME_DATE(2400,  9,  1, 182867);
+    TEST_DATETIME_DATE(2400,  9, 30, 182896);
+    TEST_DATETIME_DATE(2400, 10,  1, 182897);
+    TEST_DATETIME_DATE(2400, 10, 31, 182927);
+    TEST_DATETIME_DATE(2400, 11,  1, 182928);
+    TEST_DATETIME_DATE(2400, 11, 30, 182957);
+    TEST_DATETIME_DATE(2400, 12,  1, 182958);
+    TEST_DATETIME_DATE(2400, 12, 31, 182988);
+    TEST_DATETIME_DATE(4000,  1,  1, 767011);
+    TEST_DATETIME_DATE(4000,  1, 31, 767041);
+    TEST_DATETIME_DATE(4000,  2,  1, 767042);
+    TEST_DATETIME_DATE(4000,  2, 29, 767070);
+    TEST_DATETIME_DATE(4000,  3,  1, 767071);
+    TEST_DATETIME_DATE(4000,  3, 31, 767101);
+    TEST_DATETIME_DATE(4000,  4,  1, 767102);
+    TEST_DATETIME_DATE(4000,  4, 30, 767131);
+    TEST_DATETIME_DATE(4000,  5,  1, 767132);
+    TEST_DATETIME_DATE(4000,  5, 31, 767162);
+    TEST_DATETIME_DATE(4000,  6,  1, 767163);
+    TEST_DATETIME_DATE(4000,  6, 30, 767192);
+    TEST_DATETIME_DATE(4000,  7,  1, 767193);
+    TEST_DATETIME_DATE(4000,  7, 31, 767223);
+    TEST_DATETIME_DATE(4000,  8,  1, 767224);
+    TEST_DATETIME_DATE(4000,  8, 31, 767254);
+    TEST_DATETIME_DATE(4000,  9,  1, 767255);
+    TEST_DATETIME_DATE(4000,  9, 30, 767284);
+    TEST_DATETIME_DATE(4000, 10,  1, 767285);
+    TEST_DATETIME_DATE(4000, 10, 31, 767315);
+    TEST_DATETIME_DATE(4000, 11,  1, 767316);
+    TEST_DATETIME_DATE(4000, 11, 30, 767345);
+    TEST_DATETIME_DATE(4000, 12,  1, 767346);
+    TEST_DATETIME_DATE(4000, 12, 31, 767376);
+    TEST_DATETIME_DATE(4321,  1,  1, 884254);
+    TEST_DATETIME_DATE(4321,  1, 31, 884284);
+    TEST_DATETIME_DATE(4321,  2,  1, 884285);
+    TEST_DATETIME_DATE(4321,  2, 28, 884312);
+    TEST_DATETIME_DATE(4321,  3,  1, 884313);
+    TEST_DATETIME_DATE(4321,  3, 31, 884343);
+    TEST_DATETIME_DATE(4321,  4,  1, 884344);
+    TEST_DATETIME_DATE(4321,  4, 30, 884373);
+    TEST_DATETIME_DATE(4321,  5,  1, 884374);
+    TEST_DATETIME_DATE(4321,  5, 31, 884404);
+    TEST_DATETIME_DATE(4321,  6,  1, 884405);
+    TEST_DATETIME_DATE(4321,  6, 30, 884434);
+    TEST_DATETIME_DATE(4321,  7,  1, 884435);
+    TEST_DATETIME_DATE(4321,  7, 31, 884465);
+    TEST_DATETIME_DATE(4321,  8,  1, 884466);
+    TEST_DATETIME_DATE(4321,  8, 31, 884496);
+    TEST_DATETIME_DATE(4321,  9,  1, 884497);
+    TEST_DATETIME_DATE(4321,  9, 30, 884526);
+    TEST_DATETIME_DATE(4321, 10,  1, 884527);
+    TEST_DATETIME_DATE(4321, 10, 31, 884557);
+    TEST_DATETIME_DATE(4321, 11,  1, 884558);
+    TEST_DATETIME_DATE(4321, 11, 30, 884587);
+    TEST_DATETIME_DATE(4321, 12,  1, 884588);
+    TEST_DATETIME_DATE(4321, 12, 31, 884618);
+    TEST_DATETIME_DATE(9999,  1,  1, 2958101);
+    TEST_DATETIME_DATE(9999,  1, 31, 2958131);
+    TEST_DATETIME_DATE(9999,  2,  1, 2958132);
+    TEST_DATETIME_DATE(9999,  2, 28, 2958159);
+    TEST_DATETIME_DATE(9999,  3,  1, 2958160);
+    TEST_DATETIME_DATE(9999,  3, 31, 2958190);
+    TEST_DATETIME_DATE(9999,  4,  1, 2958191);
+    TEST_DATETIME_DATE(9999,  4, 30, 2958220);
+    TEST_DATETIME_DATE(9999,  5,  1, 2958221);
+    TEST_DATETIME_DATE(9999,  5, 31, 2958251);
+    TEST_DATETIME_DATE(9999,  6,  1, 2958252);
+    TEST_DATETIME_DATE(9999,  6, 30, 2958281);
+    TEST_DATETIME_DATE(9999,  7,  1, 2958282);
+    TEST_DATETIME_DATE(9999,  7, 31, 2958312);
+    TEST_DATETIME_DATE(9999,  8,  1, 2958313);
+    TEST_DATETIME_DATE(9999,  8, 31, 2958343);
+    TEST_DATETIME_DATE(9999,  9,  1, 2958344);
+    TEST_DATETIME_DATE(9999,  9, 30, 2958373);
+    TEST_DATETIME_DATE(9999, 10,  1, 2958374);
+    TEST_DATETIME_DATE(9999, 10, 31, 2958404);
+    TEST_DATETIME_DATE(9999, 11,  1, 2958405);
+    TEST_DATETIME_DATE(9999, 11, 30, 2958434);
+    TEST_DATETIME_DATE(9999, 12,  1, 2958435);
+    TEST_DATETIME_DATE(9999, 12, 31, 2958465);
+}
+
+
+TEST(utility, _datetime_date_only_1904) {
+
+    double got;
+    lxw_datetime *datetime;
+
+    // Params = (year, month, day, excel_date).
+    TEST_DATETIME_DATE_1904(1904,  1,  1, 0);
+    TEST_DATETIME_DATE_1904(1904,  1, 31, 30);
+    TEST_DATETIME_DATE_1904(1904,  2,  1, 31);
+    TEST_DATETIME_DATE_1904(1904,  2, 29, 59);
+    TEST_DATETIME_DATE_1904(1904,  3,  1, 60);
+    TEST_DATETIME_DATE_1904(1904,  3, 31, 90);
+    TEST_DATETIME_DATE_1904(1904,  4,  1, 91);
+    TEST_DATETIME_DATE_1904(1904,  4, 30, 120);
+    TEST_DATETIME_DATE_1904(1904,  5,  1, 121);
+    TEST_DATETIME_DATE_1904(1904,  5, 31, 151);
+    TEST_DATETIME_DATE_1904(1904,  6,  1, 152);
+    TEST_DATETIME_DATE_1904(1904,  6, 30, 181);
+    TEST_DATETIME_DATE_1904(1904,  7,  1, 182);
+    TEST_DATETIME_DATE_1904(1904,  7, 31, 212);
+    TEST_DATETIME_DATE_1904(1904,  8,  1, 213);
+    TEST_DATETIME_DATE_1904(1904,  8, 31, 243);
+    TEST_DATETIME_DATE_1904(1904,  9,  1, 244);
+    TEST_DATETIME_DATE_1904(1904,  9, 30, 273);
+    TEST_DATETIME_DATE_1904(1904, 10,  1, 274);
+    TEST_DATETIME_DATE_1904(1904, 10, 31, 304);
+    TEST_DATETIME_DATE_1904(1904, 11,  1, 305);
+    TEST_DATETIME_DATE_1904(1904, 11, 30, 334);
+    TEST_DATETIME_DATE_1904(1904, 12,  1, 335);
+    TEST_DATETIME_DATE_1904(1904, 12, 31, 365);
+    TEST_DATETIME_DATE_1904(1907,  2, 27, 1153);
+    TEST_DATETIME_DATE_1904(1907,  2, 28, 1154);
+    TEST_DATETIME_DATE_1904(1907,  3,  1, 1155);
+    TEST_DATETIME_DATE_1904(1907,  3,  2, 1156);
+    TEST_DATETIME_DATE_1904(1907,  3,  3, 1157);
+    TEST_DATETIME_DATE_1904(1907,  3,  4, 1158);
+    TEST_DATETIME_DATE_1904(1907,  3,  5, 1159);
+    TEST_DATETIME_DATE_1904(1907,  3,  6, 1160);
+    TEST_DATETIME_DATE_1904(1999,  1,  1, 34699);
+    TEST_DATETIME_DATE_1904(1999,  1, 31, 34729);
+    TEST_DATETIME_DATE_1904(1999,  2,  1, 34730);
+    TEST_DATETIME_DATE_1904(1999,  2, 28, 34757);
+    TEST_DATETIME_DATE_1904(1999,  3,  1, 34758);
+    TEST_DATETIME_DATE_1904(1999,  3, 31, 34788);
+    TEST_DATETIME_DATE_1904(1999,  4,  1, 34789);
+    TEST_DATETIME_DATE_1904(1999,  4, 30, 34818);
+    TEST_DATETIME_DATE_1904(1999,  5,  1, 34819);
+    TEST_DATETIME_DATE_1904(1999,  5, 31, 34849);
+    TEST_DATETIME_DATE_1904(1999,  6,  1, 34850);
+    TEST_DATETIME_DATE_1904(1999,  6, 30, 34879);
+    TEST_DATETIME_DATE_1904(1999,  7,  1, 34880);
+    TEST_DATETIME_DATE_1904(1999,  7, 31, 34910);
+    TEST_DATETIME_DATE_1904(1999,  8,  1, 34911);
+    TEST_DATETIME_DATE_1904(1999,  8, 31, 34941);
+    TEST_DATETIME_DATE_1904(1999,  9,  1, 34942);
+    TEST_DATETIME_DATE_1904(1999,  9, 30, 34971);
+    TEST_DATETIME_DATE_1904(1999, 10,  1, 34972);
+    TEST_DATETIME_DATE_1904(1999, 10, 31, 35002);
+    TEST_DATETIME_DATE_1904(1999, 11,  1, 35003);
+    TEST_DATETIME_DATE_1904(1999, 11, 30, 35032);
+    TEST_DATETIME_DATE_1904(1999, 12,  1, 35033);
+    TEST_DATETIME_DATE_1904(1999, 12, 31, 35063);
+    TEST_DATETIME_DATE_1904(2000,  1,  1, 35064);
+    TEST_DATETIME_DATE_1904(2000,  1, 31, 35094);
+    TEST_DATETIME_DATE_1904(2000,  2,  1, 35095);
+    TEST_DATETIME_DATE_1904(2000,  2, 29, 35123);
+    TEST_DATETIME_DATE_1904(2000,  3,  1, 35124);
+    TEST_DATETIME_DATE_1904(2000,  3, 31, 35154);
+    TEST_DATETIME_DATE_1904(2000,  4,  1, 35155);
+    TEST_DATETIME_DATE_1904(2000,  4, 30, 35184);
+    TEST_DATETIME_DATE_1904(2000,  5,  1, 35185);
+    TEST_DATETIME_DATE_1904(2000,  5, 31, 35215);
+    TEST_DATETIME_DATE_1904(2000,  6,  1, 35216);
+    TEST_DATETIME_DATE_1904(2000,  6, 30, 35245);
+    TEST_DATETIME_DATE_1904(2000,  7,  1, 35246);
+    TEST_DATETIME_DATE_1904(2000,  7, 31, 35276);
+    TEST_DATETIME_DATE_1904(2000,  8,  1, 35277);
+    TEST_DATETIME_DATE_1904(2000,  8, 31, 35307);
+    TEST_DATETIME_DATE_1904(2000,  9,  1, 35308);
+    TEST_DATETIME_DATE_1904(2000,  9, 30, 35337);
+    TEST_DATETIME_DATE_1904(2000, 10,  1, 35338);
+    TEST_DATETIME_DATE_1904(2000, 10, 31, 35368);
+    TEST_DATETIME_DATE_1904(2000, 11,  1, 35369);
+    TEST_DATETIME_DATE_1904(2000, 11, 30, 35398);
+    TEST_DATETIME_DATE_1904(2000, 12,  1, 35399);
+    TEST_DATETIME_DATE_1904(2000, 12, 31, 35429);
+    TEST_DATETIME_DATE_1904(2001,  1,  1, 35430);
+    TEST_DATETIME_DATE_1904(2001,  1, 31, 35460);
+    TEST_DATETIME_DATE_1904(2001,  2,  1, 35461);
+    TEST_DATETIME_DATE_1904(2001,  2, 28, 35488);
+    TEST_DATETIME_DATE_1904(2001,  3,  1, 35489);
+    TEST_DATETIME_DATE_1904(2001,  3, 31, 35519);
+    TEST_DATETIME_DATE_1904(2001,  4,  1, 35520);
+    TEST_DATETIME_DATE_1904(2001,  4, 30, 35549);
+    TEST_DATETIME_DATE_1904(2001,  5,  1, 35550);
+    TEST_DATETIME_DATE_1904(2001,  5, 31, 35580);
+    TEST_DATETIME_DATE_1904(2001,  6,  1, 35581);
+    TEST_DATETIME_DATE_1904(2001,  6, 30, 35610);
+    TEST_DATETIME_DATE_1904(2001,  7,  1, 35611);
+    TEST_DATETIME_DATE_1904(2001,  7, 31, 35641);
+    TEST_DATETIME_DATE_1904(2001,  8,  1, 35642);
+    TEST_DATETIME_DATE_1904(2001,  8, 31, 35672);
+    TEST_DATETIME_DATE_1904(2001,  9,  1, 35673);
+    TEST_DATETIME_DATE_1904(2001,  9, 30, 35702);
+    TEST_DATETIME_DATE_1904(2001, 10,  1, 35703);
+    TEST_DATETIME_DATE_1904(2001, 10, 31, 35733);
+    TEST_DATETIME_DATE_1904(2001, 11,  1, 35734);
+    TEST_DATETIME_DATE_1904(2001, 11, 30, 35763);
+    TEST_DATETIME_DATE_1904(2001, 12,  1, 35764);
+    TEST_DATETIME_DATE_1904(2001, 12, 31, 35794);
+    TEST_DATETIME_DATE_1904(2400,  1,  1, 181161);
+    TEST_DATETIME_DATE_1904(2400,  1, 31, 181191);
+    TEST_DATETIME_DATE_1904(2400,  2,  1, 181192);
+    TEST_DATETIME_DATE_1904(2400,  2, 29, 181220);
+    TEST_DATETIME_DATE_1904(2400,  3,  1, 181221);
+    TEST_DATETIME_DATE_1904(2400,  3, 31, 181251);
+    TEST_DATETIME_DATE_1904(2400,  4,  1, 181252);
+    TEST_DATETIME_DATE_1904(2400,  4, 30, 181281);
+    TEST_DATETIME_DATE_1904(2400,  5,  1, 181282);
+    TEST_DATETIME_DATE_1904(2400,  5, 31, 181312);
+    TEST_DATETIME_DATE_1904(2400,  6,  1, 181313);
+    TEST_DATETIME_DATE_1904(2400,  6, 30, 181342);
+    TEST_DATETIME_DATE_1904(2400,  7,  1, 181343);
+    TEST_DATETIME_DATE_1904(2400,  7, 31, 181373);
+    TEST_DATETIME_DATE_1904(2400,  8,  1, 181374);
+    TEST_DATETIME_DATE_1904(2400,  8, 31, 181404);
+    TEST_DATETIME_DATE_1904(2400,  9,  1, 181405);
+    TEST_DATETIME_DATE_1904(2400,  9, 30, 181434);
+    TEST_DATETIME_DATE_1904(2400, 10,  1, 181435);
+    TEST_DATETIME_DATE_1904(2400, 10, 31, 181465);
+    TEST_DATETIME_DATE_1904(2400, 11,  1, 181466);
+    TEST_DATETIME_DATE_1904(2400, 11, 30, 181495);
+    TEST_DATETIME_DATE_1904(2400, 12,  1, 181496);
+    TEST_DATETIME_DATE_1904(2400, 12, 31, 181526);
+    TEST_DATETIME_DATE_1904(4000,  1,  1, 765549);
+    TEST_DATETIME_DATE_1904(4000,  1, 31, 765579);
+    TEST_DATETIME_DATE_1904(4000,  2,  1, 765580);
+    TEST_DATETIME_DATE_1904(4000,  2, 29, 765608);
+    TEST_DATETIME_DATE_1904(4000,  3,  1, 765609);
+    TEST_DATETIME_DATE_1904(4000,  3, 31, 765639);
+    TEST_DATETIME_DATE_1904(4000,  4,  1, 765640);
+    TEST_DATETIME_DATE_1904(4000,  4, 30, 765669);
+    TEST_DATETIME_DATE_1904(4000,  5,  1, 765670);
+    TEST_DATETIME_DATE_1904(4000,  5, 31, 765700);
+    TEST_DATETIME_DATE_1904(4000,  6,  1, 765701);
+    TEST_DATETIME_DATE_1904(4000,  6, 30, 765730);
+    TEST_DATETIME_DATE_1904(4000,  7,  1, 765731);
+    TEST_DATETIME_DATE_1904(4000,  7, 31, 765761);
+    TEST_DATETIME_DATE_1904(4000,  8,  1, 765762);
+    TEST_DATETIME_DATE_1904(4000,  8, 31, 765792);
+    TEST_DATETIME_DATE_1904(4000,  9,  1, 765793);
+    TEST_DATETIME_DATE_1904(4000,  9, 30, 765822);
+    TEST_DATETIME_DATE_1904(4000, 10,  1, 765823);
+    TEST_DATETIME_DATE_1904(4000, 10, 31, 765853);
+    TEST_DATETIME_DATE_1904(4000, 11,  1, 765854);
+    TEST_DATETIME_DATE_1904(4000, 11, 30, 765883);
+    TEST_DATETIME_DATE_1904(4000, 12,  1, 765884);
+    TEST_DATETIME_DATE_1904(4000, 12, 31, 765914);
+    TEST_DATETIME_DATE_1904(4321,  1,  1, 882792);
+    TEST_DATETIME_DATE_1904(4321,  1, 31, 882822);
+    TEST_DATETIME_DATE_1904(4321,  2,  1, 882823);
+    TEST_DATETIME_DATE_1904(4321,  2, 28, 882850);
+    TEST_DATETIME_DATE_1904(4321,  3,  1, 882851);
+    TEST_DATETIME_DATE_1904(4321,  3, 31, 882881);
+    TEST_DATETIME_DATE_1904(4321,  4,  1, 882882);
+    TEST_DATETIME_DATE_1904(4321,  4, 30, 882911);
+    TEST_DATETIME_DATE_1904(4321,  5,  1, 882912);
+    TEST_DATETIME_DATE_1904(4321,  5, 31, 882942);
+    TEST_DATETIME_DATE_1904(4321,  6,  1, 882943);
+    TEST_DATETIME_DATE_1904(4321,  6, 30, 882972);
+    TEST_DATETIME_DATE_1904(4321,  7,  1, 882973);
+    TEST_DATETIME_DATE_1904(4321,  7, 31, 883003);
+    TEST_DATETIME_DATE_1904(4321,  8,  1, 883004);
+    TEST_DATETIME_DATE_1904(4321,  8, 31, 883034);
+    TEST_DATETIME_DATE_1904(4321,  9,  1, 883035);
+    TEST_DATETIME_DATE_1904(4321,  9, 30, 883064);
+    TEST_DATETIME_DATE_1904(4321, 10,  1, 883065);
+    TEST_DATETIME_DATE_1904(4321, 10, 31, 883095);
+    TEST_DATETIME_DATE_1904(4321, 11,  1, 883096);
+    TEST_DATETIME_DATE_1904(4321, 11, 30, 883125);
+    TEST_DATETIME_DATE_1904(4321, 12,  1, 883126);
+    TEST_DATETIME_DATE_1904(4321, 12, 31, 883156);
+    TEST_DATETIME_DATE_1904(9999,  1,  1, 2956639);
+    TEST_DATETIME_DATE_1904(9999,  1, 31, 2956669);
+    TEST_DATETIME_DATE_1904(9999,  2,  1, 2956670);
+    TEST_DATETIME_DATE_1904(9999,  2, 28, 2956697);
+    TEST_DATETIME_DATE_1904(9999,  3,  1, 2956698);
+    TEST_DATETIME_DATE_1904(9999,  3, 31, 2956728);
+    TEST_DATETIME_DATE_1904(9999,  4,  1, 2956729);
+    TEST_DATETIME_DATE_1904(9999,  4, 30, 2956758);
+    TEST_DATETIME_DATE_1904(9999,  5,  1, 2956759);
+    TEST_DATETIME_DATE_1904(9999,  5, 31, 2956789);
+    TEST_DATETIME_DATE_1904(9999,  6,  1, 2956790);
+    TEST_DATETIME_DATE_1904(9999,  6, 30, 2956819);
+    TEST_DATETIME_DATE_1904(9999,  7,  1, 2956820);
+    TEST_DATETIME_DATE_1904(9999,  7, 31, 2956850);
+    TEST_DATETIME_DATE_1904(9999,  8,  1, 2956851);
+    TEST_DATETIME_DATE_1904(9999,  8, 31, 2956881);
+    TEST_DATETIME_DATE_1904(9999,  9,  1, 2956882);
+    TEST_DATETIME_DATE_1904(9999,  9, 30, 2956911);
+    TEST_DATETIME_DATE_1904(9999, 10,  1, 2956912);
+    TEST_DATETIME_DATE_1904(9999, 10, 31, 2956942);
+    TEST_DATETIME_DATE_1904(9999, 11,  1, 2956943);
+    TEST_DATETIME_DATE_1904(9999, 11, 30, 2956972);
+    TEST_DATETIME_DATE_1904(9999, 12,  1, 2956973);
+    TEST_DATETIME_DATE_1904(9999, 12, 31, 2957003);
+}
+
+TEST(utility, _datetime_time_only) {
+
+    double got;
+    lxw_datetime *datetime;
+
+    TEST_DATETIME_TIME( 0,  0,  0.000, 0);
+    TEST_DATETIME_TIME( 0, 15, 20.213, 1.0650613425925924E-2);
+    TEST_DATETIME_TIME( 0, 16, 48.290, 1.1670023148148148E-2);
+    TEST_DATETIME_TIME( 0, 55, 25.446, 3.8488958333333337E-2);
+    TEST_DATETIME_TIME( 1,  2, 46.891, 4.3598275462962965E-2);
+    TEST_DATETIME_TIME( 1,  4, 15.597, 4.4624965277777782E-2);
+    TEST_DATETIME_TIME( 1,  9, 40.889, 4.8389918981481483E-2);
+    TEST_DATETIME_TIME( 1, 11, 32.560, 4.9682407407407404E-2);
+    TEST_DATETIME_TIME( 1, 30, 19.169, 6.2721863425925936E-2);
+    TEST_DATETIME_TIME( 1, 48, 25.580, 7.5296064814814809E-2);
+    TEST_DATETIME_TIME( 2,  3, 31.919, 8.5786099537037031E-2);
+    TEST_DATETIME_TIME( 2, 11, 11.986, 9.1110949074074077E-2);
+    TEST_DATETIME_TIME( 2, 24, 37.095, 0.10042934027777778);
+    TEST_DATETIME_TIME( 2, 35,  7.220, 0.1077224537037037);
+    TEST_DATETIME_TIME( 2, 45, 12.109, 0.11472348379629631);
+    TEST_DATETIME_TIME( 3,  6, 39.990, 0.12962951388888888);
+    TEST_DATETIME_TIME( 3,  8,  8.251, 0.13065105324074075);
+    TEST_DATETIME_TIME( 3, 19, 12.576, 0.13833999999999999);
+    TEST_DATETIME_TIME( 3, 29, 42.574, 0.14563164351851851);
+    TEST_DATETIME_TIME( 3, 37, 30.813, 0.1510510763888889);
+    TEST_DATETIME_TIME( 4, 14, 38.231, 0.1768313773148148);
+    TEST_DATETIME_TIME( 4, 16, 28.559, 0.17810832175925925);
+    TEST_DATETIME_TIME( 4, 17, 58.222, 0.17914608796296297);
+    TEST_DATETIME_TIME( 4, 21, 41.794, 0.18173372685185185);
+    TEST_DATETIME_TIME( 4, 56, 35.792, 0.2059698148148148);
+    TEST_DATETIME_TIME( 5, 25, 14.885, 0.22586672453703704);
+    TEST_DATETIME_TIME( 5, 26,  5.724, 0.22645513888888891);
+    TEST_DATETIME_TIME( 5, 46, 44.068, 0.24078782407407406);
+    TEST_DATETIME_TIME( 5, 48,  1.141, 0.2416798726851852);
+    TEST_DATETIME_TIME( 5, 53, 52.315, 0.24574438657407408);
+    TEST_DATETIME_TIME( 6, 14, 48.580, 0.26028449074074073);
+    TEST_DATETIME_TIME( 6, 46, 15.738, 0.28212659722222222);
+    TEST_DATETIME_TIME( 7, 31, 20.407, 0.31343063657407405);
+    TEST_DATETIME_TIME( 7, 58, 33.754, 0.33233511574074076);
+    TEST_DATETIME_TIME( 8,  7, 43.130, 0.33869363425925925);
+    TEST_DATETIME_TIME( 8, 29, 11.091, 0.35360059027777774);
+    TEST_DATETIME_TIME( 9,  8, 15.328, 0.380732962962963);
+    TEST_DATETIME_TIME( 9, 30, 41.781, 0.39631690972222228);
+    TEST_DATETIME_TIME( 9, 34,  4.462, 0.39866275462962958);
+    TEST_DATETIME_TIME( 9, 37, 23.945, 0.40097158564814817);
+    TEST_DATETIME_TIME( 9, 37, 56.655, 0.40135017361111114);
+    TEST_DATETIME_TIME( 9, 45, 12.230, 0.40639155092592594);
+    TEST_DATETIME_TIME( 9, 54, 14.782, 0.41267108796296298);
+    TEST_DATETIME_TIME( 9, 54, 22.108, 0.41275587962962962);
+    TEST_DATETIME_TIME(10,  1, 36.151, 0.41777952546296299);
+    TEST_DATETIME_TIME(12,  9, 48.602, 0.50681252314814818);
+    TEST_DATETIME_TIME(12, 34,  8.549, 0.52371005787037039);
+    TEST_DATETIME_TIME(12, 56,  6.495, 0.53896406249999995);
+    TEST_DATETIME_TIME(12, 58, 58.217, 0.54095158564814816);
+    TEST_DATETIME_TIME(12, 59, 54.263, 0.54160026620370372);
+    TEST_DATETIME_TIME(13, 34, 41.331, 0.56575614583333333);
+    TEST_DATETIME_TIME(13, 58, 28.601, 0.58227547453703699);
+    TEST_DATETIME_TIME(14,  2, 16.899, 0.58491781249999997);
+    TEST_DATETIME_TIME(14, 36, 17.444, 0.60853523148148148);
+    TEST_DATETIME_TIME(14, 37, 57.451, 0.60969271990740748);
+    TEST_DATETIME_TIME(14, 57, 42.757, 0.6234115393518519);
+    TEST_DATETIME_TIME(15, 10, 48.307, 0.6325035532407407);
+    TEST_DATETIME_TIME(15, 14, 39.890, 0.63518391203703706);
+    TEST_DATETIME_TIME(15, 19, 47.988, 0.63874986111111109);
+    TEST_DATETIME_TIME(16,  4, 24.344, 0.66972620370370362);
+    TEST_DATETIME_TIME(16, 22, 23.952, 0.68222166666666662);
+    TEST_DATETIME_TIME(16, 29, 55.999, 0.6874536921296297);
+    TEST_DATETIME_TIME(16, 58, 20.259, 0.70717892361111112);
+    TEST_DATETIME_TIME(17,  4,  2.415, 0.71113906250000003);
+    TEST_DATETIME_TIME(17, 18, 29.630, 0.72117627314814825);
+    TEST_DATETIME_TIME(17, 47, 21.323, 0.74121901620370367);
+    TEST_DATETIME_TIME(17, 53, 29.866, 0.74548456018518516);
+    TEST_DATETIME_TIME(17, 53, 41.076, 0.74561430555555563);
+    TEST_DATETIME_TIME(17, 55,  6.044, 0.74659773148148145);
+    TEST_DATETIME_TIME(18, 14, 49.151, 0.760291099537037);
+    TEST_DATETIME_TIME(18, 17, 45.738, 0.76233493055555546);
+    TEST_DATETIME_TIME(18, 29, 59.700, 0.77082986111111118);
+    TEST_DATETIME_TIME(18, 33, 21.233, 0.77316241898148153);
+    TEST_DATETIME_TIME(19, 14, 24.673, 0.80167445601851861);
+    TEST_DATETIME_TIME(19, 17, 12.816, 0.80362055555555545);
+    TEST_DATETIME_TIME(19, 23, 36.418, 0.80806039351851855);
+    TEST_DATETIME_TIME(19, 46, 25.908, 0.82391097222222232);
+    TEST_DATETIME_TIME(20,  7, 47.314, 0.83874206018518516);
+    TEST_DATETIME_TIME(20, 31, 37.603, 0.85529633101851854);
+    TEST_DATETIME_TIME(20, 39, 57.770, 0.86108530092592594);
+    TEST_DATETIME_TIME(20, 50, 17.067, 0.86825309027777775);
+    TEST_DATETIME_TIME(21,  2, 57.827, 0.87705818287037041);
+    TEST_DATETIME_TIME(21, 23,  5.519, 0.891036099537037);
+    TEST_DATETIME_TIME(21, 34, 49.572, 0.89918486111111118);
+    TEST_DATETIME_TIME(21, 39,  5.944, 0.90215212962962965);
+    TEST_DATETIME_TIME(21, 39, 18.426, 0.90229659722222222);
+    TEST_DATETIME_TIME(21, 46,  7.769, 0.90703436342592603);
+    TEST_DATETIME_TIME(21, 57, 55.662, 0.91522756944444439);
+    TEST_DATETIME_TIME(22, 19, 11.732, 0.92999689814814823);
+    TEST_DATETIME_TIME(22, 23, 51.376, 0.93323351851851843);
+    TEST_DATETIME_TIME(22, 27, 58.771, 0.93609688657407408);
+    TEST_DATETIME_TIME(22, 43, 30.392, 0.94687953703703709);
+    TEST_DATETIME_TIME(22, 48, 25.834, 0.95029900462962968);
+    TEST_DATETIME_TIME(22, 53, 51.727, 0.95407091435185187);
+    TEST_DATETIME_TIME(23, 12, 56.536, 0.96732101851851848);
+    TEST_DATETIME_TIME(23, 15, 54.109, 0.96937626157407408);
+    TEST_DATETIME_TIME(23, 17, 12.632, 0.97028509259259266);
+    TEST_DATETIME_TIME(23, 59, 59.999, 0.99999998842592586);
+}
diff --git a/test/unit/utility/test_xl_col_to_name.cpp b/test/unit/utility/test_xl_col_to_name.cpp
new file mode 100644
index 00000000..1e6ab35f
--- /dev/null
+++ b/test/unit/utility/test_xl_col_to_name.cpp
@@ -0,0 +1,43 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/utility.h"
+
+// Test _xl_col_to_name().
+TEST(utility, _xl_col_to_name) {
+
+    char got[MAX_COL_NAME_LENGTH];
+
+    TEST_COL_TO_NAME(0, 0, "A");
+    TEST_COL_TO_NAME(1, 0, "B");
+    TEST_COL_TO_NAME(2, 0, "C");
+    TEST_COL_TO_NAME(9, 0, "J");
+    TEST_COL_TO_NAME(24, 0, "Y");
+    TEST_COL_TO_NAME(25, 0, "Z");
+    TEST_COL_TO_NAME(26, 0, "AA");
+    TEST_COL_TO_NAME(254, 0, "IU");
+    TEST_COL_TO_NAME(255, 0, "IV");
+    TEST_COL_TO_NAME(256, 0, "IW");
+    TEST_COL_TO_NAME(16383, 0, "XFD");
+    TEST_COL_TO_NAME(16384, 0, "XFE");
+
+    TEST_COL_TO_NAME(0, 1, "$A");
+    TEST_COL_TO_NAME(1, 1, "$B");
+    TEST_COL_TO_NAME(2, 1, "$C");
+    TEST_COL_TO_NAME(9, 1, "$J");
+    TEST_COL_TO_NAME(24, 1, "$Y");
+    TEST_COL_TO_NAME(25, 1, "$Z");
+    TEST_COL_TO_NAME(26, 1, "$AA");
+    TEST_COL_TO_NAME(254, 1, "$IU");
+    TEST_COL_TO_NAME(255, 1, "$IV");
+    TEST_COL_TO_NAME(256, 1, "$IW");
+    TEST_COL_TO_NAME(16383, 1, "$XFD");
+    TEST_COL_TO_NAME(16384, 1, "$XFE");
+}
diff --git a/test/unit/utility/test_xl_range.cpp b/test/unit/utility/test_xl_range.cpp
new file mode 100644
index 00000000..696c2c19
--- /dev/null
+++ b/test/unit/utility/test_xl_range.cpp
@@ -0,0 +1,53 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/utility.h"
+
+// Test xl_range().
+TEST(utility, xl_range) {
+
+    char got[MAX_CELL_RANGE_LENGTH];
+
+    TEST_XL_RANGE(0, 0, 0, 1, "A1:B1");
+    TEST_XL_RANGE(0, 2, 0, 9, "C1:J1");
+    TEST_XL_RANGE(1, 0, 2, 0, "A2:A3");
+    TEST_XL_RANGE(9, 0, 1, 24, "A10:Y2");
+    TEST_XL_RANGE(7, 25, 9, 26, "Z8:AA10");
+    TEST_XL_RANGE(1, 254, 1, 255, "IU2:IV2");
+    TEST_XL_RANGE(1, 256, 0, 16383, "IW2:XFD1");
+    TEST_XL_RANGE(0, 0, 1048576, 16384, "A1:XFE1048577");
+    TEST_XL_RANGE(1048575, 16383, 1048576, 16384, "XFD1048576:XFE1048577");
+
+    // Test ranges that resolve to single cells.
+    TEST_XL_RANGE(0, 0, 0, 0, "A1");
+    TEST_XL_RANGE(1048576, 16384, 1048576, 16384, "XFE1048577");
+
+}
+
+// Test xl_range_abs().
+TEST(utility, xl_range_abs) {
+
+    char got[MAX_CELL_RANGE_LENGTH];
+
+    TEST_XL_RANGE_ABS(0, 0, 0, 1, "$A$1:$B$1");
+    TEST_XL_RANGE_ABS(0, 2, 0, 9, "$C$1:$J$1");
+    TEST_XL_RANGE_ABS(1, 0, 2, 0, "$A$2:$A$3");
+    TEST_XL_RANGE_ABS(9, 0, 1, 24, "$A$10:$Y$2");
+    TEST_XL_RANGE_ABS(7, 25, 9, 26, "$Z$8:$AA$10");
+    TEST_XL_RANGE_ABS(1, 254, 1, 255, "$IU$2:$IV$2");
+    TEST_XL_RANGE_ABS(1, 256, 0, 16383, "$IW$2:$XFD$1");
+    TEST_XL_RANGE_ABS(0, 0, 1048576, 16384, "$A$1:$XFE$1048577");
+    TEST_XL_RANGE_ABS(1048575, 16383, 1048576, 16384, "$XFD$1048576:$XFE$1048577");
+
+    // Test ranges that resolve to single cells.
+    TEST_XL_RANGE_ABS(0, 0, 0, 0, "$A$1");
+    TEST_XL_RANGE_ABS(1048576, 16384, 1048576, 16384, "$XFE$1048577");
+
+}
diff --git a/test/unit/utility/test_xl_row_col_to_cell.cpp b/test/unit/utility/test_xl_row_col_to_cell.cpp
new file mode 100644
index 00000000..537d9ce6
--- /dev/null
+++ b/test/unit/utility/test_xl_row_col_to_cell.cpp
@@ -0,0 +1,63 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/utility.h"
+
+// Test xl_rowcol_to_cell().
+TEST(utility, xl_rowcol_to_cell) {
+
+    char got[MAX_CELL_NAME_LENGTH];
+
+    TEST_ROWCOL_TO_CELL(0, 0, "A1");
+    TEST_ROWCOL_TO_CELL(0, 1, "B1");
+    TEST_ROWCOL_TO_CELL(0, 2, "C1");
+    TEST_ROWCOL_TO_CELL(0, 9, "J1");
+    TEST_ROWCOL_TO_CELL(1, 0, "A2");
+    TEST_ROWCOL_TO_CELL(2, 0, "A3");
+    TEST_ROWCOL_TO_CELL(9, 0, "A10");
+    TEST_ROWCOL_TO_CELL(1, 24, "Y2");
+    TEST_ROWCOL_TO_CELL(7, 25, "Z8");
+    TEST_ROWCOL_TO_CELL(9, 26, "AA10");
+    TEST_ROWCOL_TO_CELL(1, 254, "IU2");
+    TEST_ROWCOL_TO_CELL(1, 255, "IV2");
+    TEST_ROWCOL_TO_CELL(1, 256, "IW2");
+    TEST_ROWCOL_TO_CELL(0, 16383, "XFD1");
+    TEST_ROWCOL_TO_CELL(1048576, 16384, "XFE1048577");
+}
+
+// Test xl_rowcol_to_cell_abs().
+TEST(utility, xl_rowcol_to_cell_abs) {
+
+    char got[MAX_CELL_NAME_LENGTH];
+
+    TEST_ROWCOL_TO_CELL_ABS(0, 0, 0, 0, "A1");
+    TEST_ROWCOL_TO_CELL_ABS(0, 1, 0, 0, "B1");
+    TEST_ROWCOL_TO_CELL_ABS(0, 2, 0, 0, "C1");
+    TEST_ROWCOL_TO_CELL_ABS(0, 9, 0, 0, "J1");
+    TEST_ROWCOL_TO_CELL_ABS(1, 0, 0, 0, "A2");
+    TEST_ROWCOL_TO_CELL_ABS(2, 0, 0, 0, "A3");
+    TEST_ROWCOL_TO_CELL_ABS(9, 0, 0, 0, "A10");
+    TEST_ROWCOL_TO_CELL_ABS(1, 24, 0, 0, "Y2");
+    TEST_ROWCOL_TO_CELL_ABS(7, 25, 0, 0, "Z8");
+    TEST_ROWCOL_TO_CELL_ABS(9, 26, 0, 0, "AA10");
+    TEST_ROWCOL_TO_CELL_ABS(1, 254, 0, 0, "IU2");
+    TEST_ROWCOL_TO_CELL_ABS(1, 255, 0, 0, "IV2");
+    TEST_ROWCOL_TO_CELL_ABS(1, 256, 0, 0, "IW2");
+    TEST_ROWCOL_TO_CELL_ABS(0, 16383, 0, 0, "XFD1");
+    TEST_ROWCOL_TO_CELL_ABS(1048576, 16384, 0, 0, "XFE1048577");
+
+    TEST_ROWCOL_TO_CELL_ABS(0, 0, 1, 0, "A$1");
+    TEST_ROWCOL_TO_CELL_ABS(0, 0, 0, 1, "$A1");
+    TEST_ROWCOL_TO_CELL_ABS(0, 0, 1, 1, "$A$1");
+
+    TEST_ROWCOL_TO_CELL_ABS(1048576, 16384, 1, 0, "XFE$1048577");
+    TEST_ROWCOL_TO_CELL_ABS(1048576, 16384, 0, 1, "$XFE1048577");
+    TEST_ROWCOL_TO_CELL_ABS(1048576, 16384, 1, 1, "$XFE$1048577");
+}
diff --git a/test/unit/workbook/Makefile b/test/unit/workbook/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/workbook/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/workbook/test_workbook.cpp b/test/unit/workbook/test_workbook.cpp
new file mode 100644
index 00000000..8ab9dd18
--- /dev/null
+++ b/test/unit/workbook/test_workbook.cpp
@@ -0,0 +1,112 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+#include "xlsxwriter/shared_strings.h"
+
+// Test assembling a complete Workbook file.
+TEST(workbook, workbook01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<fileVersion appName=\"xl\" lastEdited=\"4\" lowestEdited=\"4\" rupBuild=\"4505\"/>"
+          "<workbookPr defaultThemeVersion=\"124226\"/>"
+          "<bookViews>"
+            "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\"/>"
+          "</bookViews>"
+          "<sheets>"
+            "<sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/>"
+          "</sheets>"
+          "<calcPr calcId=\"124519\" fullCalcOnLoad=\"1\"/>"
+        "</workbook>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    workbook_add_worksheet(workbook, NULL);
+
+    _workbook_assemble_xml_file(workbook);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test assembling a complete Workbook file.
+TEST(workbook, workbook02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<fileVersion appName=\"xl\" lastEdited=\"4\" lowestEdited=\"4\" rupBuild=\"4505\"/>"
+          "<workbookPr defaultThemeVersion=\"124226\"/>"
+          "<bookViews>"
+            "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\"/>"
+          "</bookViews>"
+          "<sheets>"
+            "<sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/>"
+            "<sheet name=\"Sheet2\" sheetId=\"2\" r:id=\"rId2\"/>"
+          "</sheets>"
+          "<calcPr calcId=\"124519\" fullCalcOnLoad=\"1\"/>"
+        "</workbook>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    workbook_add_worksheet(workbook, NULL);
+    workbook_add_worksheet(workbook, NULL);
+
+    _workbook_assemble_xml_file(workbook);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test assembling a complete Workbook file.
+TEST(workbook, workbook03) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<fileVersion appName=\"xl\" lastEdited=\"4\" lowestEdited=\"4\" rupBuild=\"4505\"/>"
+          "<workbookPr defaultThemeVersion=\"124226\"/>"
+          "<bookViews>"
+            "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\"/>"
+          "</bookViews>"
+          "<sheets>"
+            "<sheet name=\"Non Default Name\" sheetId=\"1\" r:id=\"rId1\"/>"
+            "<sheet name=\"Another Name\" sheetId=\"2\" r:id=\"rId2\"/>"
+          "</sheets>"
+          "<calcPr calcId=\"124519\" fullCalcOnLoad=\"1\"/>"
+        "</workbook>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    workbook_add_worksheet(workbook, "Non Default Name");
+    workbook_add_worksheet(workbook, "Another Name");
+
+    _workbook_assemble_xml_file(workbook);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_workbook(workbook);
+}
diff --git a/test/unit/workbook/test_workbook_write_book_views.cpp b/test/unit/workbook/test_workbook_write_book_views.cpp
new file mode 100644
index 00000000..99570a97
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_book_views.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_book_views() function.
+TEST(workbook, write_book_views) {
+
+
+    char* got;
+    char exp[] = "<bookViews><workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\"/></bookViews>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_book_views(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_calc_pr.cpp b/test/unit/workbook/test_workbook_write_calc_pr.cpp
new file mode 100644
index 00000000..79f97914
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_calc_pr.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_calc_pr() function.
+TEST(workbook, write_calc_pr) {
+
+
+    char* got;
+    char exp[] = "<calcPr calcId=\"124519\" fullCalcOnLoad=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_calc_pr(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_file_version.cpp b/test/unit/workbook/test_workbook_write_file_version.cpp
new file mode 100644
index 00000000..ed48b2d4
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_file_version.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_file_version() function.
+TEST(workbook, write_file_version) {
+
+    char* got;
+    char exp[] = "<fileVersion appName=\"xl\" lastEdited=\"4\" lowestEdited=\"4\" rupBuild=\"4505\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_file_version(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_sheet.cpp b/test/unit/workbook/test_workbook_write_sheet.cpp
new file mode 100644
index 00000000..41e51156
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_sheet.cpp
@@ -0,0 +1,66 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_sheet() function.
+TEST(workbook, write_sheet1) {
+
+
+    char* got;
+    char exp[] = "<sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_sheet(workbook, "Sheet1", 1, 0);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test the _write_sheet() function.
+TEST(workbook, write_sheet2) {
+
+
+    char* got;
+    char exp[] = "<sheet name=\"Sheet1\" sheetId=\"1\" state=\"hidden\" r:id=\"rId1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_sheet(workbook, "Sheet1", 1, 1);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test the _write_sheet() function.
+TEST(workbook, write_sheet3) {
+
+
+    char* got;
+    char exp[] = "<sheet name=\"Bits &amp; Bobs\" sheetId=\"1\" r:id=\"rId1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_sheet(workbook, "Bits & Bobs", 1, 0);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_sheets.cpp b/test/unit/workbook/test_workbook_write_sheets.cpp
new file mode 100644
index 00000000..c5ec3552
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_sheets.cpp
@@ -0,0 +1,32 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_sheets() function.
+TEST(workbook, write_sheets) {
+
+
+    char* got;
+    char exp[] = "<sheets><sheet name=\"Sheet1\" sheetId=\"1\" r:id=\"rId1\"/></sheets>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    workbook_add_worksheet(workbook, NULL);
+
+    _write_sheets(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_workbook.cpp b/test/unit/workbook/test_workbook_write_workbook.cpp
new file mode 100644
index 00000000..8142bf39
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_workbook.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_workbook() function.
+TEST(workbook, write_workbook) {
+
+    char* got;
+    char exp[] = "<workbook xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_workbook(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_workbook_pr.cpp b/test/unit/workbook/test_workbook_write_workbook_pr.cpp
new file mode 100644
index 00000000..84d157e5
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_workbook_pr.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_workbook_pr() function.
+TEST(workbook, write_workbook_pr) {
+
+    char* got;
+    char exp[] = "<workbookPr defaultThemeVersion=\"124226\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_workbook_pr(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_write_workbook_view.cpp b/test/unit/workbook/test_workbook_write_workbook_view.cpp
new file mode 100644
index 00000000..ecc4fd3b
--- /dev/null
+++ b/test/unit/workbook/test_workbook_write_workbook_view.cpp
@@ -0,0 +1,70 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test the _write_workbook_view() function.
+TEST(workbook, write_workbook_view1) {
+
+
+    char* got;
+    char exp[] = "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _write_workbook_view(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test the _write_workbook_view() function.
+TEST(workbook, write_workbook_view2) {
+
+
+    char* got;
+    char exp[] = "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\" activeTab=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+    workbook->active_tab = 1;
+
+    _write_workbook_view(workbook);
+
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
+// Test the _write_workbook_view() function.
+TEST(workbook, write_workbook_view3) {
+
+
+    char* got;
+    char exp[] = "<workbookView xWindow=\"240\" yWindow=\"15\" windowWidth=\"16095\" windowHeight=\"9660\" firstSheet=\"2\" activeTab=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+    workbook->active_tab = 1;
+    workbook->first_sheet = 2;
+
+    _write_workbook_view(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
+
diff --git a/test/unit/workbook/test_workbook_xml_declaration.cpp b/test/unit/workbook/test_workbook_xml_declaration.cpp
new file mode 100644
index 00000000..ef3d571b
--- /dev/null
+++ b/test/unit/workbook/test_workbook_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/workbook.h"
+
+// Test _xml_declaration().
+TEST(workbook, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_workbook *workbook = new_workbook(NULL);
+    workbook->file = testfile;
+
+    _workbook_xml_declaration(workbook);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_workbook(workbook);
+}
diff --git a/test/unit/worksheet/Makefile b/test/unit/worksheet/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/worksheet/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/worksheet/test_worksheet.cpp b/test/unit/worksheet/test_worksheet.cpp
new file mode 100644
index 00000000..0f2290d2
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet.cpp
@@ -0,0 +1,137 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+#include "xlsxwriter/shared_strings.h"
+
+// Test assembling a complete Worksheet file.
+TEST(worksheet, worksheet01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"A1\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData/>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a complete Worksheet file.
+TEST(worksheet, worksheet02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"A1\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1\" spans=\"1:1\">"
+              "<c r=\"A1\">"
+                "<v>123</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    worksheet_write_number(worksheet, 0, 0, 123, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a complete Worksheet file.
+TEST(worksheet, worksheet03) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"A1:E9\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1\" spans=\"1:5\">"
+              "<c r=\"A1\" t=\"s\">"
+                "<v>0</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"2\" spans=\"1:5\">"
+              "<c r=\"C2\">"
+                "<v>123</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"4\" spans=\"1:5\">"
+              "<c r=\"B4\" t=\"s\">"
+                "<v>1</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"9\" spans=\"1:5\">"
+              "<c r=\"E9\">"
+                "<v>890</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->sst = _new_sst();
+    worksheet->selected = 1;
+
+    worksheet_write_string(worksheet, 0, 0, "Foo", NULL);
+    worksheet_write_number(worksheet, 1, 2, 123, NULL);
+    worksheet_write_string(worksheet, 3, 1, "Bar", NULL);
+    worksheet_write_number(worksheet, 8, 4, 890, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_sst(worksheet->sst);
+    _free_worksheet(worksheet);
+}
+
+
diff --git a/test/unit/worksheet/test_worksheet_spans.cpp b/test/unit/worksheet/test_worksheet_spans.cpp
new file mode 100644
index 00000000..a020aaff
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_spans.cpp
@@ -0,0 +1,316 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test assembling a Worksheet file with different span ranges.
+TEST(worksheet, spans01) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"B3\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"3\" spans=\"2:2\">"
+              "<c r=\"B3\">"
+                "<v>2000</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    worksheet_write_number(worksheet, 2, 1, 2000, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a Worksheet file with different span ranges.
+TEST(worksheet, spans02) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"A1048576\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1048576\" spans=\"1:1\">"
+              "<c r=\"A1048576\">"
+                "<v>123</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    worksheet_write_number(worksheet, 1048575, 0, 123, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a Worksheet file with different span ranges.
+TEST(worksheet, spans03) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"XFD1\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1\" spans=\"16384:16384\">"
+              "<c r=\"XFD1\">"
+                "<v>123</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    worksheet_write_number(worksheet, 0, 16383, 123, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a Worksheet file with different span ranges.
+TEST(worksheet, spans04) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"XFD1048576\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1048576\" spans=\"16384:16384\">"
+              "<c r=\"XFD1048576\">"
+                "<v>123</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    worksheet_write_number(worksheet, 1048575, 16383, 123, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ_SHORT(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test assembling a Worksheet file with different span ranges.
+TEST(worksheet, spans05) {
+
+    char* got;
+    char exp[] =
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        "<worksheet xmlns=\"http://schemas.openxmlformats.org/spreadsheetml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">"
+          "<dimension ref=\"A1:T20\"/>"
+          "<sheetViews>"
+            "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>"
+          "</sheetViews>"
+          "<sheetFormatPr defaultRowHeight=\"15\"/>"
+          "<sheetData>"
+            "<row r=\"1\" spans=\"1:16\">"
+              "<c r=\"A1\">"
+                "<v>1</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"2\" spans=\"1:16\">"
+              "<c r=\"B2\">"
+                "<v>2</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"3\" spans=\"1:16\">"
+              "<c r=\"C3\">"
+                "<v>3</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"4\" spans=\"1:16\">"
+              "<c r=\"D4\">"
+                "<v>4</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"5\" spans=\"1:16\">"
+              "<c r=\"E5\">"
+                "<v>5</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"6\" spans=\"1:16\">"
+              "<c r=\"F6\">"
+                "<v>6</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"7\" spans=\"1:16\">"
+              "<c r=\"G7\">"
+                "<v>7</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"8\" spans=\"1:16\">"
+              "<c r=\"H8\">"
+                "<v>8</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"9\" spans=\"1:16\">"
+              "<c r=\"I9\">"
+                "<v>9</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"10\" spans=\"1:16\">"
+              "<c r=\"J10\">"
+                "<v>10</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"11\" spans=\"1:16\">"
+              "<c r=\"K11\">"
+                "<v>11</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"12\" spans=\"1:16\">"
+              "<c r=\"L12\">"
+                "<v>12</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"13\" spans=\"1:16\">"
+              "<c r=\"M13\">"
+                "<v>13</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"14\" spans=\"1:16\">"
+              "<c r=\"N14\">"
+                "<v>14</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"15\" spans=\"1:16\">"
+              "<c r=\"O15\">"
+                "<v>15</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"16\" spans=\"1:16\">"
+              "<c r=\"P16\">"
+                "<v>16</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"17\" spans=\"17:20\">"
+              "<c r=\"Q17\">"
+                "<v>17</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"18\" spans=\"17:20\">"
+              "<c r=\"R18\">"
+                "<v>18</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"19\" spans=\"17:20\">"
+              "<c r=\"S19\">"
+                "<v>19</v>"
+              "</c>"
+            "</row>"
+            "<row r=\"20\" spans=\"17:20\">"
+              "<c r=\"T20\">"
+                "<v>20</v>"
+              "</c>"
+            "</row>"
+          "</sheetData>"
+          "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>"
+        "</worksheet>";
+
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    for (int i = 0; i < 20; i++)
+        worksheet_write_number(worksheet, i, i, i + 1, NULL);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
+// Test some out of bound writes.
+TEST(worksheet, spans06) {
+
+    int err;
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    err = worksheet_write_number(worksheet, 0, 16384, 123, NULL);
+    ASSERT_EQ(LXW_RANGE_ERROR, err);
+
+    err = worksheet_write_number(worksheet, 1048576, 0, 123, NULL);
+    ASSERT_EQ(LXW_RANGE_ERROR, err);
+
+    err = worksheet_write_number(worksheet, 1048576, 16384, 123, NULL);
+    ASSERT_EQ(LXW_RANGE_ERROR, err);
+
+    _worksheet_assemble_xml_file(worksheet);
+
+    _free_worksheet(worksheet);
+}
diff --git a/test/unit/worksheet/test_worksheet_write_dimension.cpp b/test/unit/worksheet/test_worksheet_write_dimension.cpp
new file mode 100644
index 00000000..b086abc4
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_dimension.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_dimension() function.
+TEST(worksheet, write_dimension) {
+
+    char* got;
+    char exp[] = "<dimension ref=\"A1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    _worksheet_write_dimension(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
diff --git a/test/unit/worksheet/test_worksheet_write_page_margins.cpp b/test/unit/worksheet/test_worksheet_write_page_margins.cpp
new file mode 100644
index 00000000..230701fb
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_page_margins.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_page_margins() function.
+TEST(worksheet, write_page_margins) {
+
+    char* got;
+    char exp[] = "<pageMargins left=\"0.7\" right=\"0.7\" top=\"0.75\" bottom=\"0.75\" header=\"0.3\" footer=\"0.3\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    _worksheet_write_page_margins(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
diff --git a/test/unit/worksheet/test_worksheet_write_row.cpp b/test/unit/worksheet/test_worksheet_write_row.cpp
new file mode 100644
index 00000000..afb36d0b
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_row.cpp
@@ -0,0 +1,31 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_row() function.
+TEST(worksheet, write_row) {
+
+    char* got;
+    char exp[] = "<row r=\"1\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    lxw_row *row = _get_row(worksheet->table, 0);
+
+    _write_row(worksheet, row, NULL);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
diff --git a/test/unit/worksheet/test_worksheet_write_sheet_data.cpp b/test/unit/worksheet/test_worksheet_write_sheet_data.cpp
new file mode 100644
index 00000000..3f7e294d
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_sheet_data.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_sheet_data() function.
+TEST(worksheet, write_sheet_data) {
+
+    char* got;
+    char exp[] = "<sheetData/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    _worksheet_write_sheet_data(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
diff --git a/test/unit/worksheet/test_worksheet_write_sheet_format_pr.cpp b/test/unit/worksheet/test_worksheet_write_sheet_format_pr.cpp
new file mode 100644
index 00000000..144735aa
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_sheet_format_pr.cpp
@@ -0,0 +1,29 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_sheet_format_pr() function.
+TEST(worksheet, write_sheet_format_pr) {
+
+    char* got;
+    char exp[] = "<sheetFormatPr defaultRowHeight=\"15\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    _worksheet_write_sheet_format_pr(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
diff --git a/test/unit/worksheet/test_worksheet_write_sheet_view.cpp b/test/unit/worksheet/test_worksheet_write_sheet_view.cpp
new file mode 100644
index 00000000..05a2a3dc
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_sheet_view.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_sheet_view() function.
+TEST(worksheet, write_sheet_view) {
+
+    char* got;
+    char exp[] = "<sheetView tabSelected=\"1\" workbookViewId=\"0\"/>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    _worksheet_write_sheet_view(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
diff --git a/test/unit/worksheet/test_worksheet_write_sheet_views.cpp b/test/unit/worksheet/test_worksheet_write_sheet_views.cpp
new file mode 100644
index 00000000..0af9bae4
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_write_sheet_views.cpp
@@ -0,0 +1,30 @@
+/*
+ * Tests for the lib_xlsx_writer library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test the _write_sheet_views() function.
+TEST(worksheet, write_sheet_views) {
+
+    char* got;
+    char exp[] = "<sheetViews><sheetView tabSelected=\"1\" workbookViewId=\"0\"/></sheetViews>";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+    worksheet->selected = 1;
+
+    _worksheet_write_sheet_views(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
+
diff --git a/test/unit/worksheet/test_worksheet_xml_declaration.cpp b/test/unit/worksheet/test_worksheet_xml_declaration.cpp
new file mode 100644
index 00000000..fc7562e0
--- /dev/null
+++ b/test/unit/worksheet/test_worksheet_xml_declaration.cpp
@@ -0,0 +1,28 @@
+/*
+ * Tests for the libxlsxwriter library.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/worksheet.h"
+
+// Test _xml_declaration().
+TEST(worksheet, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    lxw_worksheet *worksheet = _new_worksheet(NULL);
+    worksheet->file = testfile;
+
+    _worksheet_xml_declaration(worksheet);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _free_worksheet(worksheet);
+}
diff --git a/test/unit/xmlwriter/Makefile b/test/unit/xmlwriter/Makefile
new file mode 100644
index 00000000..042a2fa8
--- /dev/null
+++ b/test/unit/xmlwriter/Makefile
@@ -0,0 +1,8 @@
+###############################################################################
+#
+# Makefile for libxlsxwriter library.
+#
+# Copyright 2014, John McNamara, jmcnamara@cpan.org
+#
+
+include ../Makefile.unit
diff --git a/test/unit/xmlwriter/test_xmlwriter.cpp b/test/unit/xmlwriter/test_xmlwriter.cpp
new file mode 100644
index 00000000..ea6ab47f
--- /dev/null
+++ b/test/unit/xmlwriter/test_xmlwriter.cpp
@@ -0,0 +1,226 @@
+/*
+ * Tests for xmlwriter.
+ *
+ * Copyright 2014, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include <gtest/gtest.h>
+#include "../helper.h"
+
+#include "xlsxwriter/xmlwriter.h"
+
+// Test _xml_declaration().
+TEST(xmlwriter, xml_declaration) {
+
+    char* got;
+    char exp[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    FILE* testfile = tmpfile();
+
+    _xml_declaration(testfile);
+
+    RUN_XLSX_STREQ(exp, got);
+}
+
+// Test _xml_start_tag() with no attributes.
+TEST(xmlwriter, xml_start_tag) {
+
+    char* got;
+    char exp[] = "<foo>";
+    FILE* testfile = tmpfile();
+
+    _xml_start_tag(testfile, "foo", NULL);
+
+    RUN_XLSX_STREQ(exp, got);
+}
+
+// Test _xml_start_tag() with attributes.
+TEST(xmlwriter, xml_start_tag_with_attributes) {
+
+    char* got;
+    char exp[] = "<foo span=\"8\" baz=\"7\">";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "8");
+    _PUSH_ATTRIBUTES_STR("baz",  "7");
+
+    _xml_start_tag(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_start_tag() with attributes requiring escaping.
+TEST(xmlwriter, xml_start_tag_with_attributes_to_escape) {
+
+    char* got;
+    char exp[] = "<foo span=\"&amp;&lt;&gt;&quot;\">";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "&<>\"");
+
+    _xml_start_tag(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_start_tag_unencoded() with attributes.
+TEST(xmlwriter, xml_start_tag_unencoded) {
+
+    char* got;
+    char exp[] = "<foo span=\"&<>\"\">";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "&<>\"");
+
+    _xml_start_tag_unencoded(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_end_tag().
+TEST(xmlwriter, xml_end_tag) {
+
+    char* got;
+    char exp[] = "</foo>";
+    FILE* testfile = tmpfile();
+
+    _xml_end_tag(testfile, "foo");
+
+    RUN_XLSX_STREQ(exp, got);
+}
+
+// Test _xml_empty_tag() with no attributes.
+TEST(xmlwriter, xml_empty_tag) {
+
+    char* got;
+    char exp[] = "<foo/>";
+    FILE* testfile = tmpfile();
+
+    _xml_empty_tag(testfile, "foo", NULL);
+
+    RUN_XLSX_STREQ(exp, got);
+}
+
+// Test _xml_empty_tag() with attributes.
+TEST(xmlwriter, xml_empty_tag_with_attributes) {
+
+    char* got;
+    char exp[] = "<foo span=\"8\" baz=\"7\"/>";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "8");
+    _PUSH_ATTRIBUTES_STR("baz",  "7");
+
+    _xml_empty_tag(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_empty_tag() with attributes requiring escaping.
+TEST(xmlwriter, xml_empty_tag_with_attributes_to_escape) {
+
+    char* got;
+    char exp[] = "<foo span=\"&amp;&lt;&gt;&quot;\"/>";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "&<>\"");
+
+    _xml_empty_tag(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_empty_tag_unencoded() with attributes.
+TEST(xmlwriter, xml_empty_tag_unencoded) {
+
+    char* got;
+    char exp[] = "<foo span=\"&<>\"\"/>";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "&<>\"");
+
+    _xml_empty_tag_unencoded(testfile, "foo", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_empty_tag() with no attributes.
+TEST(xmlwriter, xml_data_element) {
+
+    char* got;
+    char exp[] = "<foo>bar</foo>";
+    FILE* testfile = tmpfile();
+
+    _xml_data_element(testfile, "foo", "bar", NULL);
+
+    RUN_XLSX_STREQ(exp, got);
+}
+
+// Test _xml_data_element() with attributes.
+TEST(xmlwriter, xml_data_element_with_attributes) {
+
+    char* got;
+    char exp[] = "<foo span=\"8\">bar</foo>";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "8");
+
+    _xml_data_element(testfile, "foo", "bar", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
+// Test _xml_data_element() with data requiring escaping.
+TEST(xmlwriter, xml_data_element_with_escapes) {
+
+    char* got;
+    char exp[] = "<foo span=\"8\">&amp;&lt;&gt;\"</foo>";
+    FILE* testfile = tmpfile();
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    _INIT_ATTRIBUTES();
+    _PUSH_ATTRIBUTES_STR("span", "8");
+
+    _xml_data_element(testfile, "foo", "&<>\"", &attributes);
+
+    RUN_XLSX_STREQ(exp, got);
+
+    _FREE_ATTRIBUTES();
+}
+
diff --git a/third_party/minizip/Makefile b/third_party/minizip/Makefile
new file mode 100644
index 00000000..b672cc47
--- /dev/null
+++ b/third_party/minizip/Makefile
@@ -0,0 +1,23 @@
+###############################################################################
+#
+# Simplied Makefile to build the minizip objects for the libxlsxwriter library.
+#
+
+# Keep the output quiet by default.
+Q=@
+ifdef V
+Q=
+endif
+
+CFLAGS = -O3
+
+all: ioapi.o zip.o  ioapi.so zip.so
+
+%.o  : %.c
+	$(Q)$(CC)       -c $(CFLAGS) $<
+
+%.so : %.c
+	$(Q)$(CC) -fPIC -c $(CFLAGS) $< -o $@
+
+clean:
+	$(Q)/bin/rm -f *.o *.so
diff --git a/third_party/minizip/Makefile.am b/third_party/minizip/Makefile.am
new file mode 100644
index 00000000..d343011e
--- /dev/null
+++ b/third_party/minizip/Makefile.am
@@ -0,0 +1,45 @@
+lib_LTLIBRARIES = libminizip.la
+
+if COND_DEMOS
+bin_PROGRAMS = miniunzip minizip
+endif
+
+zlib_top_srcdir = $(top_srcdir)/../..
+zlib_top_builddir = $(top_builddir)/../..
+
+AM_CPPFLAGS = -I$(zlib_top_srcdir)
+AM_LDFLAGS = -L$(zlib_top_builddir)
+
+if WIN32
+iowin32_src = iowin32.c
+iowin32_h = iowin32.h
+endif
+
+libminizip_la_SOURCES = \
+	ioapi.c \
+	mztools.c \
+	unzip.c \
+	zip.c \
+	${iowin32_src}
+
+libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
+
+minizip_includedir = $(includedir)/minizip
+minizip_include_HEADERS = \
+	crypt.h \
+	ioapi.h \
+	mztools.h \
+	unzip.h \
+	zip.h \
+	${iowin32_h}
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = minizip.pc
+
+EXTRA_PROGRAMS = miniunzip minizip
+
+miniunzip_SOURCES = miniunz.c
+miniunzip_LDADD = libminizip.la
+
+minizip_SOURCES = minizip.c
+minizip_LDADD = libminizip.la -lz
diff --git a/third_party/minizip/Makefile.orig b/third_party/minizip/Makefile.orig
new file mode 100644
index 00000000..84eaad20
--- /dev/null
+++ b/third_party/minizip/Makefile.orig
@@ -0,0 +1,25 @@
+CC=cc
+CFLAGS=-O -I../..
+
+UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
+ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
+
+.c.o:
+	$(CC) -c $(CFLAGS) $*.c
+
+all: miniunz minizip
+
+miniunz:  $(UNZ_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
+
+minizip:  $(ZIP_OBJS)
+	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
+
+test:	miniunz minizip
+	./minizip test readme.txt
+	./miniunz -l test.zip
+	mv readme.txt readme.old
+	./miniunz test.zip
+
+clean:
+	/bin/rm -f *.o *~ minizip miniunz
diff --git a/third_party/minizip/MiniZip64_Changes.txt b/third_party/minizip/MiniZip64_Changes.txt
new file mode 100644
index 00000000..13a1bd91
--- /dev/null
+++ b/third_party/minizip/MiniZip64_Changes.txt
@@ -0,0 +1,6 @@
+
+MiniZip 1.1 was derrived from MiniZip at version 1.01f
+
+Change in 1.0 (Okt 2009)
+ - **TODO - Add history**
+
diff --git a/third_party/minizip/MiniZip64_info.txt b/third_party/minizip/MiniZip64_info.txt
new file mode 100644
index 00000000..57d71524
--- /dev/null
+++ b/third_party/minizip/MiniZip64_info.txt
@@ -0,0 +1,74 @@
+MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
+
+Introduction
+---------------------
+MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
+
+When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
+All possible work was done for compatibility.
+
+
+Background
+---------------------
+When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 
+support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
+
+That was used as a starting point. And after that ZIP64 support was added to zip.c
+some refactoring and code cleanup was also done.
+
+
+Changed from MiniZip 1.0 to MiniZip 1.1
+---------------------------------------
+* Added ZIP64 support for unzip ( by Even Rouault )
+* Added ZIP64 support for zip ( by Mathias Svensson )
+* Reverted some changed that Even Rouault did.
+* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
+* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
+* Added BZIP Compress method for zip
+* Did some refactoring and code cleanup
+
+
+Credits
+
+ Gilles Vollant    - Original MiniZip author
+ Even Rouault      - ZIP64 unzip Support
+ Daniel Borca      - BZip Compression method support in unzip
+ Mathias Svensson  - ZIP64 zip support
+ Mathias Svensson  - BZip Compression method support in zip
+
+ Resources
+
+ ZipLayout   http://result42.com/projects/ZipFileLayout
+             Command line tool for Windows that shows the layout and information of the headers in a zip archive.
+             Used when debugging and validating the creation of zip files using MiniZip64
+
+
+ ZIP App Note  http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+               Zip File specification
+
+
+Notes.
+ * To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
+
+License
+----------------------------------------------------------
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+----------------------------------------------------------
+
diff --git a/third_party/minizip/README.txt b/third_party/minizip/README.txt
new file mode 100644
index 00000000..c18ecf3a
--- /dev/null
+++ b/third_party/minizip/README.txt
@@ -0,0 +1,5 @@
+The souce files in this directory are included in libxlsxwriter from the
+contrib/minizip/ directory of zlib-1.2.8.
+
+The files zip.h and ioapi.h have had a small number of comments modifed from
+C++ to C style to avoid warnings with -pedantic -ansi.
diff --git a/third_party/minizip/configure.ac b/third_party/minizip/configure.ac
new file mode 100644
index 00000000..827a4e05
--- /dev/null
+++ b/third_party/minizip/configure.ac
@@ -0,0 +1,32 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([minizip.c])
+AM_INIT_AUTOMAKE([foreign])
+LT_INIT
+
+AC_MSG_CHECKING([whether to build example programs])
+AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs]))
+AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes])
+if test "$enable_demos" = yes
+then
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
+
+case "${host}" in
+	*-mingw* | mingw*)
+		WIN32="yes"
+		;;
+	*)
+		;;
+esac
+AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
+
+
+AC_SUBST([HAVE_UNISTD_H], [0])
+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
+AC_CONFIG_FILES([Makefile minizip.pc])
+AC_OUTPUT
diff --git a/third_party/minizip/crypt.h b/third_party/minizip/crypt.h
new file mode 100644
index 00000000..1e9e8200
--- /dev/null
+++ b/third_party/minizip/crypt.h
@@ -0,0 +1,131 @@
+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const z_crc_t* pcrc_32_tab,
+                     unsigned long crcForCrypting)
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/third_party/minizip/ioapi.c b/third_party/minizip/ioapi.c
new file mode 100644
index 00000000..7f5c191b
--- /dev/null
+++ b/third_party/minizip/ioapi.c
@@ -0,0 +1,247 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
+        #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#if defined(__APPLE__) || defined(IOAPI_NO_64)
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+#include "ioapi.h"
+
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
+    else
+    {
+        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+    }
+}
+
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    else
+    {
+        uLong offsetTruncated = (uLong)offset;
+        if (offsetTruncated != offset)
+            return -1;
+        else
+            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+    }
+}
+
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
+    else
+    {
+        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        if ((tell_uLong) == MAXU32)
+            return (ZPOS64_T)-1;
+        else
+            return tell_uLong;
+    }
+}
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
+
+
+
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = FOPEN_FUNC((const char*)filename, mode_fopen);
+    return file;
+}
+
+
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret;
+    ret = FTELLO_FUNC((FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+        ret = -1;
+    return ret;
+}
+
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+
+    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
+                        ret = -1;
+
+    return ret;
+}
+
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/third_party/minizip/ioapi.h b/third_party/minizip/ioapi.h
new file mode 100644
index 00000000..4a4897f3
--- /dev/null
+++ b/third_party/minizip/ioapi.h
@@ -0,0 +1,208 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
+
+*/
+
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef __FreeBSD__
+#define fopen64 fopen
+#define ftello64 ftello
+#define fseeko64 fseeko
+#endif
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#define MAXU32 0xffffffff
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
+#endif
+
+
+
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
+
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
+
+
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+/* #define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) */
+/* #define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) */
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/third_party/minizip/iowin32.c b/third_party/minizip/iowin32.c
new file mode 100644
index 00000000..a46d96c7
--- /dev/null
+++ b/third_party/minizip/iowin32.c
@@ -0,0 +1,461 @@
+/* iowin32.c -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+     For more info read MiniZip_info.txt
+
+*/
+
+#include <stdlib.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+#include "iowin32.h"
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
+#endif
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#endif
+
+
+#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#define IOWIN32_USING_WINRT_API 1
+#endif
+#endif
+
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
+
+typedef struct
+{
+    HANDLE hf;
+    int error;
+} WIN32FILE_IOWIN;
+
+
+static void win32_translate_open_mode(int mode,
+                                      DWORD* lpdwDesiredAccess,
+                                      DWORD* lpdwCreationDisposition,
+                                      DWORD* lpdwShareMode,
+                                      DWORD* lpdwFlagsAndAttributes)
+{
+    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
+
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    {
+        *lpdwDesiredAccess = GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+        *lpdwShareMode = FILE_SHARE_READ;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
+    }
+}
+
+static voidpf win32_build_iowin(HANDLE hFile)
+{
+    voidpf ret=NULL;
+
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
+    {
+        WIN32FILE_IOWIN w32fiow;
+        w32fiow.hf = hFile;
+        w32fiow.error = 0;
+        ret = malloc(sizeof(WIN32FILE_IOWIN));
+
+        if (ret==NULL)
+            CloseHandle(hFile);
+        else
+            *((WIN32FILE_IOWIN*)ret) = w32fiow;
+    }
+    return ret;
+}
+
+voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!ReadFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!WriteFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
+{
+#ifdef IOWIN32_USING_WINRT_API
+    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
+#else
+    LONG lHigh = pos.HighPart;
+    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
+    BOOL fOk = TRUE;
+    if (dwNewPos == 0xFFFFFFFF)
+        if (GetLastError() != NO_ERROR)
+            fOk = FALSE;
+    if ((newPos != NULL) && (fOk))
+    {
+        newPos->LowPart = dwNewPos;
+        newPos->HighPart = lHigh;
+    }
+    return fOk;
+#endif
+}
+
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+{
+    long ret=-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    if (hFile != NULL)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=(long)pos.LowPart;
+    }
+    return ret;
+}
+
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret= (ZPOS64_T)-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = (ZPOS64_T)-1;
+        }
+        else
+            ret=pos.QuadPart;
+    }
+    return ret;
+}
+
+
+long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+
+    long ret=-1;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        dwMoveMethod = FILE_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    default: return -1;
+    }
+
+    if (hFile != NULL)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+    long ret=-1;
+
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR :
+            dwMoveMethod = FILE_CURRENT;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END :
+            dwMoveMethod = FILE_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET :
+            dwMoveMethod = FILE_BEGIN;
+            break;
+        default: return -1;
+    }
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
+{
+    int ret=-1;
+
+    if (stream!=NULL)
+    {
+        HANDLE hFile;
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+        if (hFile != NULL)
+        {
+            CloseHandle(hFile);
+            ret=0;
+        }
+        free(stream);
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
+{
+    int ret=-1;
+    if (stream!=NULL)
+    {
+        ret = ((WIN32FILE_IOWIN*)stream) -> error;
+    }
+    return ret;
+}
+
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen_file = win32_open_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
+    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/third_party/minizip/iowin32.h b/third_party/minizip/iowin32.h
new file mode 100644
index 00000000..0ca0969a
--- /dev/null
+++ b/third_party/minizip/iowin32.h
@@ -0,0 +1,28 @@
+/* iowin32.h -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#include <windows.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/third_party/minizip/make_vms.com b/third_party/minizip/make_vms.com
new file mode 100644
index 00000000..9ac13a98
--- /dev/null
+++ b/third_party/minizip/make_vms.com
@@ -0,0 +1,25 @@
+$ if f$search("ioapi.h_orig") .eqs. "" then copy ioapi.h ioapi.h_orig
+$ open/write zdef vmsdefs.h
+$ copy sys$input: zdef
+$ deck
+#define unix
+#define fill_zlib_filefunc64_32_def_from_filefunc32 fillzffunc64from
+#define Write_Zip64EndOfCentralDirectoryLocator Write_Zip64EoDLocator
+#define Write_Zip64EndOfCentralDirectoryRecord Write_Zip64EoDRecord
+#define Write_EndOfCentralDirectoryRecord Write_EoDRecord
+$ eod
+$ close zdef
+$ copy vmsdefs.h,ioapi.h_orig ioapi.h
+$ cc/include=[--]/prefix=all ioapi.c
+$ cc/include=[--]/prefix=all miniunz.c
+$ cc/include=[--]/prefix=all unzip.c
+$ cc/include=[--]/prefix=all minizip.c
+$ cc/include=[--]/prefix=all zip.c
+$ link miniunz,unzip,ioapi,[--]libz.olb/lib
+$ link minizip,zip,ioapi,[--]libz.olb/lib
+$ mcr []minizip test minizip_info.txt
+$ mcr []miniunz -l test.zip
+$ rename minizip_info.txt; minizip_info.txt_old
+$ mcr []miniunz test.zip
+$ delete test.zip;*
+$exit
diff --git a/third_party/minizip/miniunz.c b/third_party/minizip/miniunz.c
new file mode 100644
index 00000000..3d65401b
--- /dev/null
+++ b/third_party/minizip/miniunz.c
@@ -0,0 +1,660 @@
+/*
+   miniunz.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <direct.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <utime.h>
+#endif
+
+
+#include "unzip.h"
+
+#define CASESENSITIVITY (0)
+#define WRITEBUFFERSIZE (8192)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+#define USEWIN32IOAPI
+#include "iowin32.h"
+#endif
+/*
+  mini unzip, demo of unzip package
+
+  usage :
+  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
+
+  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
+    if it exists
+*/
+
+
+/* change_file_date : change the date/time of a file
+    filename : the filename of the file where date/time must be modified
+    dosdate : the new date at the MSDos format (4 bytes)
+    tmu_date : the SAME new date at the tm_unz format */
+void change_file_date(filename,dosdate,tmu_date)
+    const char *filename;
+    uLong dosdate;
+    tm_unz tmu_date;
+{
+#ifdef _WIN32
+  HANDLE hFile;
+  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
+
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
+                      0,NULL,OPEN_EXISTING,0,NULL);
+  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
+  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
+  LocalFileTimeToFileTime(&ftLocal,&ftm);
+  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+  CloseHandle(hFile);
+#else
+#ifdef unix || __APPLE__
+  struct utimbuf ut;
+  struct tm newdate;
+  newdate.tm_sec = tmu_date.tm_sec;
+  newdate.tm_min=tmu_date.tm_min;
+  newdate.tm_hour=tmu_date.tm_hour;
+  newdate.tm_mday=tmu_date.tm_mday;
+  newdate.tm_mon=tmu_date.tm_mon;
+  if (tmu_date.tm_year > 1900)
+      newdate.tm_year=tmu_date.tm_year - 1900;
+  else
+      newdate.tm_year=tmu_date.tm_year ;
+  newdate.tm_isdst=-1;
+
+  ut.actime=ut.modtime=mktime(&newdate);
+  utime(filename,&ut);
+#endif
+#endif
+}
+
+
+/* mymkdir and change_file_date are not 100 % portable
+   As I don't know well Unix, I wait feedback for the unix portion */
+
+int mymkdir(dirname)
+    const char* dirname;
+{
+    int ret=0;
+#ifdef _WIN32
+    ret = _mkdir(dirname);
+#elif unix
+    ret = mkdir (dirname,0775);
+#elif __APPLE__
+    ret = mkdir (dirname,0775);
+#endif
+    return ret;
+}
+
+int makedir (newdir)
+    char *newdir;
+{
+  char *buffer ;
+  char *p;
+  int  len = (int)strlen(newdir);
+
+  if (len <= 0)
+    return 0;
+
+  buffer = (char*)malloc(len+1);
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
+  strcpy(buffer,newdir);
+
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mymkdir(buffer) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+
+      while(*p && *p != '\\' && *p != '/')
+        p++;
+      hold = *p;
+      *p = 0;
+      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
+        {
+          printf("couldn't create directory %s\n",buffer);
+          free(buffer);
+          return 0;
+        }
+      if (hold == 0)
+        break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+void do_banner()
+{
+    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
+           "  -e  Extract without pathname (junk paths)\n" \
+           "  -x  Extract with pathname\n" \
+           "  -v  list files\n" \
+           "  -l  list files\n" \
+           "  -d  directory to extract into\n" \
+           "  -o  overwrite files without prompting\n" \
+           "  -p  extract crypted file using password\n\n");
+}
+
+void Display64BitsSize(ZPOS64_T n, int size_char)
+{
+  /* to avoid compatibility problem , we do here the conversion */
+  char number[21];
+  int offset=19;
+  int pos_string = 19;
+  number[20]=0;
+  for (;;) {
+      number[offset]=(char)((n%10)+'0');
+      if (number[offset] != '0')
+          pos_string=offset;
+      n/=10;
+      if (offset==0)
+          break;
+      offset--;
+  }
+  {
+      int size_display_string = 19-pos_string;
+      while (size_char > size_display_string)
+      {
+          size_char--;
+          printf(" ");
+      }
+  }
+
+  printf("%s",&number[pos_string]);
+}
+
+int do_list(uf)
+    unzFile uf;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
+    for (i=0;i<gi.number_entry;i++)
+    {
+        char filename_inzip[256];
+        unz_file_info64 file_info;
+        uLong ratio=0;
+        const char *string_method;
+        char charCrypt=' ';
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+            break;
+        }
+        if (file_info.uncompressed_size>0)
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
+
+        /* display a '*' if the file is crypted */
+        if ((file_info.flag & 1) != 0)
+            charCrypt='*';
+
+        if (file_info.compression_method==0)
+            string_method="Stored";
+        else
+        if (file_info.compression_method==Z_DEFLATED)
+        {
+            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
+            if (iLevel==0)
+              string_method="Defl:N";
+            else if (iLevel==1)
+              string_method="Defl:X";
+            else if ((iLevel==2) || (iLevel==3))
+              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
+        }
+        else
+        if (file_info.compression_method==Z_BZIP2ED)
+        {
+              string_method="BZip2 ";
+        }
+        else
+            string_method="Unkn. ";
+
+        Display64BitsSize(file_info.uncompressed_size,7);
+        printf("  %6s%c",string_method,charCrypt);
+        Display64BitsSize(file_info.compressed_size,7);
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+                ratio,
+                (uLong)file_info.tmu_date.tm_mon + 1,
+                (uLong)file_info.tmu_date.tm_mday,
+                (uLong)file_info.tmu_date.tm_year % 100,
+                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
+                (uLong)file_info.crc,filename_inzip);
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+    unzFile uf;
+    const int* popt_extract_without_path;
+    int* popt_overwrite;
+    const char* password;
+{
+    char filename_inzip[256];
+    char* filename_withoutpath;
+    char* p;
+    int err=UNZ_OK;
+    FILE *fout=NULL;
+    void* buf;
+    uInt size_buf;
+
+    unz_file_info64 file_info;
+    uLong ratio=0;
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+    if (err!=UNZ_OK)
+    {
+        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+        return err;
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return UNZ_INTERNALERROR;
+    }
+
+    p = filename_withoutpath = filename_inzip;
+    while ((*p) != '\0')
+    {
+        if (((*p)=='/') || ((*p)=='\\'))
+            filename_withoutpath = p+1;
+        p++;
+    }
+
+    if ((*filename_withoutpath)=='\0')
+    {
+        if ((*popt_extract_without_path)==0)
+        {
+            printf("creating directory: %s\n",filename_inzip);
+            mymkdir(filename_inzip);
+        }
+    }
+    else
+    {
+        const char* write_filename;
+        int skip=0;
+
+        if ((*popt_extract_without_path)==0)
+            write_filename = filename_inzip;
+        else
+            write_filename = filename_withoutpath;
+
+        err = unzOpenCurrentFilePassword(uf,password);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
+        }
+
+        if (((*popt_overwrite)==0) && (err==UNZ_OK))
+        {
+            char rep=0;
+            FILE* ftestexist;
+            ftestexist = FOPEN_FUNC(write_filename,"rb");
+            if (ftestexist!=NULL)
+            {
+                fclose(ftestexist);
+                do
+                {
+                    char answer[128];
+                    int ret;
+
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+            }
+
+            if (rep == 'N')
+                skip = 1;
+
+            if (rep == 'A')
+                *popt_overwrite=1;
+        }
+
+        if ((skip==0) && (err==UNZ_OK))
+        {
+            fout=FOPEN_FUNC(write_filename,"wb");
+            /* some zipfile don't contain directory alone before file */
+            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
+                                (filename_withoutpath!=(char*)filename_inzip))
+            {
+                char c=*(filename_withoutpath-1);
+                *(filename_withoutpath-1)='\0';
+                makedir(write_filename);
+                *(filename_withoutpath-1)=c;
+                fout=FOPEN_FUNC(write_filename,"wb");
+            }
+
+            if (fout==NULL)
+            {
+                printf("error opening %s\n",write_filename);
+            }
+        }
+
+        if (fout!=NULL)
+        {
+            printf(" extracting: %s\n",write_filename);
+
+            do
+            {
+                err = unzReadCurrentFile(uf,buf,size_buf);
+                if (err<0)
+                {
+                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
+                    break;
+                }
+                if (err>0)
+                    if (fwrite(buf,err,1,fout)!=1)
+                    {
+                        printf("error in writing extracted file\n");
+                        err=UNZ_ERRNO;
+                        break;
+                    }
+            }
+            while (err>0);
+            if (fout)
+                    fclose(fout);
+
+            if (err==0)
+                change_file_date(write_filename,file_info.dosDate,
+                                 file_info.tmu_date);
+        }
+
+        if (err==UNZ_OK)
+        {
+            err = unzCloseCurrentFile (uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
+            }
+        }
+        else
+            unzCloseCurrentFile(uf); /* don't lose the error */
+    }
+
+    free(buf);
+    return err;
+}
+
+
+int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+    FILE* fout=NULL;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+
+    for (i=0;i<gi.number_entry;i++)
+    {
+        if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) != UNZ_OK)
+            break;
+
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    const char* filename;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    int err = UNZ_OK;
+    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
+    {
+        printf("file %s not found in the zipfile\n",filename);
+        return 2;
+    }
+
+    if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) == UNZ_OK)
+        return 0;
+    else
+        return 1;
+}
+
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    const char *zipfilename=NULL;
+    const char *filename_to_extract=NULL;
+    const char *password=NULL;
+    char filename_try[MAXFILENAME+16] = "";
+    int i;
+    int ret_value=0;
+    int opt_do_list=0;
+    int opt_do_extract=1;
+    int opt_do_extract_withoutpath=0;
+    int opt_overwrite=0;
+    int opt_extractdir=0;
+    const char *dirname=NULL;
+    unzFile uf=NULL;
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='l') || (c=='L'))
+                        opt_do_list = 1;
+                    if ((c=='v') || (c=='V'))
+                        opt_do_list = 1;
+                    if ((c=='x') || (c=='X'))
+                        opt_do_extract = 1;
+                    if ((c=='e') || (c=='E'))
+                        opt_do_extract = opt_do_extract_withoutpath = 1;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite=1;
+                    if ((c=='d') || (c=='D'))
+                    {
+                        opt_extractdir=1;
+                        dirname=argv[i+1];
+                    }
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilename == NULL)
+                    zipfilename = argv[i];
+                else if ((filename_to_extract==NULL) && (!opt_extractdir))
+                        filename_to_extract = argv[i] ;
+            }
+        }
+    }
+
+    if (zipfilename!=NULL)
+    {
+
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+#        endif
+
+        strncpy(filename_try, zipfilename,MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+#        ifdef USEWIN32IOAPI
+        fill_win32_filefunc64A(&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
+#        else
+        uf = unzOpen64(zipfilename);
+#        endif
+        if (uf==NULL)
+        {
+            strcat(filename_try,".zip");
+#            ifdef USEWIN32IOAPI
+            uf = unzOpen2_64(filename_try,&ffunc);
+#            else
+            uf = unzOpen64(filename_try);
+#            endif
+        }
+    }
+
+    if (uf==NULL)
+    {
+        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
+        return 1;
+    }
+    printf("%s opened\n",filename_try);
+
+    if (opt_do_list==1)
+        ret_value = do_list(uf);
+    else if (opt_do_extract==1)
+    {
+#ifdef _WIN32
+        if (opt_extractdir && _chdir(dirname))
+#else
+        if (opt_extractdir && chdir(dirname))
+#endif
+        {
+          printf("Error changing into %s, aborting\n", dirname);
+          exit(-1);
+        }
+
+        if (filename_to_extract == NULL)
+            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
+        else
+            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
+    }
+
+    unzClose(uf);
+
+    return ret_value;
+}
diff --git a/third_party/minizip/miniunzip.1 b/third_party/minizip/miniunzip.1
new file mode 100644
index 00000000..111ac691
--- /dev/null
+++ b/third_party/minizip/miniunzip.1
@@ -0,0 +1,63 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH miniunzip 1 "Nov 7, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+miniunzip - uncompress and examine ZIP archives
+.SH SYNOPSIS
+.B miniunzip
+.RI [ -exvlo ]
+zipfile [ files_to_extract ] [-d tempdir]
+.SH DESCRIPTION
+.B minizip
+is a simple tool which allows the extraction of compressed file
+archives in the ZIP format used by the MS-DOS utility PKZIP.  It was
+written as a demonstration of the
+.IR zlib (3)
+library and therefore lack many of the features of the
+.IR unzip (1)
+program.
+.SH OPTIONS
+A number of options are supported.  With the exception of
+.BI \-d\  tempdir
+these must be supplied before any
+other arguments and are:
+.TP
+.BI \-l\ ,\ \-\-v
+List the files in the archive without extracting them.
+.TP
+.B \-o
+Overwrite files without prompting for confirmation.
+.TP
+.B \-x
+Extract files (default).
+.PP
+The
+.I zipfile
+argument is the name of the archive to process. The next argument can be used
+to specify a single file to extract from the archive.
+
+Lastly, the following option can be specified at the end of the command-line:
+.TP
+.BI \-d\  tempdir
+Extract the archive in the directory
+.I tempdir
+rather than the current directory.
+.SH SEE ALSO
+.BR minizip (1),
+.BR zlib (3),
+.BR unzip (1).
+.SH AUTHOR
+This program was written by Gilles Vollant.  This manual page was
+written by Mark Brown <broonie@sirena.org.uk>. The -d tempdir option
+was added by Dirk Eddelbuettel <edd@debian.org>.
diff --git a/third_party/minizip/minizip.1 b/third_party/minizip/minizip.1
new file mode 100644
index 00000000..1154484c
--- /dev/null
+++ b/third_party/minizip/minizip.1
@@ -0,0 +1,46 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH minizip 1 "May 2, 2001"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+minizip - create ZIP archives
+.SH SYNOPSIS
+.B minizip
+.RI [ -o ]
+zipfile [ " files" ... ]
+.SH DESCRIPTION
+.B minizip
+is a simple tool which allows the creation of compressed file archives
+in the ZIP format used by the MS-DOS utility PKZIP.  It was written as
+a demonstration of the
+.IR zlib (3)
+library and therefore lack many of the features of the
+.IR zip (1)
+program.
+.SH OPTIONS
+The first argument supplied is the name of the ZIP archive to create or
+.RI -o
+in which case it is ignored and the second argument treated as the
+name of the ZIP file.  If the ZIP file already exists it will be
+overwritten.
+.PP
+Subsequent arguments specify a list of files to place in the ZIP
+archive.  If none are specified then an empty archive will be created.
+.SH SEE ALSO
+.BR miniunzip (1),
+.BR zlib (3),
+.BR zip (1).
+.SH AUTHOR
+This program was written by Gilles Vollant.  This manual page was
+written by Mark Brown <broonie@sirena.org.uk>.
+
diff --git a/third_party/minizip/minizip.c b/third_party/minizip/minizip.c
new file mode 100644
index 00000000..4288962e
--- /dev/null
+++ b/third_party/minizip/minizip.c
@@ -0,0 +1,520 @@
+/*
+   minizip.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <direct.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <utime.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
+
+#include "zip.h"
+
+#ifdef _WIN32
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
+#endif
+
+
+
+#define WRITEBUFFERSIZE (16384)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret = 0;
+  {
+      FILETIME ftLocal;
+      HANDLE hFind;
+      WIN32_FIND_DATAA ff32;
+
+      hFind = FindFirstFileA(f,&ff32);
+      if (hFind != INVALID_HANDLE_VALUE)
+      {
+        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
+        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
+        FindClose(hFind);
+        ret = 1;
+      }
+  }
+  return ret;
+}
+#else
+#ifdef unix || __APPLE__
+uLong filetime(f, tmzip, dt)
+    char *f;               /* name of file to get info on */
+    tm_zip *tmzip;         /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret=0;
+  struct stat s;        /* results of stat() */
+  struct tm* filedate;
+  time_t tm_t=0;
+
+  if (strcmp(f,"-")!=0)
+  {
+    char name[MAXFILENAME+1];
+    int len = strlen(f);
+    if (len > MAXFILENAME)
+      len = MAXFILENAME;
+
+    strncpy(name, f,MAXFILENAME-1);
+    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    name[ MAXFILENAME ] = '\0';
+
+    if (name[len - 1] == '/')
+      name[len - 1] = '\0';
+    /* not all systems allow stat'ing a file with / appended */
+    if (stat(name,&s)==0)
+    {
+      tm_t = s.st_mtime;
+      ret = 1;
+    }
+  }
+  filedate = localtime(&tm_t);
+
+  tmzip->tm_sec  = filedate->tm_sec;
+  tmzip->tm_min  = filedate->tm_min;
+  tmzip->tm_hour = filedate->tm_hour;
+  tmzip->tm_mday = filedate->tm_mday;
+  tmzip->tm_mon  = filedate->tm_mon ;
+  tmzip->tm_year = filedate->tm_year;
+
+  return ret;
+}
+#else
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+    return 0;
+}
+#endif
+#endif
+
+
+
+
+int check_exist_file(filename)
+    const char* filename;
+{
+    FILE* ftestexist;
+    int ret = 1;
+    ftestexist = FOPEN_FUNC(filename,"rb");
+    if (ftestexist==NULL)
+        ret = 0;
+    else
+        fclose(ftestexist);
+    return ret;
+}
+
+void do_banner()
+{
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
+           "  -o  Overwrite existing file.zip\n" \
+           "  -a  Append to existing file.zip\n" \
+           "  -0  Store only\n" \
+           "  -1  Compress faster\n" \
+           "  -9  Compress better\n\n" \
+           "  -j  exclude path. store only the file name.\n\n");
+}
+
+/* calculate the CRC32 of a file,
+   because to encrypt a file, we need known the CRC32 of the file before */
+int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
+{
+   unsigned long calculate_crc=0;
+   int err=ZIP_OK;
+   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
+
+   unsigned long size_read = 0;
+   unsigned long total_read = 0;
+   if (fin==NULL)
+   {
+       err = ZIP_ERRNO;
+   }
+
+    if (err == ZIP_OK)
+        do
+        {
+            err = ZIP_OK;
+            size_read = (int)fread(buf,1,size_buf,fin);
+            if (size_read < size_buf)
+                if (feof(fin)==0)
+            {
+                printf("error in reading %s\n",filenameinzip);
+                err = ZIP_ERRNO;
+            }
+
+            if (size_read>0)
+                calculate_crc = crc32(calculate_crc,buf,size_read);
+            total_read += size_read;
+
+        } while ((err == ZIP_OK) && (size_read>0));
+
+    if (fin)
+        fclose(fin);
+
+    *result_crc=calculate_crc;
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
+    return err;
+}
+
+int isLargeFile(const char* filename)
+{
+  int largeFile = 0;
+  ZPOS64_T pos = 0;
+  FILE* pFile = FOPEN_FUNC(filename, "rb");
+
+  if(pFile != NULL)
+  {
+    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
+    pos = FTELLO_FUNC(pFile);
+
+                printf("File : %s is %lld bytes\n", filename, pos);
+
+    if(pos >= 0xffffffff)
+     largeFile = 1;
+
+                fclose(pFile);
+  }
+
+ return largeFile;
+}
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    int i;
+    int opt_overwrite=0;
+    int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    int opt_exclude_path=0;
+    int zipfilenamearg = 0;
+    char filename_try[MAXFILENAME+16];
+    int zipok;
+    int err=0;
+    int size_buf=0;
+    void* buf=NULL;
+    const char* password=NULL;
+
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite = 1;
+                    if ((c=='a') || (c=='A'))
+                        opt_overwrite = 2;
+                    if ((c>='0') && (c<='9'))
+                        opt_compress_level = c-'0';
+                    if ((c=='j') || (c=='J'))
+                        opt_exclude_path = 1;
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilenamearg == 0)
+                {
+                    zipfilenamearg = i ;
+                }
+            }
+        }
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return ZIP_INTERNALERROR;
+    }
+
+    if (zipfilenamearg==0)
+    {
+        zipok=0;
+    }
+    else
+    {
+        int i,len;
+        int dot_found=0;
+
+        zipok = 1 ;
+        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+        len=(int)strlen(filename_try);
+        for (i=0;i<len;i++)
+            if (filename_try[i]=='.')
+                dot_found=1;
+
+        if (dot_found==0)
+            strcat(filename_try,".zip");
+
+        if (opt_overwrite==2)
+        {
+            /* if the file don't exist, we not append file */
+            if (check_exist_file(filename_try)==0)
+                opt_overwrite=1;
+        }
+        else
+        if (opt_overwrite==0)
+            if (check_exist_file(filename_try)!=0)
+            {
+                char rep=0;
+                do
+                {
+                    char answer[128];
+                    int ret;
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+                if (rep=='N')
+                    zipok = 0;
+                if (rep=='A')
+                    opt_overwrite = 2;
+            }
+    }
+
+    if (zipok==1)
+    {
+        zipFile zf;
+        int errclose;
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+        fill_win32_filefunc64A(&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+#        else
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
+#        endif
+
+        if (zf == NULL)
+        {
+            printf("error opening %s\n",filename_try);
+            err= ZIP_ERRNO;
+        }
+        else
+            printf("creating %s\n",filename_try);
+
+        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
+        {
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
+                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
+                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
+                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
+                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
+                  (strlen(argv[i]) == 2)))
+            {
+                FILE * fin;
+                int size_read;
+                const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
+                zip_fileinfo zi;
+                unsigned long crcFile=0;
+                int zip64 = 0;
+
+                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
+                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
+                zi.dosDate = 0;
+                zi.internal_fa = 0;
+                zi.external_fa = 0;
+                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
+
+/*
+                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL / * comment * /,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level);
+*/
+                if ((password != NULL) && (err==ZIP_OK))
+                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
+
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL /* comment*/,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level,0,
+                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 password,crcFile, zip64);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = FOPEN_FUNC(filenameinzip,"rb");
+                    if (fin==NULL)
+                    {
+                        err=ZIP_ERRNO;
+                        printf("error in opening %s for reading\n",filenameinzip);
+                    }
+                }
+
+                if (err == ZIP_OK)
+                    do
+                    {
+                        err = ZIP_OK;
+                        size_read = (int)fread(buf,1,size_buf,fin);
+                        if (size_read < size_buf)
+                            if (feof(fin)==0)
+                        {
+                            printf("error in reading %s\n",filenameinzip);
+                            err = ZIP_ERRNO;
+                        }
+
+                        if (size_read>0)
+                        {
+                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            if (err<0)
+                            {
+                                printf("error in writing %s in the zipfile\n",
+                                                 filenameinzip);
+                            }
+
+                        }
+                    } while ((err == ZIP_OK) && (size_read>0));
+
+                if (fin)
+                    fclose(fin);
+
+                if (err<0)
+                    err=ZIP_ERRNO;
+                else
+                {
+                    err = zipCloseFileInZip(zf);
+                    if (err!=ZIP_OK)
+                        printf("error in closing %s in the zipfile\n",
+                                    filenameinzip);
+                }
+            }
+        }
+        errclose = zipClose(zf,NULL);
+        if (errclose != ZIP_OK)
+            printf("error in closing %s\n",filename_try);
+    }
+    else
+    {
+       do_help();
+    }
+
+    free(buf);
+    return 0;
+}
diff --git a/third_party/minizip/minizip.pc.in b/third_party/minizip/minizip.pc.in
new file mode 100644
index 00000000..69b5b7fd
--- /dev/null
+++ b/third_party/minizip/minizip.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/minizip
+
+Name: minizip
+Description: Minizip zip file manipulation library
+Requires:
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lminizip
+Libs.private: -lz
+Cflags: -I${includedir}
diff --git a/third_party/minizip/mztools.c b/third_party/minizip/mztools.c
new file mode 100644
index 00000000..96891c2e
--- /dev/null
+++ b/third_party/minizip/mztools.c
@@ -0,0 +1,291 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
+
+extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+const char* file;
+const char* fileOut;
+const char* fileOutTmp;
+uLong* nRecovered;
+uLong* bytesRecovered;
+{
+  int err = Z_OK;
+  FILE* fpZip = fopen(file, "rb");
+  FILE* fpOut = fopen(fileOut, "wb");
+  FILE* fpOutCD = fopen(fileOutTmp, "wb");
+  if (fpZip != NULL &&  fpOut != NULL) {
+    int entries = 0;
+    uLong totalBytes = 0;
+    char header[30];
+    char filename[1024];
+    char extra[1024];
+    int offset = 0;
+    int offsetCD = 0;
+    while ( fread(header, 1, 30, fpZip) == 30 ) {
+      int currentOffset = offset;
+
+      /* File entry */
+      if (READ_32(header) == 0x04034b50) {
+        unsigned int version = READ_16(header + 4);
+        unsigned int gpflag = READ_16(header + 6);
+        unsigned int method = READ_16(header + 8);
+        unsigned int filetime = READ_16(header + 10);
+        unsigned int filedate = READ_16(header + 12);
+        unsigned int crc = READ_32(header + 14); /* crc */
+        unsigned int cpsize = READ_32(header + 18); /* compressed size */
+        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
+        unsigned int fnsize = READ_16(header + 26); /* file name length */
+        unsigned int extsize = READ_16(header + 28); /* extra field length */
+        filename[0] = extra[0] = '\0';
+
+        /* Header */
+        if (fwrite(header, 1, 30, fpOut) == 30) {
+          offset += 30;
+        } else {
+          err = Z_ERRNO;
+          break;
+        }
+
+        /* Filename */
+        if (fnsize > 0) {
+          if (fnsize < sizeof(filename)) {
+            if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+                offset += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        } else {
+          err = Z_STREAM_ERROR;
+          break;
+        }
+
+        /* Extra field */
+        if (extsize > 0) {
+          if (extsize < sizeof(extra)) {
+            if (fread(extra, 1, extsize, fpZip) == extsize) {
+              if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+                offset += extsize;
+                } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Data */
+        {
+          int dataSize = cpsize;
+          if (dataSize == 0) {
+            dataSize = uncpsize;
+          }
+          if (dataSize > 0) {
+            char* data = malloc(dataSize);
+            if (data != NULL) {
+              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
+                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
+                  offset += dataSize;
+                  totalBytes += dataSize;
+                } else {
+                  err = Z_ERRNO;
+                }
+              } else {
+                err = Z_ERRNO;
+              }
+              free(data);
+              if (err != Z_OK) {
+                break;
+              }
+            } else {
+              err = Z_MEM_ERROR;
+              break;
+            }
+          }
+        }
+
+        /* Central directory entry */
+        {
+          char header[46];
+          char* comment = "";
+          int comsize = (int) strlen(comment);
+          WRITE_32(header, 0x02014b50);
+          WRITE_16(header + 4, version);
+          WRITE_16(header + 6, version);
+          WRITE_16(header + 8, gpflag);
+          WRITE_16(header + 10, method);
+          WRITE_16(header + 12, filetime);
+          WRITE_16(header + 14, filedate);
+          WRITE_32(header + 16, crc);
+          WRITE_32(header + 20, cpsize);
+          WRITE_32(header + 24, uncpsize);
+          WRITE_16(header + 28, fnsize);
+          WRITE_16(header + 30, extsize);
+          WRITE_16(header + 32, comsize);
+          WRITE_16(header + 34, 0);     /* disk # */
+          WRITE_16(header + 36, 0);     /* int attrb */
+          WRITE_32(header + 38, 0);     /* ext attrb */
+          WRITE_32(header + 42, currentOffset);
+          /* Header */
+          if (fwrite(header, 1, 46, fpOutCD) == 46) {
+            offsetCD += 46;
+
+            /* Filename */
+            if (fnsize > 0) {
+              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
+                offsetCD += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_STREAM_ERROR;
+              break;
+            }
+
+            /* Extra field */
+            if (extsize > 0) {
+              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
+                offsetCD += extsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+            /* Comment field */
+            if (comsize > 0) {
+              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
+                offsetCD += comsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Success */
+        entries++;
+
+      } else {
+        break;
+      }
+    }
+
+    /* Final central directory  */
+    {
+      int entriesZip = entries;
+      char header[22];
+      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+      int comsize = (int) strlen(comment);
+      if (entriesZip > 0xffff) {
+        entriesZip = 0xffff;
+      }
+      WRITE_32(header, 0x06054b50);
+      WRITE_16(header + 4, 0);    /* disk # */
+      WRITE_16(header + 6, 0);    /* disk # */
+      WRITE_16(header + 8, entriesZip);   /* hack */
+      WRITE_16(header + 10, entriesZip);  /* hack */
+      WRITE_32(header + 12, offsetCD);    /* size of CD */
+      WRITE_32(header + 16, offset);      /* offset to CD */
+      WRITE_16(header + 20, comsize);     /* comment */
+
+      /* Header */
+      if (fwrite(header, 1, 22, fpOutCD) == 22) {
+
+        /* Comment field */
+        if (comsize > 0) {
+          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
+            err = Z_ERRNO;
+          }
+        }
+
+      } else {
+        err = Z_ERRNO;
+      }
+    }
+
+    /* Final merge (file + central directory) */
+    fclose(fpOutCD);
+    if (err == Z_OK) {
+      fpOutCD = fopen(fileOutTmp, "rb");
+      if (fpOutCD != NULL) {
+        int nRead;
+        char buffer[8192];
+        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
+          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        fclose(fpOutCD);
+      }
+    }
+
+    /* Close */
+    fclose(fpZip);
+    fclose(fpOut);
+
+    /* Wipe temporary file */
+    (void)remove(fileOutTmp);
+
+    /* Number of recovered entries */
+    if (err == Z_OK) {
+      if (nRecovered != NULL) {
+        *nRecovered = entries;
+      }
+      if (bytesRecovered != NULL) {
+        *bytesRecovered = totalBytes;
+      }
+    }
+  } else {
+    err = Z_STREAM_ERROR;
+  }
+  return err;
+}
diff --git a/third_party/minizip/mztools.h b/third_party/minizip/mztools.h
new file mode 100644
index 00000000..a49a426e
--- /dev/null
+++ b/third_party/minizip/mztools.h
@@ -0,0 +1,37 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory)
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/third_party/minizip/unzip.c b/third_party/minizip/unzip.c
new file mode 100644
index 00000000..90935043
--- /dev/null
+++ b/third_party/minizip/unzip.c
@@ -0,0 +1,2125 @@
+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+
+  ------------------------------------------------------------------------------------
+  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+  compatibility with older software. The following is from the original crypt.c.
+  Code woven in by Terry Thorsen 1/2003.
+
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+
+        This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+
+        ------------------------------------------------------------------------------------
+
+        Changes in unzip.c
+
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
+  2007-2008 - Even Rouault - Remove old C style function prototypes
+  2007-2008 - Even Rouault - Add unzip support for ZIP64
+
+        Copyright (C) 2007-2008 Even Rouault
+
+
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+                                should only read the compressed/uncompressed size from the Zip64 format if
+                                the size from normal header was 0xFFFFFFFF
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+                                Patch created by Daniel Borca
+
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef NOUNCRYPT
+        #define NOUNCRYPT
+#endif
+
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info64_internal_s
+{
+    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
+} unz_file_info64_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T total_out_64;
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
+    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip64_read_info_s;
+
+
+/* unz64_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    int is64bitOpenFunction;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info64 gi;       /* public global information */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
+    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
+    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
+    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
+
+    ZPOS64_T size_central_dir;     /* size of the central directory  */
+    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+
+    int isZip64;
+
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const z_crc_t* pcrc_32_tab;
+#    endif
+} unz64_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+
+
+local int unz64local_getByte OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unz64local_getShort OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    ZPOS64_T *pX));
+
+
+local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            ZPOS64_T *pX)
+{
+    ZPOS64_T x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (ZPOS64_T)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<24;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<32;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<40;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<48;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<56;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
+                                                 const char*  fileName2,
+                                                 int iCaseSensitivity)
+
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+
+/*
+  Locate the Central directory 64 of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                                      voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+    uLong uL;
+                ZPOS64_T relativeOffset;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    if (uPosFound == 0)
+        return 0;
+
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+    /* the signature, already checked */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    /* number of the disk with the start of the zip64 end of  central directory */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 0)
+        return 0;
+
+    /* relative offset of the zip64 end of central directory record */
+    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
+        return 0;
+
+    /* total number of disks */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 1)
+        return 0;
+
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+     /* the signature */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    if (uL != 0x06064b50)
+        return 0;
+
+    return relativeOffset;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+local unzFile unzOpenInternal (const void *path,
+                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                               int is64bitOpenFunction)
+{
+    unz64_s us;
+    unz64_s *s;
+    ZPOS64_T central_pos;
+    uLong   uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    ZPOS64_T number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
+    else
+        us.z_filefunc = *pzlib_filefunc64_32_def;
+    us.is64bitOpenFunction = is64bitOpenFunction;
+
+
+
+    us.filestream = ZOPEN64(us.z_filefunc,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
+    if (central_pos)
+    {
+        uLong uS;
+        ZPOS64_T uL64;
+
+        us.isZip64 = 1;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* size of zip64 end of central directory record */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version made by */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version needed to extract */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory on this disk */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* offset of start of central directory with respect to the
+          starting disk number */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        us.gi.size_comment = 0;
+    }
+    else
+    {
+        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
+        if (central_pos==0)
+            err=UNZ_ERRNO;
+
+        us.isZip64 = 0;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.gi.number_entry = uL;
+
+        /* total number of entries in the central dir */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        number_entry_CD = uL;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.size_central_dir = uL;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.offset_central_dir = uL;
+
+        /* zipfile comment length */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+            err=UNZ_ERRNO;
+    }
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE64(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz64_s*)ALLOC(sizeof(unz64_s));
+    if( s != NULL)
+    {
+        *s=us;
+        unzGoToFirstFile((unzFile)s);
+    }
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen2 (const char *path,
+                                        zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
+    }
+    else
+        return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen2_64 (const void *path,
+                                     zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
+    }
+    else
+        return unzOpenInternal(path, NULL, 1);
+}
+
+extern unzFile ZEXPORT unzOpen (const char *path)
+{
+    return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen64 (const void *path)
+{
+    return unzOpenInternal(path, NULL, 1);
+}
+
+/*
+  Close a ZipFile opened with unzOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (unzFile file)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE64(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    /* to do : check if number_entry is not truncated */
+    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    return UNZ_OK;
+}
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
+{
+    ZPOS64_T uDate;
+    uDate = (ZPOS64_T)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize)
+{
+    unz64_s* s;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+    uLong uL;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (ZSEEK64(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.compressed_size = uL;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.uncompressed_size = uL;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+                // relative offset of local header
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info_internal.offset_curfile = uL;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+    // Read extrafield
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        ZPOS64_T uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+
+        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
+    }
+    else
+        lSeek += file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+                                uLong acc = 0;
+
+        // since lSeek now points to after the extra field we need to move back
+        lSeek -= file_info.size_file_extra;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        while(acc < file_info.size_file_extra)
+        {
+            uLong headerId;
+                                                uLong dataSize;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (headerId == 0x0001)
+            {
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == MAXU32)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == MAXU32)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+            }
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                    err=UNZ_ERRNO;
+            }
+
+            acc += 2 + 2 + dataSize;
+        }
+    }
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
+                                          unz_file_info64 * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
+                                          unz_file_info * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    int err;
+    unz_file_info64 file_info64;
+    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+    if ((err==UNZ_OK) && (pfile_info != NULL))
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dosDate = file_info64.dosDate;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->tmu_date = file_info64.tmu_date,
+
+
+        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
+
+    }
+    return err;
+}
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
+{
+    int err=UNZ_OK;
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (unzFile  file)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+{
+    unz64_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info64 cur_file_infoSaved;
+    unz_file_info64_internal cur_file_info_internalSaved;
+    ZPOS64_T num_fileSaved;
+    ZPOS64_T pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo64(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   // offset in file
+    ZPOS64_T num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
+{
+    unz64_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file,&file_pos64);
+    if (err==UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file,&file_pos64);
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
+                                                    ZPOS64_T * poffset_local_extrafield,
+                                                    uInt  * psize_local_extrafield)
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
+                                            int* level, int raw, const char* password)
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->total_out_64=0;
+    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
+    {
+#ifdef HAVE_BZIP2
+      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->bstream.state = (voidpf)0;
+
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+#else
+      pfile_in_zip_read_info->raw=1;
+#endif
+    }
+    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = 0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+                s->encrypted = 0;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK64(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    s=(unz64_s*)file;
+    if (file==NULL)
+        return 0; //UNZ_PARAMERROR;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info==NULL)
+        return 0; //UNZ_PARAMERROR;
+    return pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile;
+}
+
+/** Addition for GDAL : END */
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if (pfile_in_zip_read_info->read_buffer == NULL)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+
+            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
+            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
+            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
+            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
+            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
+            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
+            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
+            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
+
+            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
+            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
+
+            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
+
+            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
+            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
+            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
+            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
+            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
+            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
+            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
+
+            if (err==BZ_STREAM_END)
+              return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=BZ_OK)
+              break;
+#endif
+        } // end Z_BZIP2ED
+        else
+        {
+            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            ZPOS64_T uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
+{
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return (ZPOS64_T)-1;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return (ZPOS64_T)-1;
+
+    return pfile_in_zip_read_info->total_out_64;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+Read extra field from the current file (opened by unzOpenCurrentFile)
+This is the local-header version of the extra field (sometimes, there is
+more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    ZPOS64_T size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
+{
+    int err=UNZ_OK;
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
+
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
+{
+    unz64_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return (int)UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
+{
+    unz64_s* s;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern uLong ZEXPORT unzGetOffset (unzFile file)
+{
+    ZPOS64_T offset64;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (uLong)offset64;
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
+{
+    return unzSetOffset64(file,pos);
+}
diff --git a/third_party/minizip/unzip.h b/third_party/minizip/unzip.h
new file mode 100644
index 00000000..2104e391
--- /dev/null
+++ b/third_party/minizip/unzip.h
@@ -0,0 +1,437 @@
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------------
+
+        Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  ---------------------------------------------------------------------------------
+
+        Changes
+
+        See header of unzip64.c
+
+*/
+
+#ifndef _unz64_H
+#define _unz64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef  _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    ZPOS64_T number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info64;
+
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
+    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info64;
+
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen64 OF((const void *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+     the "64" function take a const void* pointer, because the path is just the
+       value passed to the open64_file_func callback.
+     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
+       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
+       does not describe the reality
+*/
+
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unz64Open, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+
+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
+                                        unz_global_info64 *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+typedef struct unz64_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
+    ZPOS64_T num_of_file;            /* # of file */
+} unz64_file_pos;
+
+extern int ZEXPORT unzGetFilePos64(
+    unzFile file,
+    unz64_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos64(
+    unzFile file,
+    const unz64_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
+                         unz_file_info64 *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+
+/** Addition for GDAL : END */
+
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz64_H */
diff --git a/third_party/minizip/zip.c b/third_party/minizip/zip.c
new file mode 100644
index 00000000..ea54853e
--- /dev/null
+++ b/third_party/minizip/zip.c
@@ -0,0 +1,2007 @@
+/* zip.c -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+                                 It is used when recreting zip archive with RAW when deleting items from a zip.
+                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY   (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (64*1024) //(16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC    (0x04034b50)
+#define CENTRALHEADERMAGIC  (0x02014b50)
+#define ENDHEADERMAGIC      (0x06054b50)
+#define ZIP64ENDHEADERMAGIC      (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET  (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+  struct linkedlist_datablock_internal_s* next_datablock;
+  uLong  avail_in_this_block;
+  uLong  filled_in_this_block;
+  uLong  unused; /* for future use and alignement */
+  unsigned char data[SIZEDATA_INDATABLOCK];
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+    linkedlist_datablock_internal* first_block;
+    linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+    z_stream stream;            /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    int  stream_initialised;    /* 1 is stream is initialised */
+    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
+
+    ZPOS64_T pos_local_header;     /* offset of the local header of the file
+                                     currenty writing */
+    char* central_header;       /* central header data for the current file */
+    uLong size_centralExtra;
+    uLong size_centralheader;   /* size of the central header for cur file */
+    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
+    uLong flag;                 /* flag of the file currently writing */
+
+    int  method;                /* compression method of file currenty wr.*/
+    int  raw;                   /* 1 for directly writing raw data */
+    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
+    uLong dosDate;
+    uLong crc32;
+    int  encrypt;
+    int  zip64;               /* Add ZIP64 extened information in the extra field */
+    ZPOS64_T pos_zip64extrainfo;
+    ZPOS64_T totalCompressedData;
+    ZPOS64_T totalUncompressedData;
+#ifndef NOCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const z_crc_t* pcrc_32_tab;
+    int crypt_header_size;
+#endif
+} curfile64_info;
+
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    linkedlist_data central_dir;/* datablock with central dir in construction*/
+    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
+    curfile64_info ci;            /* info on the file curretly writing */
+
+    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
+    ZPOS64_T add_position_when_writting_offset;
+    ZPOS64_T number_entry;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    char *globalcomment;
+#endif
+
+} zip64_internal;
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+    linkedlist_datablock_internal* ldi;
+    ldi = (linkedlist_datablock_internal*)
+                 ALLOC(sizeof(linkedlist_datablock_internal));
+    if (ldi!=NULL)
+    {
+        ldi->next_datablock = NULL ;
+        ldi->filled_in_this_block = 0 ;
+        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+    }
+    return ldi;
+}
+
+local void free_datablock(linkedlist_datablock_internal* ldi)
+{
+    while (ldi!=NULL)
+    {
+        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+        TRYFREE(ldi);
+        ldi = ldinext;
+    }
+}
+
+local void init_linkedlist(linkedlist_data* ll)
+{
+    ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(linkedlist_data* ll)
+{
+    free_datablock(ll->first_block);
+    ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
+{
+    linkedlist_datablock_internal* ldi;
+    const unsigned char* from_copy;
+
+    if (ll==NULL)
+        return ZIP_INTERNALERROR;
+
+    if (ll->last_block == NULL)
+    {
+        ll->first_block = ll->last_block = allocate_new_datablock();
+        if (ll->first_block == NULL)
+            return ZIP_INTERNALERROR;
+    }
+
+    ldi = ll->last_block;
+    from_copy = (unsigned char*)buf;
+
+    while (len>0)
+    {
+        uInt copy_this;
+        uInt i;
+        unsigned char* to_copy;
+
+        if (ldi->avail_in_this_block==0)
+        {
+            ldi->next_datablock = allocate_new_datablock();
+            if (ldi->next_datablock == NULL)
+                return ZIP_INTERNALERROR;
+            ldi = ldi->next_datablock ;
+            ll->last_block = ldi;
+        }
+
+        if (ldi->avail_in_this_block < len)
+            copy_this = (uInt)ldi->avail_in_this_block;
+        else
+            copy_this = (uInt)len;
+
+        to_copy = &(ldi->data[ldi->filled_in_this_block]);
+
+        for (i=0;i<copy_this;i++)
+            *(to_copy+i)=*(from_copy+i);
+
+        ldi->filled_in_this_block += copy_this;
+        ldi->avail_in_this_block -= copy_this;
+        from_copy += copy_this ;
+        len -= copy_this;
+    }
+    return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+   Inputs a long in LSB order to the given file
+   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
+*/
+
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
+{
+    unsigned char buf[8];
+    int n;
+    for (n = 0; n < nbByte; n++)
+    {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+    if (x != 0)
+      {     /* data overflow - hack for ZIP64 (X Roche) */
+      for (n = 0; n < nbByte; n++)
+        {
+          buf[n] = 0xff;
+        }
+      }
+
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+        return ZIP_ERRNO;
+    else
+        return ZIP_OK;
+}
+
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
+{
+    unsigned char* buf=(unsigned char*)dest;
+    int n;
+    for (n = 0; n < nbByte; n++) {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+
+    if (x != 0)
+    {     /* data overflow - hack for ZIP64 */
+       for (n = 0; n < nbByte; n++)
+       {
+          buf[n] = 0xff;
+       }
+    }
+}
+
+/****************************************************************************/
+
+
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
+{
+    uLong year = (uLong)ptm->tm_year;
+    if (year>=1980)
+        year-=1980;
+    else if (year>=80)
+        year-=80;
+    return
+      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
+
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return ZIP_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return ZIP_ERRNO;
+        else
+            return ZIP_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+  ZPOS64_T x;
+  int i = 0;
+  int err;
+
+  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x = (ZPOS64_T)i;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<8;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<16;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<24;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<32;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<40;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<48;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<56;
+
+  if (err==ZIP_OK)
+    *pX = x;
+  else
+    *pX = 0;
+
+  return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos ;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+
+      if (uPosFound!=0)
+        break;
+  }
+  TRYFREE(buf);
+  return uPosFound;
+}
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+  uLong uL;
+  ZPOS64_T relativeOffset;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+    {
+      // Signature "0x07064b50" Zip64 end of central directory locater
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+    }
+
+      if (uPosFound!=0)
+        break;
+  }
+
+  TRYFREE(buf);
+  if (uPosFound == 0)
+    return 0;
+
+  /* Zip64 end of central directory locator */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature, already checked */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  /* number of the disk with the start of the zip64 end of  central directory */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 0)
+    return 0;
+
+  /* relative offset of the zip64 end of central directory record */
+  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+    return 0;
+
+  /* total number of disks */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 1)
+    return 0;
+
+  /* Goto Zip64 end of central directory record */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+    return 0;
+
+  return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+  int err=ZIP_OK;
+  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+  ZPOS64_T size_central_dir;     /* size of the central directory  */
+  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
+  ZPOS64_T central_pos;
+  uLong uL;
+
+  uLong number_disk;          /* number of the current dist, used for
+                              spaning ZIP, unsupported, always 0*/
+  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                              for spaning ZIP, unsupported, always 0*/
+  ZPOS64_T number_entry;
+  ZPOS64_T number_entry_CD;      /* total number of entries in
+                                the central dir
+                                (same than number_entry on nospan) */
+  uLong VersionMadeBy;
+  uLong VersionNeeded;
+  uLong size_comment;
+
+  int hasZIP64Record = 0;
+
+  // check first if we find a ZIP64 record
+  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+  if(central_pos > 0)
+  {
+    hasZIP64Record = 1;
+  }
+  else if(central_pos == 0)
+  {
+    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+  }
+
+/* disable to allow appending to empty ZIP archive
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+*/
+
+  if(hasZIP64Record)
+  {
+    ZPOS64_T sizeEndOfCentralDirectory;
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* size of zip64 end of central directory record */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version made by */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version needed to extract */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory on this disk */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* offset of start of central directory with respect to the
+    starting disk number */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    // TODO..
+    // read the comment from the standard central header.
+    size_comment = 0;
+  }
+  else
+  {
+    // Read End of central Directory info
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    number_entry = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry = uL;
+
+    /* total number of entries in the central dir */
+    number_entry_CD = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry_CD = uL;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    size_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      size_central_dir = uL;
+
+    /* offset of start of central directory with respect to the starting disk number */
+    offset_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      offset_central_dir = uL;
+
+
+    /* zipfile global comment length */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+      err=ZIP_ERRNO;
+  }
+
+  if ((central_pos<offset_central_dir+size_central_dir) &&
+    (err==ZIP_OK))
+    err=ZIP_BADZIPFILE;
+
+  if (err!=ZIP_OK)
+  {
+    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+    return ZIP_ERRNO;
+  }
+
+  if (size_comment>0)
+  {
+    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+    if (pziinit->globalcomment)
+    {
+      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+      pziinit->globalcomment[size_comment]=0;
+    }
+  }
+
+  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+  pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+
+  {
+    ZPOS64_T size_central_dir_to_read = size_central_dir;
+    size_t buf_size = SIZEDATA_INDATABLOCK;
+    void* buf_read = (void*)ALLOC(buf_size);
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+    {
+      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+      if (read_this > size_central_dir_to_read)
+        read_this = size_central_dir_to_read;
+
+      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+        err=ZIP_ERRNO;
+
+      if (err==ZIP_OK)
+        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+      size_central_dir_to_read-=read_this;
+    }
+    TRYFREE(buf_read);
+  }
+  pziinit->begin_pos = byte_before_the_zipfile;
+  pziinit->number_entry = number_entry_CD;
+
+  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+    err=ZIP_ERRNO;
+
+  return err;
+}
+
+
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
+{
+    zip64_internal ziinit;
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    ziinit.z_filefunc.zseek32_file = NULL;
+    ziinit.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+    else
+        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
+
+    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
+                  pathname,
+                  (append == APPEND_STATUS_CREATE) ?
+                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+    if (ziinit.filestream == NULL)
+        return NULL;
+
+    if (append == APPEND_STATUS_CREATEAFTER)
+        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
+    ziinit.in_opened_file_inzip = 0;
+    ziinit.ci.stream_initialised = 0;
+    ziinit.number_entry = 0;
+    ziinit.add_position_when_writting_offset = 0;
+    init_linkedlist(&(ziinit.central_dir));
+
+
+
+    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
+    if (zi==NULL)
+    {
+        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
+        return NULL;
+    }
+
+    /* now we add file in a zipfile */
+#    ifndef NO_ADDFILEINEXISTINGZIP
+    ziinit.globalcomment = NULL;
+    if (append == APPEND_STATUS_ADDINZIP)
+    {
+      // Read and Cache Central Directory Records
+      err = LoadCentralDirectoryRecord(&ziinit);
+    }
+
+    if (globalcomment)
+    {
+      *globalcomment = ziinit.globalcomment;
+    }
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+    if (err != ZIP_OK)
+    {
+#    ifndef NO_ADDFILEINEXISTINGZIP
+        TRYFREE(ziinit.globalcomment);
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+        TRYFREE(zi);
+        return NULL;
+    }
+    else
+    {
+        *zi = ziinit;
+        return (zipFile)zi;
+    }
+}
+
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+    return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+    return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+  /* write the local header */
+  int err;
+  uInt size_filename = (uInt)strlen(filename);
+  uInt size_extrafield = size_extrafield_local;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+  }
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+  if(zi->ci.zip64)
+  {
+    size_extrafield += 20;
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+  if ((err==ZIP_OK) && (size_filename > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+      err = ZIP_ERRNO;
+  }
+
+  if ((err==ZIP_OK) && (size_extrafield_local > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+      err = ZIP_ERRNO;
+  }
+
+
+  if ((err==ZIP_OK) && (zi->ci.zip64))
+  {
+      // write the Zip64 extended info
+      short HeaderID = 1;
+      short DataSize = 16;
+      ZPOS64_T CompressedSize = 0;
+      ZPOS64_T UncompressedSize = 0;
+
+      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+  }
+
+  return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase, int zip64)
+{
+    zip64_internal* zi;
+    uInt size_filename;
+    uInt size_comment;
+    uInt i;
+    int err = ZIP_OK;
+
+#    ifdef NOCRYPT
+    (crcForCrypting);
+    if (password != NULL)
+        return ZIP_PARAMERROR;
+#    endif
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+#ifdef HAVE_BZIP2
+    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+      return ZIP_PARAMERROR;
+#else
+    if ((method!=0) && (method!=Z_DEFLATED))
+      return ZIP_PARAMERROR;
+#endif
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+        if (err != ZIP_OK)
+            return err;
+    }
+
+    if (filename==NULL)
+        filename="-";
+
+    if (comment==NULL)
+        size_comment = 0;
+    else
+        size_comment = (uInt)strlen(comment);
+
+    size_filename = (uInt)strlen(filename);
+
+    if (zipfi == NULL)
+        zi->ci.dosDate = 0;
+    else
+    {
+        if (zipfi->dosDate != 0)
+            zi->ci.dosDate = zipfi->dosDate;
+        else
+          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
+    }
+
+    zi->ci.flag = flagBase;
+    if ((level==8) || (level==9))
+      zi->ci.flag |= 2;
+    if (level==2)
+      zi->ci.flag |= 4;
+    if (level==1)
+      zi->ci.flag |= 6;
+    if (password != NULL)
+      zi->ci.flag |= 1;
+
+    zi->ci.crc32 = 0;
+    zi->ci.method = method;
+    zi->ci.encrypt = 0;
+    zi->ci.stream_initialised = 0;
+    zi->ci.pos_in_buffered_data = 0;
+    zi->ci.raw = raw;
+    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+    zi->ci.size_centralExtra = size_extrafield_global;
+    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    /* version info */
+    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
+
+    for (i=0;i<size_filename;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+    for (i=0;i<size_extrafield_global;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+              *(((const char*)extrafield_global)+i);
+
+    for (i=0;i<size_comment;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+              size_extrafield_global+i) = *(comment+i);
+    if (zi->ci.central_header == NULL)
+        return ZIP_INTERNALERROR;
+
+    zi->ci.zip64 = zip64;
+    zi->ci.totalCompressedData = 0;
+    zi->ci.totalUncompressedData = 0;
+    zi->ci.pos_zip64extrainfo = 0;
+
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
+
+#ifdef HAVE_BZIP2
+    zi->ci.bstream.avail_in = (uInt)0;
+    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+    zi->ci.bstream.total_in_hi32 = 0;
+    zi->ci.bstream.total_in_lo32 = 0;
+    zi->ci.bstream.total_out_hi32 = 0;
+    zi->ci.bstream.total_out_lo32 = 0;
+#endif
+
+    zi->ci.stream.avail_in = (uInt)0;
+    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.stream.next_out = zi->ci.buffered_data;
+    zi->ci.stream.total_in = 0;
+    zi->ci.stream.total_out = 0;
+    zi->ci.stream.data_type = Z_BINARY;
+
+#ifdef HAVE_BZIP2
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
+    {
+        if(zi->ci.method == Z_DEFLATED)
+        {
+          zi->ci.stream.zalloc = (alloc_func)0;
+          zi->ci.stream.zfree = (free_func)0;
+          zi->ci.stream.opaque = (voidpf)0;
+
+          if (windowBits>0)
+              windowBits = -windowBits;
+
+          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+          if (err==Z_OK)
+              zi->ci.stream_initialised = Z_DEFLATED;
+        }
+        else if(zi->ci.method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            // Init BZip stuff here
+          zi->ci.bstream.bzalloc = 0;
+          zi->ci.bstream.bzfree = 0;
+          zi->ci.bstream.opaque = (voidpf)0;
+
+          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+          if(err == BZ_OK)
+            zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+        }
+
+    }
+
+#    ifndef NOCRYPT
+    zi->ci.crypt_header_size = 0;
+    if ((err==Z_OK) && (password != NULL))
+    {
+        unsigned char bufHead[RAND_HEAD_LEN];
+        unsigned int sizeHead;
+        zi->ci.encrypt = 1;
+        zi->ci.pcrc_32_tab = get_crc_table();
+        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+        zi->ci.crypt_header_size = sizeHead;
+
+        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+                err = ZIP_ERRNO;
+    }
+#    endif
+
+    if (err==Z_OK)
+        zi->in_opened_file_inzip = 1;
+    return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
+{
+    int err=ZIP_OK;
+
+    if (zi->ci.encrypt != 0)
+    {
+#ifndef NOCRYPT
+        uInt i;
+        int t;
+        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
+#endif
+    }
+
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
+      err = ZIP_ERRNO;
+
+    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED)
+    {
+      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+      zi->ci.bstream.total_in_lo32 = 0;
+      zi->ci.bstream.total_in_hi32 = 0;
+    }
+    else
+#endif
+    {
+      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+      zi->ci.stream.total_in = 0;
+    }
+
+
+    zi->ci.pos_in_buffered_data = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
+{
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
+    {
+      zi->ci.bstream.next_in = (void*)buf;
+      zi->ci.bstream.avail_in = len;
+      err = BZ_RUN_OK;
+
+      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+      {
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+
+
+        if(err != BZ_RUN_OK)
+          break;
+
+        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+        {
+          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
+
+          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
+        }
+      }
+
+      if(err == BZ_RUN_OK)
+        err = ZIP_OK;
+    }
+    else
+#endif
+    {
+      zi->ci.stream.next_in = (Bytef*)buf;
+      zi->ci.stream.avail_in = len;
+
+      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+      {
+          if (zi->ci.stream.avail_out == 0)
+          {
+              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                  err = ZIP_ERRNO;
+              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+              zi->ci.stream.next_out = zi->ci.buffered_data;
+          }
+
+
+          if(err != ZIP_OK)
+              break;
+
+          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+          {
+              uLong uTotalOutBefore = zi->ci.stream.total_out;
+              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+              if(uTotalOutBefore > zi->ci.stream.total_out)
+              {
+                int bBreak = 0;
+                bBreak++;
+              }
+
+              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          }
+          else
+          {
+              uInt copy_this,i;
+              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                  copy_this = zi->ci.stream.avail_in;
+              else
+                  copy_this = zi->ci.stream.avail_out;
+
+              for (i = 0; i < copy_this; i++)
+                  *(((char*)zi->ci.stream.next_out)+i) =
+                      *(((const char*)zi->ci.stream.next_in)+i);
+              {
+                  zi->ci.stream.avail_in -= copy_this;
+                  zi->ci.stream.avail_out-= copy_this;
+                  zi->ci.stream.next_in+= copy_this;
+                  zi->ci.stream.next_out+= copy_this;
+                  zi->ci.stream.total_in+= copy_this;
+                  zi->ci.stream.total_out+= copy_this;
+                  zi->ci.pos_in_buffered_data += copy_this;
+              }
+          }
+      }// while(...)
+    }
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
+{
+    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+    zip64_internal* zi;
+    ZPOS64_T compressed_size;
+    uLong invalidValue = 0xffffffff;
+    short datasize = 0;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+    zi->ci.stream.avail_in = 0;
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
+    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+#ifdef HAVE_BZIP2
+      err = BZ_FINISH_OK;
+      while (err==BZ_FINISH_OK)
+      {
+        uLong uTotalOutBefore;
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
+        if(err == BZ_STREAM_END)
+          err = Z_STREAM_END;
+
+        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+      }
+
+      if(err == BZ_FINISH_OK)
+        err = ZIP_OK;
+#endif
+    }
+
+    if (err==Z_STREAM_END)
+        err=ZIP_OK; /* this is normal */
+
+    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+                {
+        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
+            err = ZIP_ERRNO;
+                }
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        int tmp_err = deflateEnd(&zi->ci.stream);
+        if (err == ZIP_OK)
+            err = tmp_err;
+        zi->ci.stream_initialised = 0;
+    }
+#ifdef HAVE_BZIP2
+    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
+    }
+#endif
+
+    if (!zi->ci.raw)
+    {
+        crc32 = (uLong)zi->ci.crc32;
+        uncompressed_size = zi->ci.totalUncompressedData;
+    }
+    compressed_size = zi->ci.totalCompressedData;
+
+#    ifndef NOCRYPT
+    compressed_size += zi->ci.crypt_header_size;
+#    endif
+
+    // update Current Item crc and sizes,
+    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+    {
+      /*version Made by*/
+      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+      /*version needed*/
+      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+    }
+
+    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+    if(compressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+    /// set internal file attributes field
+    if (zi->ci.stream.data_type == Z_ASCII)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+    if(uncompressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+    // Add ZIP64 extra info field for uncompressed size
+    if(uncompressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for compressed size
+    if(compressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for relative offset to local file header of current file
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      datasize += 8;
+
+    if(datasize > 0)
+    {
+      char* p = NULL;
+
+      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+      {
+        // we can not write more data to the buffer that we have room for.
+        return ZIP_BADZIPFILE;
+      }
+
+      p = zi->ci.central_header + zi->ci.size_centralheader;
+
+      // Add Extra Information Header for 'ZIP64 information'
+      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+      p += 2;
+      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+      p += 2;
+
+      if(uncompressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, uncompressed_size, 8);
+        p += 8;
+      }
+
+      if(compressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, compressed_size, 8);
+        p += 8;
+      }
+
+      if(zi->ci.pos_local_header >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+        p += 8;
+      }
+
+      // Update how much extra free space we got in the memory buffer
+      // and increase the centralheader size so the new ZIP64 fields are included
+      // ( 4 below is the size of HeaderID and DataSize field )
+      zi->ci.size_centralExtraFree -= datasize + 4;
+      zi->ci.size_centralheader += datasize + 4;
+
+      // Update the extra info size field
+      zi->ci.size_centralExtra += datasize + 4;
+      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+    }
+
+    if (err==ZIP_OK)
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
+    free(zi->ci.central_header);
+
+    if (err==ZIP_OK)
+    {
+        // Update the LocalFileHeader with the new values.
+
+        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+
+        if (err==ZIP_OK)
+            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
+        {
+          if(zi->ci.pos_zip64extrainfo > 0)
+          {
+            // Update the size in the ZIP64 extended field.
+            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+              err = ZIP_ERRNO;
+
+            if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
+
+            if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+          }
+          else
+              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
+        }
+        else
+        {
+          if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+          if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+        }
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+    }
+
+    zi->number_entry ++;
+    zi->in_opened_file_inzip = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
+{
+    return zipCloseFileInZipRaw (file,0,0);
+}
+
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+{
+  int err = ZIP_OK;
+  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+  /*num disks*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  /*relative offset*/
+    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+    return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  uLong Zip64DataSize = 44;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+  if (err==ZIP_OK) /* version made by */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* version needed */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+  }
+  return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  /*signature*/
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+  {
+    {
+      if(zi->number_entry >= 0xFFFF)
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+      else
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    }
+  }
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+  {
+    if(zi->number_entry >= 0xFFFF)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+  }
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+    }
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+  }
+
+   return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+  int err = ZIP_OK;
+  uInt size_global_comment = 0;
+
+  if(global_comment != NULL)
+    size_global_comment = (uInt)strlen(global_comment);
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+  if (err == ZIP_OK && size_global_comment > 0)
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+      err = ZIP_ERRNO;
+  }
+  return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+    zip64_internal* zi;
+    int err = 0;
+    uLong size_centraldir = 0;
+    ZPOS64_T centraldir_pos_inzip;
+    ZPOS64_T pos;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+    }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    if (global_comment==NULL)
+        global_comment = zi->globalcomment;
+#endif
+
+    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    if (err==ZIP_OK)
+    {
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
+        while (ldi!=NULL)
+        {
+            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+            {
+                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
+                    err = ZIP_ERRNO;
+            }
+
+            size_centraldir += ldi->filled_in_this_block;
+            ldi = ldi->next_datablock;
+        }
+    }
+    free_linkedlist(&(zi->central_dir));
+
+    pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+    {
+      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+    }
+
+    if (err==ZIP_OK)
+      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+    if(err == ZIP_OK)
+      err = Write_GlobalComment(zi, global_comment);
+
+    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
+        if (err == ZIP_OK)
+            err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    TRYFREE(zi->globalcomment);
+#endif
+    TRYFREE(zi);
+
+    return err;
+}
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+  char* p = pData;
+  int size = 0;
+  char* pNewHeader;
+  char* pTmp;
+  short header;
+  short dataSize;
+
+  int retVal = ZIP_OK;
+
+  if(pData == NULL || *dataLen < 4)
+    return ZIP_PARAMERROR;
+
+  pNewHeader = (char*)ALLOC(*dataLen);
+  pTmp = pNewHeader;
+
+  while(p < (pData + *dataLen))
+  {
+    header = *(short*)p;
+    dataSize = *(((short*)p)+1);
+
+    if( header == sHeader ) // Header found.
+    {
+      p += dataSize + 4; // skip it. do not copy to temp buffer
+    }
+    else
+    {
+      // Extra Info block should not be removed, So copy it to the temp buffer.
+      memcpy(pTmp, p, dataSize + 4);
+      p += dataSize + 4;
+      size += dataSize + 4;
+    }
+
+  }
+
+  if(size < *dataLen)
+  {
+    // clean old extra info block.
+    memset(pData,0, *dataLen);
+
+    // copy the new extra info block over the old
+    if(size > 0)
+      memcpy(pData, pNewHeader, size);
+
+    // set the new extra info size
+    *dataLen = size;
+
+    retVal = ZIP_OK;
+  }
+  else
+    retVal = ZIP_ERRNO;
+
+  TRYFREE(pNewHeader);
+
+  return retVal;
+}
diff --git a/third_party/minizip/zip.h b/third_party/minizip/zip.h
new file mode 100644
index 00000000..90722f49
--- /dev/null
+++ b/third_party/minizip/zip.h
@@ -0,0 +1,365 @@
+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
+
+*/
+
+/* Pragma added by libxlsxwriter project to avoid warnings with -pedantic -ansi. */
+#pragma GCC system_header
+
+#ifndef _zip12_H
+#define _zip12_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* #define HAVE_BZIP2 */
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
+/*
+  Close the current file in the zipfile, for file opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip64_H */