diff --git a/CMakeLists.txt b/CMakeLists.txt index ab167e89..7551a865 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ project(zint-package) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) -set(ZINT_VERSION_MINOR 12) +set(ZINT_VERSION_MINOR 13) set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release set(ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}.${ZINT_VERSION_BUILD}") add_definitions(-DZINT_VERSION=\"${ZINT_VERSION}\") diff --git a/ChangeLog b/ChangeLog index 6a7982a3..c2112f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2.12.0.9 (dev) not released yet -======================================= +Version 2.13.0 (2023-12-18) +=========================== **Incompatible changes** ------------------------ diff --git a/README.linux b/README.linux index 3576039f..7920e95a 100644 --- a/README.linux +++ b/README.linux @@ -21,10 +21,10 @@ or Fedora Then either download the source code tarball - wget -O zint-2.12.0-src.tar.gz \ - https://sourceforge.net/projects/zint/files/zint/2.12.0/zint-2.12.0-src.tar.gz/download - tar xf zint-2.12.0-src.tar.gz - cd zint-2.12.0-src + wget -O zint-2.13.0-src.tar.gz \ + https://sourceforge.net/projects/zint/files/zint/2.13.0/zint-2.13.0-src.tar.gz/download + tar xf zint-2.13.0-src.tar.gz + cd zint-2.13.0-src or clone the latest source diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index f70fba0f..4f7da3bc 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.12.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.13.0\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 0ff6135d..b0dd6e36 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,12,0,9 -#define VER_FILEVERSION_STR "2.12.0.9\0" +#define VER_FILEVERSION 2,13,0,0 +#define VER_FILEVERSION_STR "2.13.0.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 5fc8bc8c..dfa1d2b5 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -35,9 +35,9 @@ #define ZINTCONFIG_H #define ZINT_VERSION_MAJOR 2 -#define ZINT_VERSION_MINOR 12 +#define ZINT_VERSION_MINOR 13 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 9 +#define ZINT_VERSION_BUILD 0 /* vim: set ts=4 sw=4 et : */ #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index fadde269..2f4e4f67 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -17,7 +17,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.12.0.9\\\"" +DEFINES += ZINT_VERSION="\\\"2.13.0\\\"" !contains(DEFINES, ZINT_NO_PNG) { INCLUDEPATH += ../../lpng @@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.12.0.9 +VERSION = 2.13.0 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index f6e458a4..c8383507 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.12.0.9 +VERSION = 2.13.0 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/configure b/backend_tcl/configure index 2d74712b..4d3251ea 100755 --- a/backend_tcl/configure +++ b/backend_tcl/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for zint 2.12.0. +# Generated by GNU Autoconf 2.71 for zint 2.13.0. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zint' PACKAGE_TARNAME='zint' -PACKAGE_VERSION='2.12.0' -PACKAGE_STRING='zint 2.12.0' +PACKAGE_VERSION='2.13.0' +PACKAGE_STRING='zint 2.13.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zint 2.12.0 to adapt to many kinds of systems. +\`configure' configures zint 2.13.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zint 2.12.0:";; + short | recursive ) echo "Configuration of zint 2.13.0:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zint configure 2.12.0 +zint configure 2.13.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1794,7 +1794,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zint $as_me 2.12.0, which was +It was created by zint $as_me 2.13.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9499,7 +9499,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zint $as_me 2.12.0, which was +This file was extended by zint $as_me 2.13.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9554,7 +9554,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -zint config.status 2.12.0 +zint config.status 2.13.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/backend_tcl/configure.ac b/backend_tcl/configure.ac index b4a61030..e66a46d0 100644 --- a/backend_tcl/configure.ac +++ b/backend_tcl/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([zint],[2.12.0]) +AC_INIT([zint],[2.13.0]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index d8c475e9..693d57f8 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.12.0\ +package ifneeded zint 2.13.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index 810b10d8..0db3d4fb 100644 --- a/backend_tcl/zint_tcl.dsp +++ b/backend_tcl/zint_tcl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.12.0.9\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.13.0\"" /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.12.0.9\"" /c +# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.13.0\"" /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" diff --git a/docs/README b/docs/README index fe0f3ce6..c57fece3 100644 --- a/docs/README +++ b/docs/README @@ -2,8 +2,8 @@ For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" usin On Ubuntu/Debian (tested on Ubuntu 22.04) - wget https://github.com/jgm/pandoc/releases/download/3.1.10/pandoc-3.1.10-1-amd64.deb - sudo dpkg -i pandoc-3.1.10-1-amd64.deb + wget https://github.com/jgm/pandoc/releases/download/3.1.11/pandoc-3.1.11-1-amd64.deb + sudo dpkg -i pandoc-3.1.11-1-amd64.deb sudo apt install python3-pip pip install pandoc-tablenos --user export PATH=~/.local/bin:"$PATH" @@ -18,9 +18,9 @@ On Ubuntu/Debian (tested on Ubuntu 22.04) On Fedora (tested on Fedora Linux 38 (Workstation Edition)) - wget https://github.com/jgm/pandoc/releases/download/3.1.10/pandoc-3.1.10-linux-amd64.tar.gz - tar xf pandoc-3.1.10-linux-amd64.tar.gz - sudo mv -i pandoc-3.1.10/bin/pandoc /usr/local/bin + wget https://github.com/jgm/pandoc/releases/download/3.1.11/pandoc-3.1.11-linux-amd64.tar.gz + tar xf pandoc-3.1.11-linux-amd64.tar.gz + sudo mv -i pandoc-3.1.11/bin/pandoc /usr/local/bin sudo dnf install python3-pip pip install pandoc-tablenos --user export PATH=~/.local/bin:"$PATH" diff --git a/docs/images/gui_appearance.png b/docs/images/gui_appearance.png index 5f609b06..4db9c64d 100644 Binary files a/docs/images/gui_appearance.png and b/docs/images/gui_appearance.png differ diff --git a/docs/images/gui_aztec.png b/docs/images/gui_aztec.png index 09e6cb77..784abb53 100644 Binary files a/docs/images/gui_aztec.png and b/docs/images/gui_aztec.png differ diff --git a/docs/images/gui_c25inter.png b/docs/images/gui_c25inter.png index 4ba076f2..1388ddf6 100644 Binary files a/docs/images/gui_c25inter.png and b/docs/images/gui_c25inter.png differ diff --git a/docs/images/gui_composite.png b/docs/images/gui_composite.png index e61871ef..0cd0d082 100644 Binary files a/docs/images/gui_composite.png and b/docs/images/gui_composite.png differ diff --git a/docs/images/gui_main.png b/docs/images/gui_main.png index 01687f54..f0d3de53 100644 Binary files a/docs/images/gui_main.png and b/docs/images/gui_main.png differ diff --git a/docs/images/gui_segs.png b/docs/images/gui_segs.png index 7633dc7d..b2c9f617 100644 Binary files a/docs/images/gui_segs.png and b/docs/images/gui_segs.png differ diff --git a/docs/manual.html b/docs/manual.html index 4bf57285..1cf1ca73 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -4,7 +4,7 @@ - + Zint Barcode Generator and Zint Barcode Studio User Manual