Merge branch 'master' of ssh://git.code.sf.net/p/zint/code

backend_tcl/configure.in

@@ -14,7 +14,7 @@
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([zint], [2.6.0])
+AC_INIT([zint], [2.6.1])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

backend_tcl/lib/zint/pkgIndex.tcl

@@ -1,2 +1,2 @@
-package ifneeded zint 2.6.0\
+package ifneeded zint 2.6.1\
     [list load [file join $dir zint[info sharedlibextension]]]

backend_tcl/zint.c

@@ -42,6 +42,11 @@
 -	No changes here, take 2.5.1 framework files
  2017-05-12 2.6.0 HaO
 -	No changes here, take 2.6 framework files
+ 2017-08-29 2.6.1 HaO
+-	Framework 2.6.1 extensions
+-	EAN/UPC Codes with included check digit 
+-	UPNQR Code
+-	Misspelled symbology: AztecRunes
 */
 
 #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@@ -81,7 +86,7 @@
 /*----------------------------------------------------------------------------*/
 /* > File option defines */
 
-#define VERSION "2.6.0"
+#define VERSION "2.6.1"
 
 /*----------------------------------------------------------------------------*/
 /* >>>>> Hepler defines */
@@ -111,7 +116,8 @@ static char *s_code_list[] = {
     "Ind2of5",
     "Code39",
     "Code39Extended",
-    "EAN",
+    "EAN",
+	"EAN+Check",
     "GS1-128",
     "Codabar",
     "Code128",
@@ -125,8 +131,10 @@ static char *s_code_list[] = {
     "GS1DataBarLimited",
     "GS1DataBarExpanded",
     "Telepen",
-    "UPC-A",
+    "UPC-A",
+	"UPC-A+Check",
     "UPC-E",
+    "UPC-E+Check",
     "Postnet",
     "MSIPlessey",
     "FIM",
@@ -171,8 +179,10 @@ static char *s_code_list[] = {
     "HIBC-PDF",
     "HIBC-MicroPDF",
     "HIBC-CodablockF",
-    "HIBCAztec",
+    "HIBCAztec",
-    "Azure",
+	"DotCode",
+	"HanXin",
+    "AztecRunes",
     "Code32",
     "EAN-CC",
     "EAN128-CC",
@@ -187,8 +197,7 @@ static char *s_code_list[] = {
     "Channel",
     "CodeOne",
     "GridMatrix",
-    "DotCode",
+    "UPNQR",
-    "HanXin",
     NULL};
 
 static int s_code_number[] = {
@@ -200,7 +209,8 @@ static int s_code_number[] = {
     BARCODE_C25IND,
     BARCODE_CODE39,
     BARCODE_EXCODE39,
-    BARCODE_EANX,
+    BARCODE_EANX,
+	BARCODE_EANX_CHK,
     BARCODE_EAN128,
     BARCODE_CODABAR,
     BARCODE_CODE128,
@@ -214,8 +224,10 @@ static int s_code_number[] = {
     BARCODE_RSS_LTD,
     BARCODE_RSS_EXP,
     BARCODE_TELEPEN,
-    BARCODE_UPCA,
+    BARCODE_UPCA,
+	BARCODE_UPCA_CHK,
     BARCODE_UPCE,
+    BARCODE_UPCE_CHK,
     BARCODE_POSTNET,
     BARCODE_MSI_PLESSEY,
     BARCODE_FIM,
@@ -260,7 +272,9 @@ static int s_code_number[] = {
     BARCODE_HIBC_PDF,
     BARCODE_HIBC_MICPDF,
     BARCODE_HIBC_BLOCKF,
-    BARCODE_HIBC_AZTEC,
+    BARCODE_HIBC_AZTEC,
+	BARCODE_DOTCODE,
+	BARCODE_HANXIN,
     BARCODE_AZRUNE,
     BARCODE_CODE32,
     BARCODE_EANX_CC,
@@ -276,8 +290,7 @@ static int s_code_number[] = {
     BARCODE_CHANNEL,
     BARCODE_CODEONE,
     BARCODE_GRIDMATRIX,
-    BARCODE_DOTCODE,
+    BARCODE_UPNQR,
-    BARCODE_HANXIN,
     0};
 
 

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 /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /YX /FD /D ZINT_VERSION="\"2.5.0\"" /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.6.1\"" /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -69,7 +69,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 /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.5.0\"" /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.6.1\"" /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x407 /d "_DEBUG"

docs/manual.txt

@@ -933,7 +933,7 @@ Value   |
 34      | BARCODE_UPCA            | UPC A
 35      | BARCODE_UPCA_CHK        | UPC A + Check Digit
 37      | BARCODE_UPCE            | UPC E
-38      | BARCODE_UPCE            | UPC E + Check Digit
+38      | BARCODE_UPCE_CHK        | UPC E + Check Digit
 40      | BARCODE_POSTNET         | PostNet
 47      | BARCODE_MSI_PLESSEY     | MSI Plessey
 49      | BARCODE_FIM             | FIM
@@ -973,10 +973,11 @@ Value   |
 97      | BARCODE_MICROQR         | Micro QR Code
 98      | BARCODE_HIBC_128        | HIBC Code 128
 99      | BARCODE_HIBC_39         | HIBC Code 39
-102     | BARCODE_HIBC_39         | HIBC Data Matrix ECC200
+102     | BARCODE_HIBC_DM         | HIBC Data Matrix ECC200
-104     | BARCODE_HIBC_DM         | HIBC QR Code
+104     | BARCODE_HIBC_QR         | HIBC QR Code
 106     | BARCODE_HIBC_PDF        | HIBC PDF417
 108     | BARCODE_HIBC_MICPDF     | HIBC MicroPDF417
+110     | BARCODE_HIBC_BLOCKF     | HIBC Codablock F
 112     | BARCODE_HIBC_AZTEC      | HIBC Aztec Code
 115     | BARCODE_DOTCODE         | DotCode
 116     | BARCODE_HANXIN          | Han Xin (Chinese Sensible) Code