chart: add initial layout support

Feature: #477

.github/workflows/cmake_actions.yml

@@ -36,13 +36,17 @@ jobs:
         sudo apt-get -y install libssl-dev
 
     - name: Configure CMake
-      working-directory: ${{ github.workspace }}/cmake
-      run:  cmake .. -DBUILD_TESTS=ON ${{ matrix.cmake_flags }} -DCMAKE_BUILD_TYPE=Release
+      run: |
+        mkdir build
+        cd build
+        cmake .. -DBUILD_TESTS=ON ${{ matrix.cmake_flags }} -DCMAKE_BUILD_TYPE=Release
 
     - name: Build
-      working-directory: ${{ github.workspace }}/cmake
-      run: cmake --build . --config Release --parallel
+      run: |
+        cd build
+        cmake --build . --config Release --parallel
 
     - name: Test
-      working-directory: ${{ github.workspace }}/cmake
-      run: ctest -C Release -V
+      run: |
+        cd build
+        ctest -C Release -V

.github/workflows/code_style.yml

@@ -16,6 +16,8 @@ jobs:
       run: |
         sudo apt-get -y install indent
         sudo ln -s /usr/bin/indent /usr/bin/gindent
+        python -m pip install --upgrade pip
+        pip install gersemi
 
     - name: Make indent
       run: |

.github/workflows/windows_build.yml

@@ -11,8 +11,8 @@ jobs:
       matrix:
         cmake_flags: ["-DBUILD_EXAMPLES=ON       -DBUILD_TESTS=ON",
                       "-DUSE_DTOA_LIBRARY=ON     -DBUILD_TESTS=ON",
-                      #"-DUSE_SYSTEM_MINIZIP=ON   -DBUILD_TESTS=ON",
-                      #"-DUSE_SYSTEM_MINIZIP=ON   -DUSE_OPENSSL_MD5=ON -DBUILD_TESTS=ON",
+                      "-DUSE_SYSTEM_MINIZIP=ON   -DBUILD_TESTS=ON",
+                      "-DUSE_SYSTEM_MINIZIP=ON   -DUSE_OPENSSL_MD5=ON -DBUILD_TESTS=ON",
                       "-DUSE_OPENSSL_MD5=ON      -DBUILD_TESTS=ON",
                       ]
 
@@ -33,7 +33,8 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: cmd
       run: |
-        cd cmake
+        mkdir build
+        cd build
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         cmake .. -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_flags }} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -A x64
 
@@ -41,7 +42,7 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: cmd
       run: |
-        cd cmake
+        cd build
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         cmake --build . --config Release
 
@@ -49,6 +50,6 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       shell: cmd
       run: |
-        cd cmake
-        copy test\functional\src\Release\*.exe test\functional\src
+        cd build
+        copy test\functional\src\Release\*.* test\functional\src
         pytest -v test/functional

.github/workflows/zig_build.yml

@@ -14,9 +14,7 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-      - uses: goto-bus-stop/setup-zig@v2
-        with:
-          version: 0.12.0
+      - uses: mlugg/setup-zig@v1 # default latest-release version
 
       - name: Build Summary
         run: zig build -DBUILD_TESTS -DBUILD_EXAMPLES -DUSE_SYSTEM_MINIZIP --summary all -freference-trace

.gitignore

@@ -54,12 +54,7 @@ third_party/zlib-1.2.8/minigzip
 third_party/zlib-1.2.8/minigzipsh
 third_party/zlib-1.2.8/zlib.pc
 
-cmake
-!cmake/FindMINIZIP.cmake
-!cmake/FindPackage.cmake
-!cmake/i686-toolchain.cmake
-
 .vscode
 
-zig-cache/
-zig-out/
+*zig-cache/
+zig-out/

.indent.pro

@@ -41,6 +41,7 @@
 -T SLIST_ENTRY
 -T STAILQ_ENTRY
 -T TAILQ_ENTRY
+-T FILE
 
 /* libxlsxwriter typedefs. */
 -T lxw_app

CMakeLists.txt

@@ -1,159 +1,210 @@
-#  :copyright: (c) 2017 Alex Huszagh.
-#  :license: FreeBSD, see LICENSE.txt for more details.
+#  :copyright: 2014-2025. John McNamara, Alex Huszagh.
+#  :license: SPDX-License-Identifier: BSD-2-Clause
 
-# Description
-# ===========
+# CMake file for libxlsxwriter
+# ============================
 #
-#   Use:
-#       Move to a custom directory, ideally out of source, and
-#       type `cmake $LXW_SOURCE $FLAGS`, where `LXW_SOURCE` is the
-#       path to the libxlsxwriter project, and `FLAGS` are custom
-#       flags to pass to the compiler.
+# To build libxlsxwriter with CMake move to a custom directory, ideally outside
+# the root of the source tree, and type `cmake $LXW_SOURCE_LOCATION $FLAGS`,
+# where `LXW_SOURCE_LOCATION` is the path to the libxlsxwriter project, and
+# `FLAGS` are custom flags to pass to the compiler.
 #
-#   Example:
-#       For example, in the project directory, to build libxlsxwriter
-#       and the unittests in release mode, type:
-#           mkdir build && cd build
-#           cmake .. -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
-#           cmake --build . --config Release
-#           ctest -C Release -V
-#           cmake --build . --config Release --target install
+# For example, in the project directory, you can build libxlsxwriter as follows:
 #
-#       If using a Makefile generator, you may use the simpler
-#           mkdir build && cd build
-#           cmake .. -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
-#           make
-#           make test
-#           make install
+# ```
+#     mkdir build
+#     cd build
 #
-#   Flags:
-#       ZLIB_ROOT
-#           The ZLIB root directory can be specified either through
-#           an environment variable (`export ZLIB_ROOT=/usr/include`)
-#           or using a flag with CMake (`-DZLIB_ROOT:STRING=/usr/include`).
-#           This sets the preferred search path for the ZLIB installation.
+#     cmake .. -DCMAKE_BUILD_TYPE=Release
+#     cmake --build . --config Release
 #
-#       BUILD_TESTS
-#           Build unittests (default off). To build the unittests,
-#           pass `-DBUILD_TESTS=ON` during configuration.
+# ```
 #
-#       BUILD_EXAMPLES
-#           Build example files (default off). To build the examples,
-#           pass `-DBUILD_EXAMPLES=ON` during configuration.
+# Or to build and run the tests (this can take several minutes):
 #
-#       BUILD_FUZZERS
-#           Build fuzz harnesses (default off). To build the harnesses,
-#           pass `-DBUILD_FUZZERS=ON` during configuration.
+# ```
+#     mkdir build
+#     cd build
 #
-#       USE_STANDARD_TMPFILE
-#           Use the standard tmpfile() function (default off). To enable
-#           the standard tmpfile, pass `-DUSE_STANDARD_TMPFILE=ON`
-#           during configuration. This may produce bugs while cross-
-#           compiling or using MinGW/MSYS.
+#     cmake .. -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release
+#     cmake --build . --config Release
+#     ctest -C Release -V
+#     cmake --build . --config Release --target install
+# ```
 #
-#       USE_DTOA_LIBRARY
-#           Use the third party emyg_dtoa() library (default off). The
-#           emyg_dtoa() library is used to avoid sprintf double issues with
-#           different locale settings. To enable this library, pass
-#           `-DUSE_DTOA_LIBRARY=ON` during configuration.
+# If the tests run successfully, you can install the library as follows:
 #
-#       USE_NO_MD5
-#           Compile without third party MD5 support. This will turn off the
-#           functionality of avoiding duplicate image files in the output xlsx
-#           file. To enable this option pass `-DUSE_NO_MD5=ON` during
-#           configuration.
-#
-#       USE_OPENSSL_MD5 Compile with OpenSSL MD5 support. This will link
-#           against libcrypto for MD5 support rather than using the local MD5
-#           support. MD5 support is required to avoid duplicate image files in
-#           the output xlsx file. To enable this option pass
-#           `-DUSE_OPENSSL_MD5=ON` during configuration.
-#
-#       USE_STATIC_MSVC_RUNTIME
-#           Use the static msvc runtime library when compiling with msvc (default off)
-#           To enable, pass `-DUSE_STATIC_MSVC_RUNTIME` during configuration.
-#
-#   Toolchains:
-#       On multiarch Linux systems, which can build and run multiple
-#       binary targets on the same system, we include an `i686-toolchain`
-#       file to enable building i686 (x86 32-bit) targets on x86_64 systems.
-#       To use the i686 toolchain, pass the `-DCMAKE_TOOLCHAIN_FILE` option
-#       during CMake configuration. For example, from the build directory,
-#       you would use:
-#           cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/i686-toolchain.cmake
-#
-#   CMake Options:
-#       CMake sets debug and release builds with the `CMAKE_BUILD_TYPE`
-#       option, which can be set as a flag during configuration.
-#       To build in release mode, pass `-DCMAKE_BUILD_TYPE=Release`
-#       during configuration.
-#
-#       CMake sets the creation of static and shared libraries with the
-#       `BUILD_SHARED_LIBS` option, which can be set as a flag during
-#       configuration. To build a static library, pass
-#       `-DBUILD_SHARED_LIBS=OFF` during configuration.
-#
-#   Generators:
-#       CMake also supports custom build generators, such as MakeFiles,
-#       Ninja, Visual Studio, and XCode. For example, to generate
-#       a Visual Studio solution, configure with:
-#           cmake .. -G "Visual Studio 14 2015 Win64"
-#
-#       For more information on using generators, see:
-#           https://cmake.org/cmake/help/v3.0/manual/cmake-generators.7.html
+# ```
+#     cmake --build . --config Release --target install
+# ```
 #
+# The libxlsxwriter CMake options are shown below.
 
-set(CMAKE_LEGACY_CYGWIN_WIN32 1)
-if(MSVC)
-    cmake_minimum_required(VERSION 3.4)
-else()
-    cmake_minimum_required(VERSION 3.1)
-endif()
+# ---------------------
+# Project configuration
+# ---------------------
+cmake_minimum_required(VERSION 3.16)
+
+set(XLSX_PROJECT_NAME
+    "xlsxwriter"
+    CACHE STRING
+    "Libxlsxwriter is a C library for creating new Excel XLSX files"
+)
 
-SET(XLSX_PROJECT_NAME "xlsxwriter" CACHE STRING "Optional project and binary name")
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 project(${XLSX_PROJECT_NAME} C)
 enable_testing()
 
-# POLICY
-# ------
+# -------------------
+# Compilation options
+# -------------------
 
-# The use of the word ZLIB_ROOT should still work prior to "3.12.0",
-# just it's been generalized for all packages now. Just set the policy
-# to new, so we use it, and it will be used prior to 3.12 anyway.
-if(${CMAKE_VERSION} VERSION_GREATER "3.12" OR ${CMAKE_VERSION} VERSION_EQUAL "3.12")
-    cmake_policy(SET CMP0074 NEW)
+# `USE_SYSTEM_MINIZIP`
+#
+# Libxlsxwriter uses the `minizip` component of `zlib`to create the xlsx zip
+# file container. The vendored source files for `minizip` are included in the
+# src tree of libxlsxwriter and are statically linked by default.
+#
+# You can use this option if you have the `minizip` library already installed on
+# your system and prefer to dynamically link against it.
+#
+# To enable this option pass `-DUSE_SYSTEM_MINIZIP=ON` during configuration.
+option(
+    USE_SYSTEM_MINIZIP
+    "Use system minizip library instead of the vendored copy"
+    OFF
+)
+
+# `USE_STANDARD_TMPFILE`
+#
+# Uses the standard library `tmpfile` function to handle temp files instead of
+# the vendored `tmpfileplus` function. Turning this off eliminates a dependency.
+# This option is not recommended for Windows as it doesn't support a
+# configurable location and the default location may be in a privileged
+# directory.
+#
+# To enable this option pass `-DUSE_STANDARD_TMPFILE=ON` during configuration.
+option(
+    USE_STANDARD_TMPFILE
+    "Use the C standard library tmpfile() instead of tmpfileplus"
+    OFF
+)
+
+# `USE_OPENSSL_MD5`
+#
+# Uses OpenSSL to provide a MD5 digest of image files in order to avoid storing
+# duplicates instead of the vendored OpenWall MD5 functions. This will link
+# against libcrypto for MD5 support rather than using the local MD5 support.
+#
+# To enable this option pass `-DUSE_OPENSSL_MD5=ON` during configuration.
+option(
+    USE_OPENSSL_MD5
+    "Build libxlsxwriter with the OpenSSL MD5 support instead of built in version"
+    OFF
+)
+
+# `USE_NO_MD5`
+#
+# Compile without third party MD5 support. This will turn off the functionality
+# of avoiding duplicate image files in the output xlsx file. This can reduce the
+# executable size slightly if you aren't using images.
+#
+# To enable this option pass `-DUSE_NO_MD5=ON` during configuration.
+option(
+    USE_NO_MD5
+    "Build libxlsxwriter without MD5 support for eliminating duplicate images"
+    OFF
+)
+
+# `USE_DTOA_LIBRARY`
+#
+# Use the third party Milo Yip DTOA library to handle string formatting of
+# doubles. This is used to avoid issues with double formatting in different
+# locales and gives better performance with numeric data.
+#
+# To enable this library, pass `-DUSE_DTOA_LIBRARY=ON` during configuration.
+option(
+    USE_DTOA_LIBRARY
+    "Use the Milo Yip DTOA library to handle string formatting of doubles."
+    OFF
+)
+
+# `USE_MEM_FILE`
+#
+# Use in memory files instead of temp files using the
+# `fmemopen()`/`open_memstream()` functions. This option isn't available with
+# MSVC.
+#
+# To enable this option pass `-DUSE_MEM_FILE=ON` during configuration.
+if(NOT MSVC)
+    option(
+        USE_MEM_FILE
+        "Use fmemopen()/open_memstream() in place of temporary files"
+        OFF
+    )
 endif()
 
-# OPTIONS
-# -------
-SET(ZLIB_ROOT "" CACHE STRING "Optional root for the ZLIB installation")
+# `BUILD_TESTS`
+#
+# Compile the unit and function tests for libxlsxwriter. This functional tests
+# require the Python pytest library. The tests can be run with `ctest` after
+# compilation. The uint tests do not work with MSVC and are turned off for that
+# platform. Note, the tests can take a while to compile and run.
+#
+# To enable this option pass `-DBUILD_TESTS=ON` during configuration.
+option(
+    BUILD_TESTS
+    "Build the libxlsxwriter unit and functional tests (requires pytest)"
+    OFF
+)
 
-option(BUILD_TESTS "Build libxlsxwriter tests" OFF)
+# TODO LXW_TARGET_BIG_ENDIAN
+
+# `BUILD_EXAMPLES`
+#
+# Compile the libxlsxwriter example programs.
+#
+# To enable this option pass `-DBUILD_EXAMPLES=ON` during configuration.
 option(BUILD_EXAMPLES "Build libxlsxwriter examples" OFF)
-option(BUILD_FUZZERS "Build harness(es) for fuzzing" OFF)
-option(USE_SYSTEM_MINIZIP "Use system minizip installation" OFF)
-option(USE_STANDARD_TMPFILE "Use the C standard library's tmpfile()" OFF)
-option(USE_NO_MD5 "Build libxlsxwriter without third party MD5 lib" OFF)
-option(USE_OPENSSL_MD5 "Build libxlsxwriter with the OpenSSL MD5 lib" OFF)
-option(USE_MEM_FILE "Use fmemopen()/open_memstream() in place of temporary files" OFF)
-option(IOAPI_NO_64 "Disable 64-bit filesystem support" OFF)
-option(USE_DTOA_LIBRARY "Use the locale independent third party Milo Yip DTOA library" OFF)
 
+# `BUILD_FUZZERS`
+#
+# Compile the fuzzer harnesses.
+#
+# To enable this option pass `-DBUILD_FUZZERS=ON` during configuration.
+option(BUILD_FUZZERS "Build harness(es) for fuzzing" OFF)
+
+# `IOAPI_NO_64`
+#
+# Turn off `IOAPI_NO_64` support in minizip ioapi.c.
+#
+# To enable this option pass `-DIOAPI_NO_64=ON` during configuration.
+option(IOAPI_NO_64 "Disable 64-bit filesystem support with minizip" OFF)
+
+# `USE_STATIC_MSVC_RUNTIME`
+#
+# Compile as a static library with the static MSVC runtime library.
+#
+# To enable this option pass `-DUSE_STATIC_MSVC_RUNTIME=ON` during configuration.
 if(MSVC)
     option(USE_STATIC_MSVC_RUNTIME "Use the static runtime library" OFF)
 endif()
 
-if(DEFINED ENV{${ZLIB_ROOT}})
+# `ZLIB_ROOT`
+#
+# The `ZLIB `root directory can be specified either through an environment
+# variable (`export ZLIB_ROOT=/usr/include`) or using a flag with CMake
+# (`-DZLIB_ROOT:STRING=/usr/include`). This sets the preferred search path for
+# the ZLIB installation.
+set(ZLIB_ROOT "" CACHE STRING "Optional root for the ZLIB installation")
+if(DEFINED ENV{ZLIB_ROOT})
     set(ZLIB_ROOT $ENV{ZLIB_ROOT})
 endif()
 
-if(IOAPI_NO_64)
-    list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS IOAPI_NO_64=1)
-endif()
+# -------------------------
+# Configure the compilation
+# -------------------------
 
-# CONFIGURATIONS
-# --------------
 if(USE_SYSTEM_MINIZIP)
     list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS USE_SYSTEM_MINIZIP)
 endif()
@@ -181,102 +232,140 @@ if(USE_DTOA_LIBRARY)
     list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS USE_DTOA_LIBRARY)
 endif()
 
+if(IOAPI_NO_64)
+    list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS IOAPI_NO_64=1)
+endif()
+
 if(NOT BUILD_SHARED_LIBS)
     if(UNIX)
         set(CMAKE_POSITION_INDEPENDENT_CODE ON)
     elseif(MINGW OR MSYS)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -static-libgcc -Wno-char-subscripts -Wno-long-long")
+        set(CMAKE_C_FLAGS
+            "${CMAKE_C_FLAGS} -static -static-libgcc -Wno-char-subscripts -Wno-long-long"
+        )
         list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS USE_FILE32API)
     elseif(MSVC)
-        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\"")
-        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Ox /Zi /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\"")
-        set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /Zi /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\"")
-        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\"")
+        set(CMAKE_C_FLAGS_DEBUG
+            "${CMAKE_C_FLAGS_DEBUG} /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\""
+        )
+        set(CMAKE_C_FLAGS_RELEASE
+            "${CMAKE_C_FLAGS_RELEASE} /Ox /Zi /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\""
+        )
+        set(CMAKE_C_FLAGS_MINSIZEREL
+            "${CMAKE_C_FLAGS_MINSIZEREL} /Zi /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\""
+        )
+        set(CMAKE_C_FLAGS_RELWITHDEBINFO
+            "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Fd\"${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb\""
+        )
     endif()
 endif()
 
 if(MSVC AND USE_STATIC_MSVC_RUNTIME)
-    foreach(flag_var CMAKE_C_FLAGS
-                     CMAKE_C_FLAGS_DEBUG
-                     CMAKE_C_FLAGS_RELEASE
-                     CMAKE_C_FLAGS_MINSIZEREL
-                     CMAKE_C_FLAGS_RELWITHDEBINFO)
+    foreach(
+        flag_var
+        CMAKE_C_FLAGS
+        CMAKE_C_FLAGS_DEBUG
+        CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_MINSIZEREL
+        CMAKE_C_FLAGS_RELWITHDEBINFO
+    )
         if(${flag_var} MATCHES "/MD")
             string(REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
         endif()
     endforeach()
 endif()
 
-# Configure pkg-config
-find_package(PkgConfig)
-file(READ "include/xlsxwriter.h" ver)
+# -----------------------------
+# Create the xlsxwriter.pc file
+# -----------------------------
+set(PREFIX ${CMAKE_INSTALL_PREFIX})
 
+file(READ "include/xlsxwriter.h" ver)
 string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver})
 set(VERSION ${CMAKE_MATCH_1})
 string(REGEX MATCH "LXW_SOVERSION \"([^\"]+)\"" _ ${ver})
 set(SOVERSION ${CMAKE_MATCH_1})
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
 
+set(ENABLED_OPTIONS "zlib")
+if(USE_SYSTEM_MINIZIP)
+    string(APPEND ENABLED_OPTIONS " minizip")
+endif()
+if(USE_OPENSSL_MD5)
+    string(APPEND ENABLED_OPTIONS " libcrypto")
+endif()
+
+# Expand out the xlsxwriter.pc file.
 configure_file(dev/release/pkg-config.txt xlsxwriter.pc @ONLY)
 
-# INCLUDES
-# --------
+# ----------------
+# Set the includes
+# ----------------
 enable_language(CXX)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-# ZLIB
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(ZLIB zlib)
-    list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
-else(NOT ZLIB_FOUND)
-    find_package(ZLIB "1.0" REQUIRED)
-    list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
-    message("zlib version: " ${ZLIB_VERSION})
-endif()
+# Set the zlib includes.
+find_package(ZLIB "1.2.8" REQUIRED)
+list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
 
-# MINIZIP
+# Set the minizip includes.
 if(USE_SYSTEM_MINIZIP)
-    if(PKG_CONFIG_FOUND)
+    if(MSVC)
+        find_package(MINIZIP NAMES unofficial-minizip REQUIRED)
+        set(MINIZIP_LIBRARIES unofficial::minizip::minizip)
+    else()
+        find_package(PkgConfig REQUIRED)
         pkg_check_modules(MINIZIP minizip)
         list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}/..)
-    else(NOT MINIZIP_FOUND)
-        find_package(MINIZIP "1.0" REQUIRED)
-        list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS})
     endif()
 endif()
 
-# LIBRARY
-# -------
+# Set the openssl includes.
+if(USE_OPENSSL_MD5)
+    find_package(OpenSSL REQUIRED)
+    include_directories(${OPENSSL_INCLUDE_DIR})
+endif()
+
+# ----------------------------
+# Set the library dependencies
+# ----------------------------
 list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS NOCRYPT NOUNCRYPT)
 
-# Ensure CRT Secure warnings are disabled
+# Ensure CRT Secure warnings are disabled.
 if(MSVC)
     list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
 endif()
 
-# Ensure "TESTING" macro is defined if building tests
+# Ensure "TESTING" macro is defined if building tests.
 if(BUILD_TESTS)
     list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS TESTING)
 endif()
 
-# Define "LXW_BIG_ENDIAN" macro on big-endian architectures
+# Define "LXW_BIG_ENDIAN" macro on big-endian architectures.
 include(TestBigEndian)
-TEST_BIG_ENDIAN(LXW_TARGET_BIG_ENDIAN)
+test_big_endian(LXW_TARGET_BIG_ENDIAN)
 if(LXW_TARGET_BIG_ENDIAN)
     list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS LXW_BIG_ENDIAN)
 endif()
 
+# Set the source files.
 file(GLOB LXW_SOURCES src/*.c)
 file(GLOB_RECURSE LXW_HEADERS RELATIVE include *.h)
 
+# If not using the system minizip, add the vendored minizip source files.
 if(NOT USE_SYSTEM_MINIZIP)
-    list(APPEND LXW_SOURCES third_party/minizip/ioapi.c third_party/minizip/zip.c)
+    list(
+        APPEND
+        LXW_SOURCES
+        third_party/minizip/ioapi.c
+        third_party/minizip/zip.c
+    )
     if(MSVC)
         list(APPEND LXW_SOURCES third_party/minizip/iowin32.c)
     endif()
 endif()
 
-if (NOT USE_STANDARD_TMPFILE)
+# If not using the system tmpfile, add the vendored tmpfileplus files.
+if(NOT USE_STANDARD_TMPFILE)
     list(APPEND LXW_SOURCES third_party/tmpfileplus/tmpfileplus.c)
 endif()
 
@@ -284,84 +373,71 @@ if(NOT USE_OPENSSL_MD5 AND NOT USE_NO_MD5)
     list(APPEND LXW_SOURCES third_party/md5/md5.c)
 endif()
 
-if(USE_OPENSSL_MD5)
-    if(PKG_CONFIG_FOUND)
-        pkg_check_modules(LIBCRYPTO libcrypto)
-        include_directories(${LIBCRYPTO_INCLUDE_DIRS})
-    else(NOT LIBCRYPTO_FOUND)
-        find_package(OpenSSL REQUIRED)
-        include_directories(${OPENSSL_INCLUDE_DIR})
-        message(STATUS "OpenSSL version: ${OPENSSL_VERSION}")
-    endif()
-endif()
-
-if (USE_DTOA_LIBRARY)
+if(USE_DTOA_LIBRARY)
     list(APPEND LXW_SOURCES third_party/dtoa/emyg_dtoa.c)
 endif()
 
+# Set project metadata.
 set(LXW_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(LXW_LIB_DIR "${LXW_PROJECT_DIR}/lib")
 add_library(${PROJECT_NAME} "")
-
 set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${SOVERSION})
-target_sources(${PROJECT_NAME}
-    PRIVATE ${LXW_SOURCES}
-    PUBLIC ${LXW_HEADERS}
-)
-if(ZLIB_LDFLAGS)
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${ZLIB_LDFLAGS})
-else()
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${ZLIB_LIBRARIES})
-endif()
-if(MINIZIP_LDFLAGS)
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${MINIZIP_LDFLAGS})
-else()
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${MINIZIP_LIBRARIES})
-endif()
-if(LIBCRYPTO_LDFLAGS)
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${LIBCRYPTO_LDFLAGS})
-else()
-    target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${LIB_CRYPTO} ${OPENSSL_CRYPTO_LIBRARY})
-endif()
-target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINITIONS})
+target_sources(${PROJECT_NAME} PRIVATE ${LXW_SOURCES} PUBLIC ${LXW_HEADERS})
 
-# /utf-8 needs VS2015 Update 2 or above.
-# In CMake 3.7 and above, we can use (MSVC_VERSION GREATER_EQUAL 1900) here.
-if(MSVC AND NOT (MSVC_VERSION LESS 1900))
+target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
+
+if(MINIZIP_LINK_LIBRARIES)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIZIP_LINK_LIBRARIES})
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIZIP_LIBRARIES})
+endif()
+
+target_link_libraries(
+    ${PROJECT_NAME}
+    PRIVATE ${LIB_CRYPTO} ${OPENSSL_CRYPTO_LIBRARY}
+)
+
+target_compile_definitions(
+    ${PROJECT_NAME}
+    PRIVATE ${LXW_PRIVATE_COMPILE_DEFINITIONS}
+)
+
+# Ensure MSVC supports /utf-8.
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1900)
     target_compile_options(${PROJECT_NAME} PRIVATE /utf-8)
 endif()
 
-if (WINDOWSSTORE)
-  target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API)
+if(WINDOWSSTORE)
+    target_compile_definitions(
+        ${PROJECT_NAME}
+        PRIVATE -DIOWIN32_USING_WINRT_API
+    )
 endif()
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(
+    ${PROJECT_NAME}
     PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS}
     PUBLIC include include/xlsxwriter
 )
 
-# TESTS
-# -----
+# ------------------------
+# Set up and run the tests
+# ------------------------
 
-# Create test and runner.
-#
-# Args:
-#   sources       Name of variable holding source files
-#   target        Test name
-#
-
-macro(CreateTest sources target)
+# Macro for handling unit tests.
+macro(create_test sources target)
     set(output_name xlsxwriter_${target})
     set(dependencies ${output_name})
 
     add_executable(${output_name} ${${sources}})
     target_link_libraries(${output_name} ${PROJECT_NAME})
     target_compile_definitions(${output_name} PRIVATE TESTING COLOR_OK)
-    add_test(NAME ${output_name}
+    add_test(
+        NAME ${output_name}
         COMMAND ${output_name}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
-endmacro(CreateTest)
+endmacro(create_test)
 
 file(GLOB LXW_UTILITY_SOURCES test/unit/utility/test*.c)
 file(GLOB LXW_XMLWRITER_SOURCES test/unit/xmlwriter/test*.c)
@@ -380,70 +456,80 @@ file(GLOB LXW_CUSTOM_SOURCES test/unit/custom/test*.c)
 file(GLOB LXW_FUNCTIONAL_SOURCES test/functional/src/*.c)
 
 if(NOT MSVC)
-# Skip unit tests on Windows since ctest.h doesn't support it.
-set(LXW_UNIT_SOURCES
-    test/unit/test_all.c
-    ${LXW_UTILITY_SOURCES}
-    ${LXW_XMLWRITER_SOURCES}
-    ${LXW_WORKSHEET_SOURCES}
-    ${LXW_SST_SOURCES}
-    ${LXW_WORKBOOK_SOURCES}
-    ${LXW_APP_SOURCES}
-    ${LXW_CONTENTTYPES_SOURCES}
-    ${LXW_CORE_SOURCES}
-    ${LXW_RELATIONSHIPS_SOURCES}
-    ${LXW_FORMAT_SOURCES}
-    ${LXW_STYLES_SOURCES}
-    ${LXW_DRAWING_SOURCES}
-    ${LXW_CHART_SOURCES}
-    ${LXW_CUSTOM_SOURCES}
-)
+    # Skip unit tests on Windows since ctest.h doesn't support it.
+    set(LXW_UNIT_SOURCES
+        test/unit/test_all.c
+        ${LXW_UTILITY_SOURCES}
+        ${LXW_XMLWRITER_SOURCES}
+        ${LXW_WORKSHEET_SOURCES}
+        ${LXW_SST_SOURCES}
+        ${LXW_WORKBOOK_SOURCES}
+        ${LXW_APP_SOURCES}
+        ${LXW_CONTENTTYPES_SOURCES}
+        ${LXW_CORE_SOURCES}
+        ${LXW_RELATIONSHIPS_SOURCES}
+        ${LXW_FORMAT_SOURCES}
+        ${LXW_STYLES_SOURCES}
+        ${LXW_DRAWING_SOURCES}
+        ${LXW_CHART_SOURCES}
+        ${LXW_CUSTOM_SOURCES}
+    )
 else()
-set(LXW_UNIT_SOURCES
-    test/cpp/test_compilation.cpp
-)
+    set(LXW_UNIT_SOURCES test/cpp/test_compilation.cpp)
 endif()
 
 if(BUILD_TESTS)
-    # unit tests
-    CreateTest(LXW_UNIT_SOURCES unit)
+    # Unit tests.
+    create_test(LXW_UNIT_SOURCES unit)
 
-    # functional tests
+    # Functional tests.
     find_package(Python COMPONENTS Interpreter REQUIRED)
     find_program(Pytest_EXECUTABLE NAMES pytest)
 
-    if (NOT Pytest_EXECUTABLE)
-        message("Please install the Python pytest library to run functional tests:")
+    if(NOT Pytest_EXECUTABLE)
+        message(
+            "Please install the Python pytest library to run the functional tests:"
+        )
         message("    pip install pytest\n")
     endif()
 
     foreach(source ${LXW_FUNCTIONAL_SOURCES})
-       get_filename_component(basename ${source} NAME_WE)
-       add_executable(${basename} ${source})
-       target_link_libraries(${basename} xlsxwriter)
-       set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "test/functional/src")
+        get_filename_component(basename ${source} NAME_WE)
+        add_executable(${basename} ${source})
+        target_link_libraries(${basename} xlsxwriter)
+        set_target_properties(
+            ${basename}
+            PROPERTIES RUNTIME_OUTPUT_DIRECTORY "test/functional/src"
+        )
     endforeach(source)
 
-    add_custom_command(TARGET xlsxwriter_unit POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/test/functional test/functional
+    add_custom_command(
+        TARGET xlsxwriter_unit
+        POST_BUILD
+        COMMAND
+            ${CMAKE_COMMAND} -E copy_directory
+            ${CMAKE_SOURCE_DIR}/test/functional test/functional
     )
 
     if(USE_NO_MD5)
-        add_test(NAME functional
+        add_test(
+            NAME functional
             COMMAND pytest -v test/functional -m "not skipif"
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         )
     else()
-        add_test(NAME functional
+        add_test(
+            NAME functional
             COMMAND pytest -v test/functional
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         )
     endif()
-
 endif()
 
-# EXAMPLES
-# --------
+# ------------------------------------
+# Compile and run the example programs
+# ------------------------------------
+
 file(GLOB LXW_EXAMPLE_SOURCES examples/*.c)
 
 if(BUILD_EXAMPLES)
@@ -451,28 +537,41 @@ if(BUILD_EXAMPLES)
         get_filename_component(basename ${source} NAME_WE)
         add_executable(${basename} ${source})
         target_link_libraries(${basename} ${PROJECT_NAME})
-        set_target_properties(${basename} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "examples")
+        set_target_properties(
+            ${basename}
+            PROPERTIES RUNTIME_OUTPUT_DIRECTORY "examples"
+        )
     endforeach(source)
 endif()
 
-# FUZZING
-# -------
-if (BUILD_FUZZERS AND DEFINED ENV{LIB_FUZZING_ENGINE})
+# -----------------
+# Fuzzing harnesses
+# -----------------
+if(BUILD_FUZZERS AND DEFINED ENV{LIB_FUZZING_ENGINE})
     add_subdirectory(dev/fuzzing)
 endif()
 
-# INSTALL
-# -------
+# -------------------
+# Install the library
+# -------------------
 include(GNUInstallDirs)
 
-install(TARGETS ${PROJECT_NAME}
+install(
+    TARGETS ${PROJECT_NAME}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
+
 install(FILES include/xlsxwriter.h DESTINATION include)
-install(DIRECTORY include/xlsxwriter
+
+install(
+    DIRECTORY include/xlsxwriter
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING PATTERN "*.h"
+    FILES_MATCHING
+    PATTERN "*.h"
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/xlsxwriter.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/xlsxwriter.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

Changes.txt

@@ -1,10 +1,50 @@
 /**
 @page changes Changes
 
+
+## 1.2.1 February 26 2025
+
+- Added the `workbook_set_size()` function to set the size of the window when
+  the file is opened. This is generally only useful on macOS since Microsoft
+  Windows uses the window size from the last time an Excel file was
+  opened/saved. Feature request [#472][gh_472].
+
+  [gh_472]: https://github.com/jmcnamara/libxlsxwriter/issues/472
+
+- Improved the cmake build support for using the `minizip` library.
+  Pull request [#471][gh_471].
+
+  [gh_471]: https://github.com/jmcnamara/libxlsxwriter/issues/471
+
+- Fix buffer overflow in Table formula expansion.
+
+### Packagers:
+
+- This is serial version 1.2.1. This is not a semver version.
+
+- This is shared object library version `libxlsxwriter.so.8`. This should be
+  updated automatically via `make` and `cmake` as part of the build process.
+
+- This version tries to improve the overall `cmake` build process when using
+  minizip via the `-DUSE_SYSTEM_MINIZIP=ON` configuration option.
+
+- Please report any downstream patches back upstream to help improve the overall
+  build process.
+
+
+## 1.2.0 January 11 2025
+
+- Added `format_set_font_family()` and `format_set_font_charset()` format
+  functions to support Middle Eastern and Asian fonts.
+  Feature request [#468][gh_468].
+
+  [gh_468]: https://github.com/jmcnamara/libxlsxwriter/issues/468
+
+
 ## 1.1.9 October 24 2024
 
  - Fix minor pointer/value error in `lxw_name_to_row()` and `lxw_name_to_col()`
-   utility functions.
+   utility functions. Issue [#459][gh_459].
 
    [gh_459]: https://github.com/jmcnamara/libxlsxwriter/issues/459
 

License.txt

@@ -4,7 +4,7 @@
 
 Libxlsxwriter is released under a FreeBSD license:
 
-    Copyright 2014-2024, John McNamara <jmcnamara@cpan.org>
+    Copyright 2014-2025, John McNamara <jmcnamara@cpan.org>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without

Makefile

@@ -3,7 +3,7 @@
 # Makefile for libxlsxwriter library.
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 
 # Keep the output quiet by default.
@@ -21,6 +21,14 @@ PYTESTFILES ?= test
 VERSION   = $(shell sed -n -e 's/.*LXW_VERSION \"\(.*\)\"/\1/p'   include/xlsxwriter.h)
 SOVERSION = $(shell sed -n -e 's/.*LXW_SOVERSION \"\(.*\)\"/\1/p' include/xlsxwriter.h)
 
+ENABLED_OPTIONS = zlib
+ifdef USE_SYSTEM_MINIZIP
+    ENABLED_OPTIONS += minizip
+endif
+ifdef USE_OPENSSL_MD5
+	ENABLED_OPTIONS += libcrypto
+endif
+
 .PHONY: docs tags examples third_party
 
 # Build libxlsxwriter.
@@ -118,7 +126,10 @@ test_cpp : all
 test_cmake :
 ifneq ($(findstring m32,$(CFLAGS)),m32)
 	$(Q)$(MAKE) -C src clean
-	$(Q)cd cmake; cmake .. -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON; make clean; make; cp libxlsxwriter.a ../src/
+	$(Q)mkdir -p build
+	$(Q)cd build
+	$(Q)cmake .. -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
+	$(Q)make clean; make; cp libxlsxwriter.a ../src/
 	$(Q)cmake/xlsxwriter_unit
 	$(Q)$(MAKE) -C test/functional/src
 	$(Q)$(PYTEST) test/functional -v -k $(PYTESTFILES)
@@ -140,6 +151,7 @@ test_compile :
 # Indent the source files with the .indent.pro settings.
 indent:
 	$(Q)gindent src/*.c include/*.h include/xlsxwriter/*.h
+	$(Q)gersemi --no-warn-about-unknown-commands -i CMakeLists.txt
 
 tags:
 	$(Q)rm -f TAGS
@@ -164,7 +176,11 @@ install: all
 	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/lib
 	$(Q)cp -R lib/*     $(DESTDIR)$(PREFIX)/lib
 	$(Q)mkdir -p        $(DESTDIR)$(PREFIX)/lib/pkgconfig
-	$(Q)sed -e          's|@PREFIX@|$(PREFIX)|g'  -e 's|@VERSION@|$(VERSION)|g' dev/release/pkg-config.txt > $(DESTDIR)$(PREFIX)/lib/pkgconfig/xlsxwriter.pc
+	$(Q)sed             -e 's|@PREFIX@|$(PREFIX)|g'                   \
+	                    -e 's|@VERSION@|$(VERSION)|g'                 \
+	                    -e 's|@ENABLED_OPTIONS@|$(ENABLED_OPTIONS)|g' \
+	                        dev/release/pkg-config.txt                \
+	                        > $(DESTDIR)$(PREFIX)/lib/pkgconfig/xlsxwriter.pc
 
 # Simpler uninstall.
 uninstall:

build.zig

@@ -1,18 +1,13 @@
 const std = @import("std");
 
-// Although this function looks imperative, note that its job is to
-// declaratively construct a build graph that will be libcuted by an external
-// runner.
-pub fn build(b: *std.Build) void {
-    // Standard target options allows the person running `zig build` to choose
-    // what target to build for. Here we do not override the defaults, which
-    // means any target is allowed, and the default is native. Other options
-    // for restricting supported target set are available.
-    const target = b.standardTargetOptions(.{});
+const xlsxw_version: std.SemanticVersion = .{
+    .major = 1,
+    .minor = 1,
+    .patch = 9,
+};
 
-    // Standard optimization options allow the person running `zig build` to select
-    // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
-    // set a preferred release mode, allowing the user to decide how to optimize.
+pub fn build(b: *std.Build) void {
+    const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
     const shared = b.option(bool, "SHARED_LIBRARY", "Build the Shared Library [default: false]") orelse false;
@@ -27,11 +22,7 @@ pub fn build(b: *std.Build) void {
         .name = "xlsxwriter",
         .target = target,
         .optimize = optimize,
-        .version = .{
-            .major = 1,
-            .minor = 1,
-            .patch = 7,
-        },
+        .version = xlsxw_version,
     }) else b.addStaticLibrary(.{
         .name = "xlsxwriter",
         .target = target,
@@ -43,7 +34,7 @@ pub fn build(b: *std.Build) void {
         else => lib.root_module.strip = true,
     }
     if (tests)
-        lib.defineCMacro("TESTING", null);
+        lib.root_module.addCMacro("TESTING", "");
     lib.addCSourceFiles(.{
         .files = &.{
             "src/vml.c",
@@ -95,19 +86,28 @@ pub fn build(b: *std.Build) void {
 
     // md5
     if (!md5)
-        lib.addCSourceFile(.{ .file = .{ .path = "third_party/md5/md5.c" }, .flags = cflags })
+        lib.addCSourceFile(.{
+            .file = b.path("third_party/md5/md5.c"),
+            .flags = cflags,
+        })
     else
         lib.linkSystemLibrary("crypto");
 
     // dtoa
     if (dtoa)
-        lib.addCSourceFile(.{ .file = b.path("third_party/dtoa/emyg_dtoa.c"), .flags = cflags });
+        lib.addCSourceFile(.{
+            .file = b.path("third_party/dtoa/emyg_dtoa.c"),
+            .flags = cflags,
+        });
 
     // tmpfileplus
     if (stdtmpfile)
-        lib.addCSourceFile(.{ .file = .{ .path = "third_party/tmpfileplus/tmpfileplus.c" }, .flags = cflags })
+        lib.addCSourceFile(.{
+            .file = b.path("third_party/tmpfileplus/tmpfileplus.c"),
+            .flags = cflags,
+        })
     else
-        lib.defineCMacro("USE_STANDARD_TMPFILE", null);
+        lib.root_module.addCMacro("USE_STANDARD_TMPFILE", "");
 
     lib.addIncludePath(b.path("include"));
     lib.addIncludePath(b.path("third_party"));
@@ -253,10 +253,13 @@ fn buildExe(b: *std.Build, info: BuildInfo) void {
         .optimize = info.lib.root_module.optimize.?,
         .target = info.lib.root_module.resolved_target.?,
     });
-    exe.addCSourceFile(.{ .file = b.path(info.path), .flags = cflags });
+    exe.addCSourceFile(.{
+        .file = b.path(info.path),
+        .flags = cflags,
+    });
     exe.linkLibrary(info.lib);
     for (info.lib.root_module.include_dirs.items) |include| {
-        exe.root_module.include_dirs.append(b.allocator, include) catch {};
+        exe.root_module.include_dirs.append(b.allocator, include) catch @panic("OOM");
     }
     exe.linkLibC();
     b.installArtifact(exe);
@@ -280,9 +283,15 @@ fn buildTest(b: *std.Build, info: BuildInfo) void {
         .optimize = info.lib.root_module.optimize.?,
         .target = info.lib.root_module.resolved_target.?,
     });
-    exe.defineCMacro("TESTING", null);
-    exe.addCSourceFile(.{ .file = b.path(info.path), .flags = cflags });
-    exe.addCSourceFile(.{ .file = b.path("test/unit/test_all.c"), .flags = cflags });
+    exe.root_module.addCMacro("TESTING", "");
+    exe.addCSourceFile(.{
+        .file = b.path(info.path),
+        .flags = cflags,
+    });
+    exe.addCSourceFile(.{
+        .file = b.path("test/unit/test_all.c"),
+        .flags = cflags,
+    });
     exe.addIncludePath(b.path("test/unit"));
     for (info.lib.root_module.include_dirs.items) |include| {
         exe.root_module.include_dirs.append(b.allocator, include) catch {};

build.zig.zon

@@ -1,11 +1,12 @@
 .{
-    .name = "libxlsxwriter",
-    .version = "1.1.7",
+    .name = .libxlsxwriter,
+    .version = "1.1.9",
+    .fingerprint = 0xa28d9a85f22fad0e,
+    .minimum_zig_version = "0.14.0",
     .dependencies = .{
         .zlib = .{
-            .url = "git+https://github.com/madler/zlib#0f51fb4933fc9ce18199cb2554dacea8033e7fd3",
-            .hash = "12204f12291d6eeb1e05f19d8ab0c7f46c9073fae4c3568dcae7aade149db0b45047",
-            .lazy = true,
+            .url = "git+https://github.com/madler/zlib#v1.3.1",
+            .hash = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o",
         },
     },
     .paths = .{
@@ -13,6 +14,9 @@
         "build.zig.zon",
         "Readme.md",
         "License.txt",
+        "src",
+        "include",
+        "third_party",
     },
 }
 //syntax tip: zig - anon struct (json-like)

cmake/FindMINIZIP.cmake

@@ -1,121 +0,0 @@
-#  :copyright: (c) 2017 Alex Huszagh.
-#  :license: FreeBSD, see LICENSE.txt for more details.
-
-# FindMINIZIP
-# -----------
-#
-# Find MINIZIP include dirs and libraries
-#
-# Use this module by invoking find_package with the form::
-#
-#   find_package(MINIZIP
-#     [version] [EXACT]      # Minimum or EXACT version e.g. 1.0.6
-#     [REQUIRED]             # Fail with error if MINIZIP is not found
-#     )
-#
-# You may also set `MINIZIP_USE_STATIC_LIBS` to prefer static libraries
-# to shared ones.
-#
-# If found, `MINIZIP_FOUND` will be set to true, and `MINIZIP_LIBRARIES`
-# and `MINIZIP_INCLUDE_DIRS` will both be set.
-#
-# You may optionally set `MINIZIP_ROOT` to specify a custom root directory
-# for the MINIZIP installation.
-#
-
-include(CheckCXXSourceCompiles)
-include(FindPackage)
-
-# PATHS
-# -----
-
-set(MINIZIP_SEARCH_PATHS)
-
-if(MINIZIP_ROOT)
-    list(APPEND MINIZIP_SEARCH_PATHS ${MINIZIP_ROOT})
-endif()
-
-if(WIN32)
-    list(APPEND ZLIB_SEARCH_PATHS
-        "$ENV{PROGRAMFILES}/minizip"
-    )
-endif()
-
-unset(MINIZIP_SYSTEM_ROOT)
-unset(MINIZIP_CUSTOM_ROOT)
-unset(MINIZIP_SEARCH_HKEY)
-
-# FIND
-# ----
-
-# INCLUDE DIRECTORY
-SetSuffixes(MINIZIP)
-foreach(search ${MINIZIP_SEARCH_PATHS})
-    FIND_PATH(MINIZIP_INCLUDE_DIR
-        NAMES minizip/zip.h
-        PATHS ${search}
-        PATH_SUFFIXES include
-    )
-endforeach(search)
-
-if(NOT MINIZIP_INCLUDE_DIR)
-    FIND_PATH(MINIZIP_INCLUDE_DIR minizip/zip.h PATH_SUFFIXES include)
-endif()
-
-# LIBRARY PATHS
-set(MINIZIP_LIBRARY_NAMES minizip)
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-    list(APPEND MINIZIP_LIBRARY_NAMES minizipd)
-endif()
-
-foreach(search ${MINIZIP_SEARCH_PATHS})
-    FIND_LIBRARY(MINIZIP_LIBRARY
-        NAMES ${MINIZIP_LIBRARY_NAMES}
-        PATHS ${search}
-        PATH_SUFFIXES lib
-    )
-endforeach(search)
-
-if(NOT MINIZIP_LIBRARY)
-    FIND_LIBRARY(MINIZIP_LIBRARY NAMES ${MINIZIP_LIBRARY_NAMES} PATH_SUFFIXES lib)
-endif()
-
-set(MINIZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIR})
-set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARY})
-
-CheckFound(MINIZIP)
-FindStaticLibs(MINIZIP)
-
-# VERSION
-# -------
-
-if(MINIZIP_FOUND)
-    file(STRINGS "${MINIZIP_INCLUDE_DIRS}/zlib.h" MINIZIP_VERSION_CONTENTS REGEX "version [0-9]+\\.[0-9]+(\\.[0-9]+)?")
-    string(REGEX REPLACE ".*version ([0-9]+)\\.[0-9]+" "\\1" MINIZIP_VERSION_MAJOR "${MINIZIP_VERSION_CONTENTS}")
-    string(REGEX REPLACE ".*version [0-9]+\\.([0-9]+)" "\\1" MINIZIP_VERSION_MINOR "${MINIZIP_VERSION_CONTENTS}")
-    set(MINIZIP_VERSION_PATCH 0)
-
-    set(MINIZIP_VERSION_STRING "${MINIZIP_VERSION_MAJOR}.${MINIZIP_VERSION_MINOR}.${MINIZIP_VERSION_PATCH}")
-    set(MINIZIP_VERSION ${MINIZIP_VERSION_STRING})
-
-    MatchVersion(MINIZIP)
-endif()
-
-# COMPILATION
-# -----------
-
-set(MINIZIP_CODE "
-#include <minizip/zip.h>
-int main(void)
-{
-    zip_fileinfo zipfile_info;
-
-    return 0;
-}
-"
-)
-
-if(MINIZIP_FOUND)
-    CheckCompiles(MINIZIP)
-endif()
-RequiredPackageFound(MINIZIP)

cmake/FindPackage.cmake

@@ -1,183 +0,0 @@
-#  :copyright: (c) 2017 Alex Huszagh.
-#  :license: FreeBSD, see LICENSE.txt for more details.
-
-# FindPackage
-# -----------
-#
-# Macros and functions to help find packages. Do not invoke this module
-# directly, it merely provides library definitions to be invoked
-# by other find utilities.
-
-include(CheckCXXSourceCompiles)
-
-
-# Return if the package name has previously been found
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   ReturnFound(Iconv)
-#
-macro(ReturnFound packageName)
-    if(${packageName}_FOUND)
-        return()
-    endif()
-endmacro(ReturnFound)
-
-
-# Set the library extensions for a given package dependent on whether
-# to search for static or dynamic libraries.
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   SetSuffixes(IConv)
-#
-macro(SetSuffixes packageName)
-    if(${packageName}_USE_STATIC_LIBS)
-        if(MSVC)
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-        else()
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-        endif()
-    else()
-        if(WIN32)
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll" ".lib" ".a")
-        else()
-            set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
-        endif()
-    endif()
-endmacro(SetSuffixes)
-
-
-# Check if the package was found.
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   CheckFound(IConv)
-#
-macro(CheckFound packageName)
-    if(${packageName}_INCLUDE_DIRS AND ${packageName}_LIBRARIES)
-        set(${packageName}_FOUND TRUE)
-    endif()
-endmacro(CheckFound)
-
-
-# Replace a dynamic library with a `.dll.a` extension with the corresponding
-# library removing the `.dll`.
-#
-# Args:
-#   libraryName         Variable name for path to found library
-#
-# Example:
-#   ReplaceDynamic(/mingw64/lib/libiconv.dll.a)
-#
-macro(ReplaceDynamic libraryName)
-    if(${libraryName} MATCHES ".dll.a")
-        string(REPLACE ".dll.a" ".a" static ${${libraryName}})
-        if(EXISTS ${static})
-            set(${libraryName} ${static})
-        endif()
-    endif()
-endmacro(ReplaceDynamic)
-
-
-# Replace a dynamic libraries with the static variants, with integrity
-# checks for the package.
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   FindStaticLibs(IConv)
-#
-macro(FindStaticLibs packageName)
-    if(${packageName}_USE_STATIC_LIBS AND MSYS)
-        # convert `.dll.a` to `.a`
-        set(${packageName}_LIBRARY_SOURCE ${${packageName}_LIBRARIES})
-        set(${packageName}_LIBRARIES "")
-        foreach(library ${${packageName}_LIBRARY_SOURCE})
-            # replace each dynamic library with a single one
-            set(static_library ${library})
-            ReplaceDynamic(static_library)
-            list(APPEND ${packageName}_LIBRARIES ${static_library})
-        endforeach(library)
-    endif()
-endmacro(FindStaticLibs)
-
-
-# Checks if a suitable version for the found library was identified,
-# if provided. The library can either force exact or inexact matching.
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   MatchVersion(ICU)
-#
-macro(MatchVersion packageName)
-    if(${packageName}_FOUND AND ${packageName}_FIND_VERSION)
-        # MATCH VERSION
-        if(${packageName}_FIND_VERSION_EXACT)
-            # EXACT VERSION
-            if(${packageName}_FIND_VERSION VERSION_EQUAL ${packageName}_VERSION)
-            else()
-                set(${packageName}_FOUND FALSE)
-            endif()
-        else()
-            # GREATER THAN VERSION
-            if(${packageName}_VERSION VERSION_LESS ${packageName}_FIND_VERSION)
-                set(${packageName}_FOUND FALSE)
-            endif()
-        endif()
-    endif()
-endmacro(MatchVersion)
-
-
-# Check if a sample program compiles, if not, set the library to not found.
-#
-# Args:
-#   packageName         Name of the package
-#   code                String of simple program depending on the library
-#
-# Example:
-#   set(IConv_CODE "int main(int argc, char **argv){ return 0; }")
-#   CheckCompiles(IConv)
-#
-macro(CheckCompiles packageName)
-    # FLAGS
-    set(CMAKE_REQUIRED_INCLUDES ${${packageName}_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LIBRARIES ${${packageName}_LIBRARIES})
-
-    # COMPILATION
-    check_cxx_source_compiles("${${packageName}_CODE}" ${packageName}_COMPILES)
-    if(NOT ${${packageName}_COMPILES})
-        set(${packageName}_FOUND FALSE)
-        message(SEND_ERROR "Cannot compile a simple ${packageName} program.")
-    endif()
-
-endmacro(CheckCompiles)
-
-
-# Send an error if a required package was not found. Otherwise, if the
-# package is found, report to the user it was identified.
-#
-# Args:
-#   packageName         Name of the package
-#
-# Example:
-#   RequiredPackageFound(ICU)
-#
-macro(RequiredPackageFound packageName)
-    if(${packageName}_FOUND)
-        message("Found ${packageName}.")
-    else()
-        if(${packageName}_FIND_REQUIRED)
-            message(SEND_ERROR "Unable to find requested ${packageName} libraries.")
-        endif()
-    endif()
-endmacro(RequiredPackageFound)

cmake/i686-toolchain.cmake

@@ -1,7 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR "i686")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags")
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags")
-set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -m32" CACHE STRING "asm flags")

dev/release/fix_example_docs.pl

@@ -5,7 +5,7 @@
 # instead of a sorted order. Also add a caption.
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 use warnings;
 use strict;

dev/release/fix_example_links.pl

@@ -5,7 +5,7 @@
 # with links to the next/previous examples.
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 use strict;
 use warnings;

dev/release/gen_error_strings.pl

@@ -7,7 +7,7 @@
 #    perl dev/release/gen_error_strings.pl include/xlsxwriter/common.h
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 use warnings;
 use strict;

dev/release/gen_umbrella_file.pl

@@ -5,7 +5,7 @@
 # Run from the libxlsxwriter root dir.
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 use warnings;
 use strict;

dev/release/gen_windows_def_file.pl

@@ -7,7 +7,7 @@
 #    perl dev/release/gen_windows_def_file.pl lib/libxlsxwriter.a
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 use warnings;
 use strict;

dev/release/pkg-config.txt

@@ -7,4 +7,5 @@ Name: libxlsxwriter
 Description: A C library for creating Excel XLSX files
 Version: @VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lxlsxwriter -lz
+Libs: -L${libdir} -lxlsxwriter
+Requires.private: @ENABLED_OPTIONS@

docs/Makefile

@@ -3,7 +3,7 @@
 # Makefile for libxlsxwriter library.
 #
 # SPDX-License-Identifier: BSD-2-Clause
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
 #
 
 # Keep the output quiet by default.

docs/footer.html

@@ -4,13 +4,13 @@
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
     $navpath
-    <li class="footer">Copyright 2014-2024 John McNamara. $generatedby <a href="http://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion </li>
+    <li class="footer">Copyright 2014-2025 John McNamara. $generatedby <a href="http://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion </li>
   </ul>
 </div>
 <!--END GENERATE_TREEVIEW-->
 <!--BEGIN !GENERATE_TREEVIEW-->
 <hr class="footer"/><address class="footer"><small>
-Copyright 2014-2024 John McNamara.
+Copyright 2014-2025 John McNamara.
 $generatedby&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion
 </small></address>
 <!--END !GENERATE_TREEVIEW-->

docs/src/getting_started.dox

@@ -81,7 +81,8 @@ To see a verbose summary of the compilation steps use `V=1`:
 
 With CMake you can build the library as follows:
 
-    cd cmake # Or another sub-directory.
+    mkdir build # Or another sub-directory.
+    cd build
     cmake ..
     cmake --build .
 
@@ -95,7 +96,8 @@ directory and try one of them out:
     make examples
 
     # or CMake:
-    cd cmake
+    mkdir build
+    cd build
     cmake .. -DBUILD_EXAMPLES=ON
     cmake --build .
 
@@ -129,7 +131,8 @@ installation location but actually install to `./staging/usr/third_party`.
 
 With CMake you can install the library as follows:
 
-    cd cmake
+    mkdir build
+    cd build
     cmake ..
     cmake --build . --target install
 
@@ -559,7 +562,8 @@ The compilation options would be used as follows:
     make examples USE_DTOA_LIBRARY=1
 
     # CMake
-    cd cmake
+    mkdir build
+    cd build
     cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON -DUSE_DTOA_LIBRARY=ON
     cmake --build . --config Release
 
@@ -732,7 +736,8 @@ You can compile a universal binary with standard make as follows:
 
 Or with CMake:
 
-    cd cmake
+    mkdir build
+    cd build
     cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
     make
 
@@ -762,7 +767,8 @@ be compiled without them by relying on external libraries as follows:
     make USE_OPENSSL_MD5=1 USE_SYSTEM_MINIZIP=1 USE_STANDARD_TMPFILE=1
 
     # CMake:
-    cd cmake
+    mkdir build
+    cd build
     cmake .. -DUSE_OPENSSL_MD5=ON -DUSE_SYSTEM_MINIZIP=ON -DUSE_STANDARD_TMPFILE=ON
     cmake --build .
 

docs/src/running_the_tests.dox

@@ -80,7 +80,8 @@ Both functional and unit test can be run together:
 
 You can run the unit and functional tests via CMake as follows:
 
-    cd cmake
+    mkdir build
+    cd build
     cmake .. -DBUILD_TESTS=ON
     cmake --build .
     ctest -V

examples/Makefile

@@ -2,7 +2,7 @@
 #
 # Makefile for libxlsxwriter examples.
 #
-# Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+# Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
 #
 
 # Keep the output quiet by default.

examples/anatomy.c

@@ -1,7 +1,7 @@
 /*
  * Anatomy of a simple libxlsxwriter program.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/array_formula.c

@@ -2,7 +2,7 @@
  * Example of how to use the libxlsxwriter library to write simple
  * array formulas.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/autofilter.c

@@ -2,7 +2,7 @@
  * Example of adding an autofilter to a worksheet in Excel using
  * libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/background.c

@@ -1,7 +1,7 @@
 /*
  * An example of setting a worksheet background image with libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart.c

@@ -1,7 +1,7 @@
 /*
  * An example of a simple Excel chart using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_area.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating Excel area charts using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_bar.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating Excel bar charts using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_clustered.c

@@ -1,7 +1,7 @@
 /*
  * An example of a clustered category chart using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_column.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating Excel column charts using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_data_labels.c

@@ -2,7 +2,7 @@
  * A demo of an various Excel chart data label features that are available via
  * a libxlsxwriter chart.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_data_table.c

@@ -2,7 +2,7 @@
  * An example of creating Excel column charts with data tables using the
  * libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_data_tools.c

@@ -4,7 +4,7 @@
  *
  * These include Drop Lines and High-Low Lines.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_doughnut.c

@@ -7,7 +7,7 @@
  * each segment is represented as a point so it is necessary to assign
  * formatting to each point in the series.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_fonts.c

@@ -2,7 +2,7 @@
  * An example of a simple Excel chart with user defined fonts using the
  * libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_line.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating an Excel line chart using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_pattern.c

@@ -2,7 +2,7 @@
  * An example of a simple Excel chart with patterns using the libxlsxwriter
  * library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_pie.c

@@ -7,7 +7,7 @@
  * each segment is represented as a point so it is necessary to assign
  * formatting to each point in the series.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_pie_colors.c

@@ -7,7 +7,7 @@
  * particular this is required for Pie/Doughnut charts where each segment is
  * represented by a point.
 
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_radar.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating Excel radar charts using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_scatter.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating Excel scatter charts using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_styles.c

@@ -3,7 +3,7 @@
  * using the libxlsxwriter library. Note, these styles are not the same as the
  * styles available in Excel 2013.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chart_working_with_example.c

@@ -2,7 +2,7 @@
  * An example of a simple Excel chart using the libxlsxwriter library. This
  * example is used in the "Working with Charts" section of the docs.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/chartsheet.c

@@ -1,7 +1,7 @@
 /*
  * An example of creating an Excel chartsheet using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/comments1.c

@@ -1,7 +1,7 @@
 /*
  * An example of writing cell comments to a worksheet using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/comments2.c

@@ -3,7 +3,7 @@
  *
  * Each of the worksheets demonstrates different features of cell comments.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/conditional_format1.c

@@ -4,7 +4,7 @@
  *
  * See conditional_format.c for a more comprehensive example.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/conditional_format2.c

@@ -4,7 +4,7 @@
  * Conditional formatting allows you to apply a format to a cell or a
  * range of cells based on certain criteria.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/constant_memory.c

@@ -2,7 +2,7 @@
  * Example of using libxlsxwriter for writing large files in constant memory
  * mode.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/data_validate.c

@@ -6,7 +6,7 @@
  * that a user enters in a cell and to display help and warning messages. It
  * also allows you to restrict input to values in a dropdown list.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  */
 
 

examples/dates_and_times01.c

@@ -6,7 +6,7 @@
  * An easier approach using a lxw_datetime struct is shown in example
  * dates_and_times02.c.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/dates_and_times02.c

@@ -2,7 +2,7 @@
  * Example of writing dates and times in Excel using an lxw_datetime struct
  * and date formatting.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/dates_and_times03.c

@@ -2,7 +2,7 @@
  * Example of writing dates and times in Excel using a Unix datetime and date
  * formatting.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/dates_and_times04.c

@@ -1,7 +1,7 @@
 /*
  * Example of writing dates and times in Excel using different date formats.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/defined_name.c

@@ -3,7 +3,7 @@
  * used to define a user friendly name to represent a value, a single cell or
  * a range of cells in a workbook.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/demo.c

@@ -1,7 +1,7 @@
 /*
  * A simple example of some of the features of the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/diagonal_border.c

@@ -2,7 +2,7 @@
  * A simple formatting example that demonstrates how to add diagonal
  * cell borders using the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/doc_custom_properties.c

@@ -2,7 +2,7 @@
  * Example of setting custom document properties for an Excel spreadsheet
  * using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/doc_properties.c

@@ -2,7 +2,7 @@
  * Example of setting document properties such as Author, Title, etc., for an
  * Excel spreadsheet using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/dynamic_arrays.c

@@ -3,7 +3,7 @@
  * dynamic arrays. These functions are new to Excel 365. The examples mirror
  * the examples in the Excel documentation on these functions.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/embed_image_buffer.c

@@ -2,7 +2,7 @@
  * An example of embedding an image from a memory buffer into a worksheet
  * using the libxlsxwriter library.
  *
- * Copyright 2014-2024 John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025 John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/embed_images.c

@@ -2,7 +2,7 @@
  * An example of embedding images into a worksheet using the libxlsxwriter
  * library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/format_font.c

@@ -2,7 +2,7 @@
  * Example of writing some data with font formatting to a simple Excel
  * file using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/format_num_format.c

@@ -2,7 +2,7 @@
  * Example of writing some data with numeric formatting to a simple Excel file
  * using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/headers_footers.c

@@ -30,7 +30,7 @@
  *
  *     &&                  Miscellaneous       Literal ampersand &
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/hello.c

@@ -1,7 +1,7 @@
 /*
  * Example of writing some data to a simple Excel file using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/hide_row_col.c

@@ -7,7 +7,7 @@
  * Libxlsxwriter we replicate that using the worksheet_set_default_row()
  * function.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/hide_sheet.c

@@ -1,7 +1,7 @@
 /*
  * Example of how to hide a worksheet using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/hyperlinks.c

@@ -1,7 +1,7 @@
 /*
  * Example of writing urls/hyperlinks with the libxlsxwriter library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/ignore_errors.c

@@ -2,7 +2,7 @@
  * An example of turning off worksheet cells errors/warnings using
  * libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/image_buffer.c

@@ -2,7 +2,7 @@
  * An example of inserting an image from a memory buffer into a worksheet
  * using the libxlsxwriter library.
  *
- * Copyright 2014-2024 John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025 John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/images.c

@@ -2,7 +2,7 @@
  * An example of inserting images into a worksheet using the libxlsxwriter
  * library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/lambda.c

@@ -2,7 +2,7 @@
  * An example of using the new Excel LAMBDA() function with the libxlsxwriter
  * library.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/macro.c

@@ -10,7 +10,7 @@
  * supported by libxlsxwriter) but that isn't a requirement for adding a macro
  * file to the workbook.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  */
 
 #include "xlsxwriter.h"

examples/merge_range.c

@@ -1,7 +1,7 @@
 /*
  * An example of merging cells using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/merge_rich_string.c

@@ -1,7 +1,7 @@
 /*
  * An example of merging cells containing a rich string using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/outline.c

@@ -8,7 +8,7 @@
  * Outlines can reduce complex data down to a few salient sub-totals or
  * summaries.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/outline_collapsed.c

@@ -4,7 +4,7 @@
  * These examples focus mainly on collapsed outlines. See also the outlines.c
  * example program for more general examples.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/output_buffer.c

@@ -1,7 +1,7 @@
 /*
  * Example of using libxlsxwriter to write a workbook file to a memory buffer.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/panes.c

@@ -2,7 +2,7 @@
  * A simple example using the libxlsxwriter library to create worksheets with
  * panes.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/rich_strings.c

@@ -2,7 +2,7 @@
  * An example of using the libxlsxwriter library to write some "rich strings",
  * i.e., strings with multiple formats.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/tab_colors.c

@@ -1,7 +1,7 @@
 /*
  * Example of how to set Excel worksheet tab colors using libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/tables.c

@@ -4,7 +4,7 @@
  * Conditional formatting allows you to apply a format to a cell or a
  * range of cells based on certain criteria.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/tutorial1.c

@@ -5,7 +5,7 @@
  * This program is shown, with explanations, in Tutorial 1 of the
  * libxlsxwriter documentation.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/tutorial2.c

@@ -5,7 +5,7 @@
  * This program is shown, with explanations, in Tutorial 2 of the
  * libxlsxwriter documentation.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/tutorial3.c

@@ -5,7 +5,7 @@
  * This program is shown, with explanations, in Tutorial 3 of the
  * libxlsxwriter documentation.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/utf8.c

@@ -3,7 +3,7 @@
  *
  * Note: The source file must be UTF-8 encoded.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/watermark.c

@@ -4,7 +4,7 @@
  * suggested in the Microsoft documentation:
  * https://support.microsoft.com/en-us/office/add-a-watermark-in-excel-a372182a-d733-484e-825c-18ddf3edf009
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

examples/worksheet_protection.c

@@ -2,7 +2,7 @@
  * Example of cell locking and formula hiding in an Excel worksheet using
  * libxlsxwriter.
  *
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org
  *
  */
 

include/xlsxwriter.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  */
 
 /**
@@ -19,8 +19,8 @@
 #include "xlsxwriter/format.h"
 #include "xlsxwriter/utility.h"
 
-#define LXW_VERSION "1.1.9"
-#define LXW_VERSION_ID 119
-#define LXW_SOVERSION "7"
+#define LXW_VERSION "1.2.1"
+#define LXW_VERSION_ID 121
+#define LXW_SOVERSION "8"
 
 #endif /* __LXW_XLSXWRITER_H__ */

include/xlsxwriter/app.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  *
  * app - A libxlsxwriter library for creating Excel XLSX app files.
  *

include/xlsxwriter/chart.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  *
  * chart - A libxlsxwriter library for creating Excel XLSX chart files.
  *
@@ -737,6 +737,29 @@ typedef struct lxw_chart_font {
 
 } lxw_chart_font;
 
+/**
+ * @brief Struct to represent Excel chart element layout dimensions.
+ *
+ * todo:
+ */
+typedef struct lxw_chart_layout {
+
+    /** TODO:*/
+    double x;
+
+    /** TODO:*/
+    double y;
+
+    /** TODO:*/
+    double width;
+
+    /** TODO:*/
+    double height;
+
+    uint8_t has_inner;
+
+} lxw_chart_layout;
+
 typedef struct lxw_chart_marker {
 
     uint8_t type;
@@ -751,6 +774,7 @@ typedef struct lxw_chart_legend {
 
     lxw_chart_font *font;
     uint8_t position;
+    lxw_chart_layout *layout;
 
 } lxw_chart_legend;
 
@@ -769,6 +793,7 @@ typedef struct lxw_chart_title {
     lxw_series_range *range;
 
     struct lxw_series_data_point data_point;
+    lxw_chart_layout *layout;
 
 } lxw_chart_title;
 
@@ -1149,8 +1174,10 @@ typedef struct lxw_chart {
     lxw_chart_line *chartarea_line;
     lxw_chart_fill *chartarea_fill;
     lxw_chart_pattern *chartarea_pattern;
+
     lxw_chart_line *plotarea_line;
     lxw_chart_fill *plotarea_fill;
+    lxw_chart_layout *plotarea_layout;
     lxw_chart_pattern *plotarea_pattern;
 
     uint8_t has_drop_lines;
@@ -3279,6 +3306,14 @@ void chart_title_set_name_font(lxw_chart *chart, lxw_chart_font *font);
  */
 void chart_title_off(lxw_chart *chart);
 
+/**
+ * @brief TODO: Add description.
+ *
+ * @param chart  Pointer to a lxw_chart instance to be configured.
+ * @param layout A pointer to a chart #lxw_chart_layout struct.
+ */
+void chart_title_set_layout(lxw_chart *self, lxw_chart_layout * layout);
+
 /**
  * @brief Set the position of the chart legend.
  *
@@ -3317,6 +3352,16 @@ void chart_title_off(lxw_chart *chart);
  */
 void chart_legend_set_position(lxw_chart *chart, uint8_t position);
 
+/**
+ * @brief Set the layout of the chart legend.
+ *
+ * @param chart  Pointer to a lxw_chart instance to be configured.
+ * @param layout A pointer to a chart #lxw_chart_layout struct.
+ *
+ * TODO: Add example and image.
+ */
+void chart_legend_set_layout(lxw_chart *chart, lxw_chart_layout * layout);
+
 /**
  * @brief Set the font properties for a chart legend.
  *
@@ -3484,6 +3529,14 @@ void chart_plotarea_set_fill(lxw_chart *chart, lxw_chart_fill *fill);
  */
 void chart_plotarea_set_pattern(lxw_chart *chart, lxw_chart_pattern *pattern);
 
+/**
+ * @brief Set the layout of a plotarea. TODO:
+ *
+ * @param chart
+ * @param layout
+ */
+void chart_plotarea_set_layout(lxw_chart *chart, lxw_chart_layout * layout);
+
 /**
  * @brief Set the chart style type.
  *

include/xlsxwriter/chartsheet.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  *
  * chartsheet - A libxlsxwriter library for creating Excel XLSX chartsheet files.
  *

include/xlsxwriter/comment.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  *
  * comment - A libxlsxwriter library for creating Excel XLSX comment files.
  *

include/xlsxwriter/common.h

@@ -2,7 +2,7 @@
  * libxlsxwriter
  *
  * SPDX-License-Identifier: BSD-2-Clause
- * Copyright 2014-2024, John McNamara, jmcnamara@cpan.org.
+ * Copyright 2014-2025, John McNamara, jmcnamara@cpan.org.
  */
 
 /**
@@ -10,7 +10,7 @@
  *
  * @brief Common functions and defines for the libxlsxwriter library.
  *
- * <!-- Copyright 2014-2024, John McNamara, jmcnamara@cpan.org -->
+ * <!-- Copyright 2014-2025, John McNamara, jmcnamara@cpan.org -->
  *
  */
 #ifndef __LXW_COMMON_H__