diff --git a/ChangeLog b/ChangeLog
index cc3768b3..2ab27ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Version 2.13.0.9 (dev) not released yet
 ------------------------
 - New `memfile` & `memfile_size` fields in `symbol` for use with new output
   option `BARCODE_MEMORY_FILE`
+- Invalid `input_mode` now returns warning
 
 Changes
 -------
@@ -14,6 +15,12 @@ Changes
   in-memory buffer `symbol->memfile` instead of to file `symbol->outfile`,
   ticket #301
 - CODE128: improve encodation on A/B shifting, props Daniel Gredler (Okapi)
+- library: return warning on invalid `input_mode` reset
+- GS1: new AIs 7250-7259 (GSCN 22-246), new linters `yyyymmdd()`, `iso5218()`,
+  `posinseqslash()`; remove old linter `iso3166list`;
+  iso4217: new ISO 4217 currency code 924
+- AZTEC: workaround MSVC 2022 optimizer bug in `az_populate_map()` loops,
+  ticket #317, props Andre Maute
 
 Bugs
 ----
@@ -26,6 +33,9 @@ Bugs
   written as little-endian - simplifies testing)
 - ITF14/DPLEIT/DPIDENT: ignore `option_2` (check digit options)
 - GUI: scalewindow: fix cropping of initial resolution and bound X-dim <= 10
+- GUI: factory reset: reset preview background colour also
+- QZint: fix legacy width and security level getters/setters, MR #158, props
+  Philip Ye
 
 
 Version 2.13.0 (2023-12-18)
diff --git a/backend/2of5.c b/backend/2of5.c
index 7879dd94..3f1429ed 100644
--- a/backend/2of5.c
+++ b/backend/2of5.c
@@ -49,9 +49,9 @@ static const char C25IndustTable[10][10] = {
 };
 
 /* Note `c25_common()` assumes Stop string length one less than Start */
-static const char *C25MatrixStartStop[2] = { "411111", "41111" };
-static const char *C25IndustStartStop[2] = { "313111", "31113" };
-static const char *C25IataLogicStartStop[2] = { "1111", "311" };
+static const char C25MatrixStartStop[2][6] =    { {'4', '1', '1', '1', '1', '1'}, {'4', '1', '1', '1', '1'} };
+static const char C25IndustStartStop[2][6] =    { {'3', '1', '3', '1', '1', '1'}, {'3', '1', '1', '1', '3'} };
+static const char C25IataLogicStartStop[2][6] = { {'1', '1', '1', '1'},           {'3', '1', '1'} };
 
 static const char C25InterTable[10][5] = {
     {'1','1','3','3','1'}, {'3','1','1','1','3'}, {'1','3','1','1','3'}, {'3','3','1','1','1'}, {'1','1','3','1','3'},
@@ -64,7 +64,7 @@ static char c25_check_digit(const unsigned int count) {
 
 /* Common to Standard (Matrix), Industrial, IATA, and Data Logic */
 static int c25_common(struct zint_symbol *symbol, const unsigned char source[], int length, const int max,
-            const int is_matrix, const char *start_stop[2], const int start_length, const int error_base) {
+            const int is_matrix, const char start_stop[2][6], const int start_length, const int error_base) {
 
     int i;
     char dest[818]; /* Largest destination 4 + (80 + 1) * 10 + 3 + 1 = 818 */
diff --git a/backend/aztec.c b/backend/aztec.c
index 41073184..d98292bf 100644
--- a/backend/aztec.c
+++ b/backend/aztec.c
@@ -185,32 +185,25 @@ static int aztec_text_process(const unsigned char source[], int src_len, int bp,
     i = 0;
     j = 0;
     while (i < src_len) {
+        reduced_encode_mode[j] = encode_mode[i];
         if (i + 1 < src_len) {
             if ((source[i] == 13) && (source[i + 1] == 10)) { /* CR LF */
                 reduced_source[j] = 'a';
-                reduced_encode_mode[j] = encode_mode[i];
                 i += 2;
             } else if ((source[i] == '.') && (source[i + 1] == ' ') && (encode_mode[i] == 'P')) {
                 reduced_source[j] = 'b';
-                reduced_encode_mode[j] = encode_mode[i];
                 i += 2;
             } else if ((source[i] == ',') && (source[i + 1] == ' ') && (encode_mode[i] == 'P')) {
                 reduced_source[j] = 'c';
-                reduced_encode_mode[j] = encode_mode[i];
                 i += 2;
             } else if ((source[i] == ':') && (source[i + 1] == ' ')) {
                 reduced_source[j] = 'd';
-                reduced_encode_mode[j] = encode_mode[i];
                 i += 2;
             } else {
-                reduced_source[j] = source[i];
-                reduced_encode_mode[j] = encode_mode[i];
-                i++;
+                reduced_source[j] = source[i++];
             }
         } else {
-            reduced_source[j] = source[i];
-            reduced_encode_mode[j] = encode_mode[i];
-            i++;
+            reduced_source[j] = source[i++];
         }
         j++;
     }
@@ -950,10 +943,10 @@ INTERNAL int aztec(struct zint_symbol *symbol, struct zint_seg segs[], const int
     data_maxsize = 0; /* Keep compiler happy! */
     adjustment_size = 0;
     if (symbol->option_2 == 0) { /* The size of the symbol can be determined by Zint */
-        static const short *full_sizes[5] = {
+        static const short *const full_sizes[5] = {
             NULL, Aztec10DataSizes, Aztec23DataSizes, Aztec36DataSizes, Aztec50DataSizes
         };
-        static const short *comp_sizes[5] = {
+        static const short *const comp_sizes[5] = {
             NULL, AztecCompact10DataSizes, AztecCompact23DataSizes, AztecCompact36DataSizes, AztecCompact50DataSizes
         };
         int ecc_level = symbol->option_1;
@@ -1230,15 +1223,13 @@ INTERNAL int aztec(struct zint_symbol *symbol, struct zint_seg segs[], const int
 
     /* Plot all of the data into the symbol in pre-defined spiral pattern */
     if (compact) {
-        int offset = AztecCompactOffset[layers - 1];
-        int end_offset = 27 - offset;
+        const int offset = AztecCompactOffset[layers - 1];
+        const int end_offset = 27 - offset;
         for (y = offset; y < end_offset; y++) {
-            int y_map = y * 27;
+            const int y_map = y * 27;
             for (x = offset; x < end_offset; x++) {
-                int map = AztecCompactMap[y_map + x];
-                if (map == 1) {
-                    set_module(symbol, y - offset, x - offset);
-                } else if (map >= 2 && bit_pattern[map - 2] == '1') {
+                const int map = AztecCompactMap[y_map + x];
+                if (map == 1 || (map >= 2 && bit_pattern[map - 2] == '1')) {
                     set_module(symbol, y - offset, x - offset);
                 }
             }
@@ -1248,16 +1239,14 @@ INTERNAL int aztec(struct zint_symbol *symbol, struct zint_seg segs[], const int
         symbol->rows = 27 - (2 * offset);
         symbol->width = 27 - (2 * offset);
     } else {
-        int offset = AztecOffset[layers - 1];
-        int end_offset = 151 - offset;
+        const int offset = AztecOffset[layers - 1];
+        const int end_offset = 151 - offset;
         az_populate_map(AztecMap, layers);
         for (y = offset; y < end_offset; y++) {
-            int y_map = y * 151;
+            const int y_map = y * 151;
             for (x = offset; x < end_offset; x++) {
-                int map = AztecMap[y_map + x];
-                if (map == 1) {
-                    set_module(symbol, y - offset, x - offset);
-                } else if (map >= 2 && bit_pattern[map - 2] == '1') {
+                const int map = AztecMap[y_map + x];
+                if (map == 1 || (map >= 2 && bit_pattern[map - 2] == '1')) {
                     set_module(symbol, y - offset, x - offset);
                 }
             }
diff --git a/backend/bmp.h b/backend/bmp.h
index 6de4c911..4f1f3843 100644
--- a/backend/bmp.h
+++ b/backend/bmp.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack(1)
 #endif
 
@@ -69,7 +69,7 @@ extern "C" {
         uint8_t reserved;
     } OUT_PACK color_ref_t;
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack()
 #endif
 
diff --git a/backend/common.c b/backend/common.c
index a0b87ab8..9267db49 100644
--- a/backend/common.c
+++ b/backend/common.c
@@ -204,12 +204,12 @@ INTERNAL int module_colour_is_set(const struct zint_symbol *symbol, const int y_
 INTERNAL void set_module_colour(struct zint_symbol *symbol, const int y_coord, const int x_coord, const int colour) {
     symbol->encoded_data[y_coord][x_coord] = colour;
 }
-#endif
 
 /* Sets a dark/black module to white (i.e. unsets) */
 INTERNAL void unset_module(struct zint_symbol *symbol, const int y_coord, const int x_coord) {
     symbol->encoded_data[y_coord][x_coord >> 3] &= ~(1 << (x_coord & 0x07));
 }
+#endif
 
 /* Expands from a width pattern to a bit pattern */
 INTERNAL void expand(struct zint_symbol *symbol, const char data[], const int length) {
diff --git a/backend/common.h b/backend/common.h
index 3c0ad7c2..2225fa48 100644
--- a/backend/common.h
+++ b/backend/common.h
@@ -37,29 +37,68 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) ((int) (sizeof(x) / sizeof((x)[0])))
+#include "zint.h"
+#include "zintconfig.h"
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _MSC_VER
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
 #endif
 
-/* Determine if C89 or C99 (excluding MSVC, which doesn't define __STDC_VERSION__) */
-#ifndef _MSC_VER
-#  if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L
-#    define ZINT_IS_C89
-#  elif __STDC_VERSION__ <= 199901L /* Actually includes pseudo-standards "C94/C95" as well */
-#    define ZINT_IS_C99
-#  endif
-#endif
+/* Note if change following must also change "frontend/main.c" copy */
+#define ARRAY_SIZE(x) ((int) (sizeof(x) / sizeof((x)[0])))
 
 #ifdef _MSC_VER
 #  include <malloc.h>
 #  define z_alloca(nmemb) _alloca(nmemb)
+#elif defined(__COMPCERT__)
+#  define z_alloca(nmemb) malloc(nmemb) /* So links - leads to loads of leaks obs */
 #else
-#  if defined(ZINT_IS_C89) || defined(ZINT_IS_C99) || defined(__NuttX__) || defined(_AIX) \
+#  if (defined(__GNUC__) && !defined(alloca) && !defined(__NetBSD__)) || defined(__NuttX__) || defined(_AIX) \
         || (defined(__sun) && defined(__SVR4) /*Solaris*/)
 #    include <alloca.h>
 #  endif
 #  define z_alloca(nmemb) alloca(nmemb)
 #endif
+/* End of "frontend/main.c" copy */
+
+#ifdef _MSC_VER
+#  pragma warning(disable: 4125) /* decimal digit terminates octal escape sequence */
+#  pragma warning(disable: 4244) /* conversion from int to float */
+#  if _MSC_VER > 1200 /* VC6 */
+#    pragma warning(disable: 4996) /* function or variable may be unsafe */
+#  endif
+#endif
+
+#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(ZINT_TEST) && !defined(__MINGW32__)
+#  define INTERNAL __attribute__((__visibility__("hidden")))
+#elif defined(ZINT_TEST)
+#  define INTERNAL ZINT_EXTERN /* The test suite references INTERNAL functions, so they need to be exported */
+#else
+#  define INTERNAL
+#endif
+
+#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__MINGW32__)
+#  define INTERNAL_DATA_EXTERN __attribute__((__visibility__("hidden"))) extern
+#  define INTERNAL_DATA __attribute__((__visibility__("hidden")))
+#else
+#  define INTERNAL_DATA_EXTERN extern
+#  define INTERNAL_DATA
+#endif
+
+/* Determine if C89 (excluding MSVC, which doesn't define __STDC_VERSION__) */
+#ifndef _MSC_VER
+#  if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L
+#    define ZINT_IS_C89
+#  endif
+#endif
 
 #ifdef _MSC_VER
 #  if _MSC_VER >= 1400 /* MSVC 2005 (C++ 8.0) */
@@ -73,17 +112,47 @@ extern "C" {
 #  endif
 #endif
 
-#ifdef _MSC_VER
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
+#if (defined(_MSC_VER) && _MSC_VER <= 1200) || defined(ZINT_IS_C89) /* VC6 or C89 */
+#  define ceilf (float) ceil
+#  define floorf (float) floor
+#  define fmodf (float) fmod
+#endif
+/* `round()` (C99) not before MSVC 2013 (C++ 12.0) */
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(ZINT_IS_C89)
+#  define round(arg) floor((arg) + 0.5)
+#  define roundf(arg) floorf((arg) + 0.5f)
 #endif
 
-/* `is_sane()` flags */
+/* Is float integral value? (https://stackoverflow.com/a/40404149) */
+#define isfintf(arg) (fmodf(arg, 1.0f) == 0.0f)
+
+/* Simple versions of <ctype.h> functions with no dependence on locale */
+#define z_isdigit(c) ((c) <= '9' && (c) >= '0')
+#define z_isupper(c) ((c) >= 'A' && (c) <= 'Z')
+#define z_islower(c) ((c) >= 'a' && (c) <= 'z')
+
+/* Helpers to cast away char pointer signedness */
+#define ustrlen(source) strlen((const char *) (source))
+#define ustrcpy(target, source) strcpy((char *) (target), (const char *) (source))
+#define ustrcat(target, source) strcat((char *) (target), (const char *) (source))
+#define ustrncat(target, source, count) strncat((char *) (target), (const char *) (source), (count))
+
+/* Converts a character 0-9, A-F to its equivalent integer value */
+INTERNAL int ctoi(const char source);
+
+/* Converts an integer value to its hexadecimal character */
+INTERNAL char itoc(const int source);
+
+/* Converts decimal string of length <= 9 to integer value. Returns -1 if not numeric */
+INTERNAL int to_int(const unsigned char source[], const int length);
+
+/* Converts lower case characters to upper case in string `source` */
+INTERNAL void to_upper(unsigned char source[], const int length);
+
+/* Returns the number of times a character occurs in `source` */
+INTERNAL int chr_cnt(const unsigned char source[], const int length, const unsigned char c);
+
+/* `is_chr()` & `is_sane()` flags */
 #define IS_SPC_F    0x0001 /* Space */
 #define IS_HSH_F    0x0002 /* Hash sign # */
 #define IS_AST_F    0x0004 /* Asterisk sign * */
@@ -107,91 +176,6 @@ typedef unsigned __int64 uint64_t;
 /* The most commonly used set */
 #define NEON_F      IS_NUM_F /* NEON "0123456789" */
 
-/* Simple versions of <ctype.h> functions with no dependence on locale */
-#define z_isdigit(c) ((c) <= '9' && (c) >= '0')
-#define z_isupper(c) ((c) >= 'A' && (c) <= 'Z')
-#define z_islower(c) ((c) >= 'a' && (c) <= 'z')
-
-#include "zint.h"
-#include "zintconfig.h"
-#include <stdlib.h>
-#include <string.h>
-
-/* Helpers to cast away char pointer signedness */
-#define ustrlen(source) strlen((const char *) (source))
-#define ustrcpy(target, source) strcpy((char *) (target), (const char *) (source))
-#define ustrcat(target, source) strcat((char *) (target), (const char *) (source))
-#define ustrncat(target, source, count) strncat((char *) (target), (const char *) (source), (count))
-
-#if (defined(_MSC_VER) && _MSC_VER <= 1200) || defined(ZINT_IS_C89) /* VC6 or C89 */
-#  define ceilf (float) ceil
-#  define floorf (float) floor
-#  define fmodf (float) fmod
-#endif
-/* `round()` (C99) not before MSVC 2013 (C++ 12.0) */
-#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(ZINT_IS_C89)
-#  define round(arg) floor((arg) + 0.5)
-#  define roundf(arg) floorf((arg) + 0.5f)
-#endif
-
-#ifdef _MSC_VER
-#  pragma warning(disable: 4244) /* conversion from int to float */
-#  if _MSC_VER > 1200 /* VC6 */
-#    pragma warning(disable: 4996) /* function or variable may be unsafe */
-#  endif
-#endif
-
-/* Is float integral value? (https://stackoverflow.com/a/40404149) */
-#define isfintf(arg) (fmodf(arg, 1.0f) == 0.0f)
-
-#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(ZINT_TEST) && !defined(__MINGW32__)
-#  define INTERNAL __attribute__((__visibility__("hidden")))
-#elif defined(ZINT_TEST)
-#  define INTERNAL ZINT_EXTERN /* The test suite references INTERNAL functions, so they need to be exported */
-#else
-#  define INTERNAL
-#endif
-
-#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__MINGW32__)
-#  define INTERNAL_DATA_EXTERN __attribute__((__visibility__("hidden"))) extern
-#  define INTERNAL_DATA __attribute__((__visibility__("hidden")))
-#else
-#  define INTERNAL_DATA_EXTERN extern
-#  define INTERNAL_DATA
-#endif
-
-#define Z_COMMON_INLINE   1
-
-#ifdef Z_COMMON_INLINE
-/* Returns true (1) if a module is dark/black, otherwise false (0) */
-#  define module_is_set(s, y, x) (((s)->encoded_data[(y)][(x) >> 3] >> ((x) & 0x07)) & 1)
-
-/* Sets a module to dark/black */
-#  define set_module(s, y, x) do { (s)->encoded_data[(y)][(x) >> 3] |= 1 << ((x) & 0x07); } while (0)
-
-/* Returns true (1-8) if a module is colour, otherwise false (0) */
-#  define module_colour_is_set(s, y, x) ((s)->encoded_data[(y)][(x)])
-
-/* Sets a module to a colour */
-#  define set_module_colour(s, y, x, c) do { (s)->encoded_data[(y)][(x)] = (c); } while (0)
-#endif
-
-/* Converts a character 0-9, A-F to its equivalent integer value */
-INTERNAL int ctoi(const char source);
-
-/* Converts an integer value to its hexadecimal character */
-INTERNAL char itoc(const int source);
-
-/* Converts decimal string of length <= 9 to integer value. Returns -1 if not numeric */
-INTERNAL int to_int(const unsigned char source[], const int length);
-
-/* Converts lower case characters to upper case in string `source` */
-INTERNAL void to_upper(unsigned char source[], const int length);
-
-/* Returns the number of times a character occurs in `source` */
-INTERNAL int chr_cnt(const unsigned char source[], const int length, const unsigned char c);
-
-
 /* Whether a character matches `flg` */
 INTERNAL int is_chr(const unsigned int flg, const unsigned int c);
 
@@ -211,7 +195,15 @@ INTERNAL int posn(const char set_string[], const char data);
 INTERNAL int bin_append_posn(const int arg, const int length, char *binary, const int bin_posn);
 
 
-#ifndef Z_COMMON_INLINE
+#define Z_COMMON_INLINE   1
+
+#ifdef Z_COMMON_INLINE
+#  define module_is_set(s, y, x) (((s)->encoded_data[y][(x) >> 3] >> ((x) & 0x07)) & 1)
+#  define set_module(s, y, x) do { (s)->encoded_data[y][(x) >> 3] |= 1 << ((x) & 0x07); } while (0)
+#  define module_colour_is_set(s, y, x) ((s)->encoded_data[y][x])
+#  define set_module_colour(s, y, x, c) do { (s)->encoded_data[y][x] = (c); } while (0)
+#  define unset_module(s, y, x) do { (s)->encoded_data[y][(x) >> 3] &= ~(1 << ((x) & 0x07)); } while (0)
+#else
 /* Returns true (1) if a module is dark/black, otherwise false (0) */
 INTERNAL int module_is_set(const struct zint_symbol *symbol, const int y_coord, const int x_coord);
 
@@ -224,9 +216,10 @@ INTERNAL int module_colour_is_set(const struct zint_symbol *symbol, const int y_
 /* Sets a module to a colour */
 INTERNAL void set_module_colour(struct zint_symbol *symbol, const int y_coord, const int x_coord,
                 const int colour);
-#endif
+
 /* Sets a dark/black module to white (i.e. unsets) */
 INTERNAL void unset_module(struct zint_symbol *symbol, const int y_coord, const int x_coord);
+#endif /* Z_COMMON_INLINE */
 
 /* Expands from a width pattern to a bit pattern */
 INTERNAL void expand(struct zint_symbol *symbol, const char data[], const int length);
diff --git a/backend/dmatrix.c b/backend/dmatrix.c
index ee80b8a3..ec942445 100644
--- a/backend/dmatrix.c
+++ b/backend/dmatrix.c
@@ -683,7 +683,7 @@ static int dm_switch_mode(const int next_mode, unsigned char target[], int tp, i
 
 #define DM_NUM_MODES        6
 
-static const char *dm_smodes[] = { "?", "ASCII", "C40", "TEXT", "X12", "EDF", "B256" };
+static const char dm_smodes[DM_NUM_MODES + 1][6] = { "?", "ASCII", "C40", "TEXT", "X12", "EDF", "B256" };
 
 /* The size of this structure could be significantly reduced using techniques pointed out by Alex Geller,
    but not done currently to avoid the processing overhead */
diff --git a/backend/emf.h b/backend/emf.h
index 599cdb93..ca197e7c 100644
--- a/backend/emf.h
+++ b/backend/emf.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack(1)
 #endif
 
@@ -237,7 +237,7 @@ extern "C" {
         emr_rectangle_t right;
     } OUT_PACK box_t;
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack()
 #endif
 
diff --git a/backend/gs1.c b/backend/gs1.c
index bfd053fe..29d25079 100644
--- a/backend/gs1.c
+++ b/backend/gs1.c
@@ -40,7 +40,7 @@
 static int numeric(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50]) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -78,7 +78,7 @@ static const char c82[] = {
 static int cset82(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50]) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -105,7 +105,7 @@ static int cset82(const unsigned char *data, int data_len, int offset, int min,
 static int cset39(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50]) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -133,7 +133,7 @@ static int cset39(const unsigned char *data, int data_len, int offset, int min,
 static int cset64(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50]) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -166,7 +166,7 @@ static int cset64(const unsigned char *data, int data_len, int offset, int min,
 static int csum(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -201,7 +201,7 @@ static int csum(const unsigned char *data, int data_len, int offset, int min, in
 static int csumalpha(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -249,7 +249,7 @@ static int key(const unsigned char *data, int data_len, int offset, int min, int
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -284,7 +284,7 @@ static int yyyymmd0(const unsigned char *data, int data_len, int offset, int min
 
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 8)) {
         return 0;
@@ -331,7 +331,7 @@ static int yyyymmdd(const unsigned char *data, int data_len, int offset, int min
         return 0;
     }
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (!length_only && data_len) {
         const int day = to_int(data + offset + 6, 2);
@@ -350,7 +350,7 @@ static int yyyymmdd(const unsigned char *data, int data_len, int offset, int min
 static int yymmd0(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 6)) {
         return 0;
@@ -379,7 +379,7 @@ static int yymmdd(const unsigned char *data, int data_len, int offset, int min,
         return 0;
     }
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (!length_only && data_len) {
         const int day = to_int(data + offset + 4, 2);
@@ -406,7 +406,7 @@ static int yymmddhh(const unsigned char *data, int data_len, int offset, int min
         return 0;
     }
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (!length_only && data_len) {
         const int hour = to_int(data + offset + 6, 2);
@@ -426,7 +426,7 @@ static int hhmm(const unsigned char *data, int data_len, int offset, int min, in
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 4)) {
         return 0;
@@ -459,7 +459,7 @@ static int mmoptss(const unsigned char *data, int data_len, int offset, int min,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 2)
             || (data_len > 2 && data_len < 4)) {
@@ -496,9 +496,13 @@ static int iso3166(const unsigned char *data, int data_len, int offset, int min,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 3)) {
+        if (offset) {
+            /* For backward compatibility only warn if not first */
+            *p_err_no = 4;
+        }
         return 0;
     }
 
@@ -514,42 +518,12 @@ static int iso3166(const unsigned char *data, int data_len, int offset, int min,
     return 1;
 }
 
-/* Check for a list of ISO 3166-1 numeric country codes */
-static int iso3166list(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
-            int *p_err_posn, char err_msg[50], const int length_only) {
-
-    int data_len_max;
-
-    data_len -= offset;
-    data_len_max = data_len > max ? max : data_len;
-
-    if (data_len < min || (data_len && data_len < 3)) {
-        return 0;
-    }
-    /* Do this check separately for backward compatibility */
-    if (data_len && data_len_max % 3) {
-        *p_err_no = 4;
-        return 0;
-    }
-
-    if (!length_only && data_len) {
-        int i;
-        for (i = 0; i < data_len_max; i += 3) {
-            if (!iso3166(data, offset + data_len, offset + i, 3, 3, p_err_no, p_err_posn, err_msg, length_only)) {
-                return 0;
-            }
-        }
-    }
-
-    return 1;
-}
-
 /* Check for an ISO 3166-1 numeric country code allowing "999" */
 static int iso3166999(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 3)) {
         return 0;
@@ -573,7 +547,7 @@ static int iso3166alpha2(const unsigned char *data, int data_len, int offset, in
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 2)) {
         return 0;
@@ -599,7 +573,7 @@ static int iso4217(const unsigned char *data, int data_len, int offset, int min,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 3)) {
         return 0;
@@ -623,7 +597,7 @@ static int pcenc(const unsigned char *data, int data_len, int offset, int min, i
 
     static const char hex_chars[] = "0123456789ABCDEFabcdef";
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -659,7 +633,7 @@ static int yesno(const unsigned char *data, int data_len, int offset, int min, i
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -682,7 +656,7 @@ static int importeridx(const unsigned char *data, int data_len, int offset, int
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -707,7 +681,7 @@ static int importeridx(const unsigned char *data, int data_len, int offset, int
 static int nonzero(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -732,7 +706,7 @@ static int winding(const unsigned char *data, int data_len, int offset, int min,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -755,7 +729,7 @@ static int zero(const unsigned char *data, int data_len, int offset, int min, in
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -778,7 +752,7 @@ static int pieceoftotal(const unsigned char *data, int data_len, int offset, int
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 4)) {
         return 0;
@@ -816,7 +790,7 @@ static int pieceoftotal(const unsigned char *data, int data_len, int offset, int
 static int iban(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -897,7 +871,7 @@ static int nozeroprefix(const unsigned char *data, int data_len, int offset, int
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -1004,7 +978,7 @@ static int couponcode(const unsigned char *data, int data_len, int offset, int m
 
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -1222,7 +1196,7 @@ static int couponposoffer(const unsigned char *data, int data_len, int offset, i
 
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -1274,7 +1248,7 @@ static int couponposoffer(const unsigned char *data, int data_len, int offset, i
 static int latitude(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 10)) {
         return 0;
@@ -1304,7 +1278,7 @@ static int latitude(const unsigned char *data, int data_len, int offset, int min
 static int longitude(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 10)) {
         return 0;
@@ -1334,7 +1308,7 @@ static int longitude(const unsigned char *data, int data_len, int offset, int mi
 static int mediatype(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min || (data_len && data_len < 2)) {
         return 0;
@@ -1364,7 +1338,7 @@ static int mediatype(const unsigned char *data, int data_len, int offset, int mi
 static int hyphen(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -1392,7 +1366,7 @@ static int iso5218(const unsigned char *data, int data_len, int offset, int min,
             int *p_err_posn, char err_msg[50], const int length_only) {
     (void)max;
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
@@ -1415,7 +1389,7 @@ static int iso5218(const unsigned char *data, int data_len, int offset, int min,
 static int posinseqslash(const unsigned char *data, int data_len, int offset, int min, int max, int *p_err_no,
             int *p_err_posn, char err_msg[50], const int length_only) {
 
-    data_len -= offset;
+    data_len = data_len < offset ? 0 : data_len - offset;
 
     if (data_len < min) {
         return 0;
diff --git a/backend/gs1_lint.h b/backend/gs1_lint.h
index e9b0d908..6bf59700 100644
--- a/backend/gs1_lint.h
+++ b/backend/gs1_lint.h
@@ -37,8 +37,8 @@
 #define Z_GS1_LINT_H
 
 /* N18,csum,key (Used by SSCC, GSRN - PROVIDER, GSRN - RECIPIENT) */
-static int n18_csum_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n18_csum_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 18
             && csum(data, data_len, 0, 18, 18, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 18, 18, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -48,8 +48,8 @@ static int n18_csum_key(const unsigned char *data, const int data_len,
 }
 
 /* N14,csum,key (Used by GTIN, CONTENT) */
-static int n14_csum_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n14_csum_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 14
             && csum(data, data_len, 0, 14, 14, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 14, 14, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -58,16 +58,16 @@ static int n14_csum_key(const unsigned char *data, const int data_len,
             && key(data, data_len, 0, 14, 14, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* X..20 (Used by BATCH/LOT, SERIAL, CPV, PCN...) */
-static int x__20(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* X..20 (Used by BATCH/LOT, SERIAL, CPV, PCN, GLN EXTENSION COMPONENT, SHIP TO POST, RTN TO POST, REFURB LOT, ...) */
+static int x__20(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 20
             && cset82(data, data_len, 0, 1, 20, p_err_no, p_err_posn, err_msg);
 }
 
-/* N6,yymmd0 (Used by PROD DATE, DUE DATE, PACK DATE, BEST BEFORE or BEST BY...) */
-static int n6_yymmd0(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* N6,yymmd0 (Used by PROD DATE, DUE DATE, PACK DATE, BEST BEFORE or BEST BY, SELL BY, USE BY or EXPIRY) */
+static int n6_yymmd0(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 6
             && yymmd0(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg)
@@ -75,36 +75,36 @@ static int n6_yymmd0(const unsigned char *data, const int data_len,
 }
 
 /* N2 (Used by VARIANT) */
-static int n2(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n2(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 2
             && numeric(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..28 (Used by TPX) */
-static int x__28(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__28(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 28
             && cset82(data, data_len, 0, 1, 28, p_err_no, p_err_posn, err_msg);
 }
 
-/* X..30 (Used by ADDITIONAL ID, CUST. PART No., SECONDARY SERIAL, REF. TO SOURCE...) */
-static int x__30(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* X..30 (Used by ADDITIONAL ID, CUST. PART No., SECONDARY SERIAL, REF. TO SOURCE, ORDER NUMBER, ROUTE, SHIP TO...) */
+static int x__30(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 30
             && cset82(data, data_len, 0, 1, 30, p_err_no, p_err_posn, err_msg);
 }
 
 /* N..6 (Used by MTO VARIANT) */
-static int n__6(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__6(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 6
             && numeric(data, data_len, 0, 1, 6, p_err_no, p_err_posn, err_msg);
 }
 
 /* N13,csum,key [X..17] (Used by GDTI) */
-static int n13_csum_key__x__17_(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n13_csum_key__x__17_(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 13 && data_len <= 30
             && csum(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -115,8 +115,8 @@ static int n13_csum_key__x__17_(const unsigned char *data, const int data_len,
 }
 
 /* N13,csum,key [N..12] (Used by GCN) */
-static int n13_csum_key__n__12_(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n13_csum_key__n__12_(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 13 && data_len <= 25
             && csum(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -127,29 +127,29 @@ static int n13_csum_key__n__12_(const unsigned char *data, const int data_len,
 }
 
 /* N..8 (Used by VAR. COUNT, COUNT) */
-static int n__8(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__8(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 8
             && numeric(data, data_len, 0, 1, 8, p_err_no, p_err_posn, err_msg);
 }
 
-/* N6 (Used by NET WEIGHT (kg), LENGTH (m), WIDTH (m), HEIGHT (m)...) */
-static int n6(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* N6 (Used by NET WEIGHT (kg), LENGTH (m), WIDTH (m), HEIGHT (m), AREA (m²), NET VOLUME (l), NET VOLUME (m³)...) */
+static int n6(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 6
             && numeric(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg);
 }
 
 /* N..15 (Used by AMOUNT, PRICE) */
-static int n__15(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__15(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 15
             && numeric(data, data_len, 0, 1, 15, p_err_no, p_err_posn, err_msg);
 }
 
 /* N3,iso4217 N..15 (Used by AMOUNT, PRICE) */
-static int n3_iso4217_n__15(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n3_iso4217_n__15(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 4 && data_len <= 18
             && iso4217(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
@@ -158,15 +158,15 @@ static int n3_iso4217_n__15(const unsigned char *data, const int data_len,
 }
 
 /* N4 (Used by PRCNT OFF, POINTS) */
-static int n4(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n4(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 4
             && numeric(data, data_len, 0, 4, 4, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..30,key (Used by GINC, GIAI - ASSEMBLY, GIAI) */
-static int x__30_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__30_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 30
             && key(data, data_len, 0, 1, 30, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 30, p_err_no, p_err_posn, err_msg)
@@ -174,8 +174,8 @@ static int x__30_key(const unsigned char *data, const int data_len,
 }
 
 /* N17,csum,key (Used by GSIN) */
-static int n17_csum_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n17_csum_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 17
             && csum(data, data_len, 0, 17, 17, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 17, 17, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -184,9 +184,9 @@ static int n17_csum_key(const unsigned char *data, const int data_len,
             && key(data, data_len, 0, 17, 17, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* N13,csum,key (Used by SHIP TO LOC, BILL TO, PURCHASE FROM, SHIP FOR LOC...) */
-static int n13_csum_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* N13,csum,key (Used by SHIP TO LOC, BILL TO, PURCHASE FROM, SHIP FOR LOC, LOC No., PAY TO, PROD/SERV LOC, PARTY) */
+static int n13_csum_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 13
             && csum(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -196,8 +196,8 @@ static int n13_csum_key(const unsigned char *data, const int data_len,
 }
 
 /* N3,iso3166 X..9 (Used by SHIP TO POST) */
-static int n3_iso3166_x__9(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n3_iso3166_x__9(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 4 && data_len <= 12
             && iso3166(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
@@ -206,42 +206,54 @@ static int n3_iso3166_x__9(const unsigned char *data, const int data_len,
 }
 
 /* N3,iso3166 (Used by ORIGIN, COUNTRY - PROCESS, COUNTRY - FULL PROCESS) */
-static int n3_iso3166(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n3_iso3166(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 3
             && iso3166(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
             && iso3166(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* N..15,iso3166list (Used by COUNTRY - INITIAL PROCESS, COUNTRY - DISASSEMBLY) */
-static int n__15_iso3166list(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
-    return data_len >= 1 && data_len <= 15
-            && iso3166list(data, data_len, 0, 1, 15, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
-            && numeric(data, data_len, 0, 1, 15, p_err_no, p_err_posn, err_msg)
-            && iso3166list(data, data_len, 0, 1, 15, p_err_no, p_err_posn, err_msg, 0);
+/* N3,iso3166 [N3],iso3166 [N3],iso3166 [N3],iso3166 [N3],iso3166 (Used by COUNTRY - INITIAL PROCESS, COUNTRY -...) */
+static int n3_iso3166__n3__iso3166__n3__iso3166__n3__iso3166__n3__iso3166(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
+    return data_len >= 3 && data_len <= 15
+            && iso3166(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
+            && iso3166(data, data_len, 3, 0, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
+            && iso3166(data, data_len, 6, 0, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
+            && iso3166(data, data_len, 9, 0, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
+            && iso3166(data, data_len, 12, 0, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
+            && numeric(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
+            && iso3166(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 0)
+            && numeric(data, data_len, 3, 0, 3, p_err_no, p_err_posn, err_msg)
+            && iso3166(data, data_len, 3, 0, 3, p_err_no, p_err_posn, err_msg, 0)
+            && numeric(data, data_len, 6, 0, 3, p_err_no, p_err_posn, err_msg)
+            && iso3166(data, data_len, 6, 0, 3, p_err_no, p_err_posn, err_msg, 0)
+            && numeric(data, data_len, 9, 0, 3, p_err_no, p_err_posn, err_msg)
+            && iso3166(data, data_len, 9, 0, 3, p_err_no, p_err_posn, err_msg, 0)
+            && numeric(data, data_len, 12, 0, 3, p_err_no, p_err_posn, err_msg)
+            && iso3166(data, data_len, 12, 0, 3, p_err_no, p_err_posn, err_msg, 0);
 }
 
 /* X..3 (Used by ORIGIN SUBDIVISION, AQUATIC SPECIES) */
-static int x__3(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__3(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 3
             && cset82(data, data_len, 0, 1, 3, p_err_no, p_err_posn, err_msg);
 }
 
-/* X..35,pcenc (Used by SHIP TO COMP, SHIP TO NAME, RTN TO COMP, RTN TO NAME...) */
-static int x__35_pcenc(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* X..35,pcenc (Used by SHIP TO COMP, SHIP TO NAME, RTN TO COMP, RTN TO NAME, SRV DESCRIPTION) */
+static int x__35_pcenc(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 35
             && pcenc(data, data_len, 0, 1, 35, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 35, p_err_no, p_err_posn, err_msg)
             && pcenc(data, data_len, 0, 1, 35, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* X..70,pcenc (Used by SHIP TO ADD1, SHIP TO ADD2, SHIP TO SUB, SHIP TO LOC...) */
-static int x__70_pcenc(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* X..70,pcenc (Used by SHIP TO ADD1, SHIP TO ADD2, SHIP TO SUB, SHIP TO LOC, SHIP TO REG, RTN TO ADD1, RTN TO ...) */
+static int x__70_pcenc(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 70
             && pcenc(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg)
@@ -249,8 +261,8 @@ static int x__70_pcenc(const unsigned char *data, const int data_len,
 }
 
 /* X2,iso3166alpha2 (Used by SHIP TO COUNTRY, RTN TO COUNTRY) */
-static int x2_iso3166alpha2(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x2_iso3166alpha2(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 2
             && iso3166alpha2(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg)
@@ -258,8 +270,8 @@ static int x2_iso3166alpha2(const unsigned char *data, const int data_len,
 }
 
 /* N10,latitude N10,longitude (Used by SHIP TO GEO) */
-static int n10_latitude_n10_longitude(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n10_latitude_n10_longitude(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 20
             && latitude(data, data_len, 0, 10, 10, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && longitude(data, data_len, 10, 10, 10, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -270,8 +282,8 @@ static int n10_latitude_n10_longitude(const unsigned char *data, const int data_
 }
 
 /* N1,yesno (Used by DANGEROUS GOODS, AUTH TO LEAVE, SIG REQUIRED) */
-static int n1_yesno(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n1_yesno(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 1
             && yesno(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg)
@@ -279,8 +291,8 @@ static int n1_yesno(const unsigned char *data, const int data_len,
 }
 
 /* N6,yymmd0 N4,hhmm (Used by NOT BEF DEL DT, NOT AFT DEL DT) */
-static int n6_yymmd0_n4_hhmm(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6_yymmd0_n4_hhmm(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 10
             && yymmd0(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && hhmm(data, data_len, 6, 4, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -291,8 +303,8 @@ static int n6_yymmd0_n4_hhmm(const unsigned char *data, const int data_len,
 }
 
 /* N6,yymmdd (Used by REL DATE, FIRST FREEZE DATE) */
-static int n6_yymmdd(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6_yymmdd(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 6
             && yymmdd(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg)
@@ -300,8 +312,8 @@ static int n6_yymmdd(const unsigned char *data, const int data_len,
 }
 
 /* N6 [X1],hyphen (Used by MAX TEMP F., MAX TEMP C., MIN TEMP F., MIN TEMP C.) */
-static int n6__x1__hyphen(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6__x1__hyphen(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 6 && data_len <= 7
             && hyphen(data, data_len, 6, 0, 1, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg)
@@ -310,15 +322,15 @@ static int n6__x1__hyphen(const unsigned char *data, const int data_len,
 }
 
 /* N13 (Used by NSN) */
-static int n13(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n13(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 13
             && numeric(data, data_len, 0, 13, 13, p_err_no, p_err_posn, err_msg);
 }
 
 /* N6,yymmdd N4,hhmm (Used by EXPIRY TIME) */
-static int n6_yymmdd_n4_hhmm(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6_yymmdd_n4_hhmm(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 10
             && yymmdd(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && hhmm(data, data_len, 6, 4, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -329,22 +341,22 @@ static int n6_yymmdd_n4_hhmm(const unsigned char *data, const int data_len,
 }
 
 /* N..4 (Used by ACTIVE POTENCY) */
-static int n__4(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__4(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 4
             && numeric(data, data_len, 0, 1, 4, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..12 (Used by CATCH AREA) */
-static int x__12(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__12(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 12
             && cset82(data, data_len, 0, 1, 12, p_err_no, p_err_posn, err_msg);
 }
 
 /* N6,yymmdd [N6],yymmdd (Used by HARVEST DATE) */
-static int n6_yymmdd__n6__yymmdd(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6_yymmdd__n6__yymmdd(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 6 && data_len <= 12
             && yymmdd(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && yymmdd(data, data_len, 6, 0, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -355,22 +367,22 @@ static int n6_yymmdd__n6__yymmdd(const unsigned char *data, const int data_len,
 }
 
 /* X..10 (Used by FISHING GEAR TYPE, SUFFIX) */
-static int x__10(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__10(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 10
             && cset82(data, data_len, 0, 1, 10, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..2 (Used by PROD METHOD) */
-static int x__2(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__2(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 2
             && cset82(data, data_len, 0, 1, 2, p_err_no, p_err_posn, err_msg);
 }
 
 /* N6,yymmdd [N4],hhmm (Used by TEST BY DATE) */
-static int n6_yymmdd__n4__hhmm(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n6_yymmdd__n4__hhmm(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 6 && data_len <= 10
             && yymmdd(data, data_len, 0, 6, 6, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && hhmm(data, data_len, 6, 0, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -380,9 +392,9 @@ static int n6_yymmdd__n4__hhmm(const unsigned char *data, const int data_len,
             && hhmm(data, data_len, 6, 0, 4, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* N3,iso3166999 X..27 (Used by PROCESSOR # 0, PROCESSOR # 1, PROCESSOR # 2, PROCESSOR # 3...) */
-static int n3_iso3166999_x__27(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* N3,iso3166999 X..27 (Used by PROCESSOR # 0, PROCESSOR # 1, PROCESSOR # 2, PROCESSOR # 3, PROCESSOR # 4, PROC...) */
+static int n3_iso3166999_x__27(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 4 && data_len <= 30
             && iso3166999(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
@@ -391,8 +403,8 @@ static int n3_iso3166999_x__27(const unsigned char *data, const int data_len,
 }
 
 /* N1 X1 X1 X1,importeridx (Used by UIC+EXT) */
-static int n1_x1_x1_x1_importeridx(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n1_x1_x1_x1_importeridx(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 4
             && importeridx(data, data_len, 3, 1, 1, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg)
@@ -402,17 +414,17 @@ static int n1_x1_x1_x1_importeridx(const unsigned char *data, const int data_len
             && importeridx(data, data_len, 3, 1, 1, p_err_no, p_err_posn, err_msg, 0);
 }
 
-/* X2 X..28 (Used by CERT # 1, CERT # 2, CERT # 3, CERT # 4...) */
-static int x2_x__28(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+/* X2 X..28 (Used by CERT # 1, CERT # 2, CERT # 3, CERT # 4, CERT # 5, CERT # 6, CERT # 7, CERT # 8, CERT # 9, ...) */
+static int x2_x__28(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 3 && data_len <= 30
             && cset82(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg)
             && cset82(data, data_len, 2, 1, 28, p_err_no, p_err_posn, err_msg);
 }
 
 /* N2,mediatype (Used by AIDC MEDIA TYPE) */
-static int n2_mediatype(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n2_mediatype(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 2
             && mediatype(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 2, 2, p_err_no, p_err_posn, err_msg)
@@ -420,15 +432,15 @@ static int n2_mediatype(const unsigned char *data, const int data_len,
 }
 
 /* X..25 (Used by VCN, REF No.) */
-static int x__25(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__25(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 25
             && cset82(data, data_len, 0, 1, 25, p_err_no, p_err_posn, err_msg);
 }
 
 /* N8,yyyymmdd (Used by DOB) */
-static int n8_yyyymmdd(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n8_yyyymmdd(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 8
             && yyyymmdd(data, data_len, 0, 8, 8, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 8, 8, p_err_no, p_err_posn, err_msg)
@@ -436,8 +448,8 @@ static int n8_yyyymmdd(const unsigned char *data, const int data_len,
 }
 
 /* N8,yyyymmdd N4,hhmm (Used by DOB TIME) */
-static int n8_yyyymmdd_n4_hhmm(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n8_yyyymmdd_n4_hhmm(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 12
             && yyyymmdd(data, data_len, 0, 8, 8, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && hhmm(data, data_len, 8, 4, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -448,8 +460,8 @@ static int n8_yyyymmdd_n4_hhmm(const unsigned char *data, const int data_len,
 }
 
 /* N1,iso5218 (Used by BIO SEX) */
-static int n1_iso5218(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n1_iso5218(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 1
             && iso5218(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg)
@@ -457,8 +469,8 @@ static int n1_iso5218(const unsigned char *data, const int data_len,
 }
 
 /* X..40,pcenc (Used by FAMILY NAME, GIVEN NAME, BABY) */
-static int x__40_pcenc(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__40_pcenc(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 40
             && pcenc(data, data_len, 0, 1, 40, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 40, p_err_no, p_err_posn, err_msg)
@@ -466,8 +478,8 @@ static int x__40_pcenc(const unsigned char *data, const int data_len,
 }
 
 /* X..90,pcenc (Used by FULL NAME) */
-static int x__90_pcenc(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__90_pcenc(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 90
             && pcenc(data, data_len, 0, 1, 90, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 90, p_err_no, p_err_posn, err_msg)
@@ -475,8 +487,8 @@ static int x__90_pcenc(const unsigned char *data, const int data_len,
 }
 
 /* X3,posinseqslash (Used by BIRTH SEQUENCE) */
-static int x3_posinseqslash(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x3_posinseqslash(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 3
             && posinseqslash(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 3, 3, p_err_no, p_err_posn, err_msg)
@@ -484,8 +496,8 @@ static int x3_posinseqslash(const unsigned char *data, const int data_len,
 }
 
 /* N4,nonzero N5,nonzero N3,nonzero N1,winding N1 (Used by DIMENSIONS) */
-static int n4_nonzero_n5_nonzero_n3_nonzero_n1_winding_n1(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n4_nonzero_n5_nonzero_n3_nonzero_n1_winding_n1(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 14
             && nonzero(data, data_len, 0, 4, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && nonzero(data, data_len, 4, 5, 5, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -503,8 +515,8 @@ static int n4_nonzero_n5_nonzero_n3_nonzero_n1_winding_n1(const unsigned char *d
 }
 
 /* N1,zero N13,csum,key [X..16] (Used by GRAI) */
-static int n1_zero_n13_csum_key__x__16_(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n1_zero_n13_csum_key__x__16_(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 14 && data_len <= 30
             && zero(data, data_len, 0, 1, 1, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && csum(data, data_len, 1, 13, 13, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -518,8 +530,8 @@ static int n1_zero_n13_csum_key__x__16_(const unsigned char *data, const int dat
 }
 
 /* N14,csum N4,pieceoftotal (Used by ITIP, ITIP CONTENT) */
-static int n14_csum_n4_pieceoftotal(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n14_csum_n4_pieceoftotal(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len == 18
             && csum(data, data_len, 0, 14, 14, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && pieceoftotal(data, data_len, 14, 4, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -530,8 +542,8 @@ static int n14_csum_n4_pieceoftotal(const unsigned char *data, const int data_le
 }
 
 /* X..34,iban (Used by IBAN) */
-static int x__34_iban(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__34_iban(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 34
             && iban(data, data_len, 0, 1, 34, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 34, p_err_no, p_err_posn, err_msg)
@@ -539,8 +551,8 @@ static int x__34_iban(const unsigned char *data, const int data_len,
 }
 
 /* N8,yymmddhh [N..4],mmoptss (Used by PROD TIME) */
-static int n8_yymmddhh__n__4__mmoptss(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n8_yymmddhh__n__4__mmoptss(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 8 && data_len <= 12
             && yymmddhh(data, data_len, 0, 8, 8, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && mmoptss(data, data_len, 8, 0, 4, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -551,15 +563,15 @@ static int n8_yymmddhh__n__4__mmoptss(const unsigned char *data, const int data_
 }
 
 /* X..50 (Used by OPTSEN) */
-static int x__50(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__50(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 50
             && cset82(data, data_len, 0, 1, 50, p_err_no, p_err_posn, err_msg);
 }
 
 /* Y..30,key (Used by CPID) */
-static int y__30_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int y__30_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 30
             && key(data, data_len, 0, 1, 30, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset39(data, data_len, 0, 1, 30, p_err_no, p_err_posn, err_msg)
@@ -567,8 +579,8 @@ static int y__30_key(const unsigned char *data, const int data_len,
 }
 
 /* N..12,nozeroprefix (Used by CPID SERIAL) */
-static int n__12_nozeroprefix(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__12_nozeroprefix(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 12
             && nozeroprefix(data, data_len, 0, 1, 12, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && numeric(data, data_len, 0, 1, 12, p_err_no, p_err_posn, err_msg)
@@ -576,8 +588,8 @@ static int n__12_nozeroprefix(const unsigned char *data, const int data_len,
 }
 
 /* X..25,csumalpha,key (Used by GMN) */
-static int x__25_csumalpha_key(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__25_csumalpha_key(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 25
             && csumalpha(data, data_len, 0, 1, 25, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && key(data, data_len, 0, 1, 25, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
@@ -587,22 +599,22 @@ static int x__25_csumalpha_key(const unsigned char *data, const int data_len,
 }
 
 /* N..10 (Used by SRIN) */
-static int n__10(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int n__10(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 10
             && numeric(data, data_len, 0, 1, 10, p_err_no, p_err_posn, err_msg);
 }
 
 /* Z..90 (Used by DIGSIG) */
-static int z__90(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int z__90(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 90
             && cset64(data, data_len, 0, 1, 90, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..70,couponcode */
-static int x__70_couponcode(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__70_couponcode(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 70
             && couponcode(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg)
@@ -610,8 +622,8 @@ static int x__70_couponcode(const unsigned char *data, const int data_len,
 }
 
 /* X..70,couponposoffer */
-static int x__70_couponposoffer(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__70_couponposoffer(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 70
             && couponposoffer(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg, 1 /*length_only*/)
             && cset82(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg)
@@ -619,15 +631,15 @@ static int x__70_couponposoffer(const unsigned char *data, const int data_len,
 }
 
 /* X..70 (Used by PRODUCT URL) */
-static int x__70(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__70(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 70
             && cset82(data, data_len, 0, 1, 70, p_err_no, p_err_posn, err_msg);
 }
 
 /* X..90 (Used by INTERNAL) */
-static int x__90(const unsigned char *data, const int data_len,
-            int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int x__90(const unsigned char *data,
+            const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
     return data_len >= 1 && data_len <= 90
             && cset82(data, data_len, 0, 1, 90, p_err_no, p_err_posn, err_msg);
 }
@@ -711,7 +723,7 @@ static int gs1_lint(const int ai, const unsigned char *data, const int data_len,
             return n3_iso3166(data, data_len, p_err_no, p_err_posn, err_msg);
         }
         if (ai == 423 || ai == 425) {
-            return n__15_iso3166list(data, data_len, p_err_no, p_err_posn, err_msg);
+            return n3_iso3166__n3__iso3166__n3__iso3166__n3__iso3166__n3__iso3166(data, data_len, p_err_no, p_err_posn, err_msg);
         }
         if (ai == 427) {
             return x__3(data, data_len, p_err_no, p_err_posn, err_msg);
diff --git a/backend/library.c b/backend/library.c
index 93298d9c..288cc8d8 100644
--- a/backend/library.c
+++ b/backend/library.c
@@ -498,25 +498,6 @@ static int supports_eci(const int symbology) {
     return 0;
 }
 
-/* Returns 1 if symbology is Health Industry Bar Code */
-static int is_hibc(const int symbology) {
-
-    switch (symbology) {
-        case BARCODE_HIBC_128:
-        case BARCODE_HIBC_39:
-        case BARCODE_HIBC_DM:
-        case BARCODE_HIBC_QR:
-        case BARCODE_HIBC_PDF:
-        case BARCODE_HIBC_MICPDF:
-        case BARCODE_HIBC_BLOCKF:
-        case BARCODE_HIBC_AZTEC:
-            return 1;
-            break;
-    }
-
-    return 0;
-}
-
 /* Returns 1 if symbology supports HRT */
 static int has_hrt(const int symbology) {
 
@@ -565,15 +546,12 @@ static int has_hrt(const int symbology) {
     return 1;
 }
 
-/* Suppress clang warning: a function declaration without a prototype is deprecated in all versions of C
-   (not included in gcc's "-wpedantic") */
-#if defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"
-#endif
+typedef int (*barcode_src_func_t)(struct zint_symbol *, unsigned char[], int);
+typedef int (*barcode_seg_func_t)(struct zint_symbol *, struct zint_seg[], const int);
 
-/* Used for dispatching barcodes and for whether symbol id valid */
-static int (*const barcode_funcs[BARCODE_LAST + 1])() = {
+/* Used for dispatching `barcode_src_func_t` barcodes */
+/* Also used, with `barcode_seg_funcs` below, for testing whether symbol id valid in `ZBarcode_ValidID()` */
+static const barcode_src_func_t barcode_src_funcs[BARCODE_LAST + 1] = {
           NULL,      code11, c25standard,    c25inter,     c25iata, /*0-4*/
           NULL,    c25logic,      c25ind,      code39,    excode39, /*5-9*/
           NULL,        NULL,        NULL,        eanx,        eanx, /*10-14*/
@@ -585,33 +563,52 @@ static int (*const barcode_funcs[BARCODE_LAST + 1])() = {
        postnet,        NULL,        NULL,        NULL,        NULL, /*40-44*/
           NULL,        NULL, msi_plessey,        NULL,         fim, /*45-49*/
         code39,      pharma,         pzn,  pharma_two,     postnet, /*50-54*/
-        pdf417,      pdf417,    maxicode,      qrcode,        NULL, /*55-59*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*55-59*/
        code128,        NULL,        NULL,     auspost,        NULL, /*60-64*/
           NULL,     auspost,     auspost,     auspost,        eanx, /*65-69*/
-        rm4scc,  datamatrix,       ean14,         vin,  codablockf, /*70-74*/
+        rm4scc,        NULL,       ean14,         vin,  codablockf, /*70-74*/
          nve18,   japanpost,   koreapost,        NULL,    dbar_omn, /*75-79*/
-      dbar_omn,    dbar_exp,      planet,        NULL, micropdf417, /*80-84*/
+      dbar_omn,    dbar_exp,      planet,        NULL,        NULL, /*80-84*/
     usps_imail,     plessey, telepen_num,        NULL,       itf14, /*85-89*/
-           kix,        NULL,       aztec,        daft,        NULL, /*90-94*/
-          NULL,         dpd,     microqr,        hibc,        hibc, /*95-99*/
-          NULL,        NULL,        hibc,        NULL,        hibc, /*100-104*/
-          NULL,        hibc,        NULL,        hibc,        NULL, /*105-109*/
-          hibc,        NULL,        hibc,        NULL,        NULL, /*110-114*/
-       dotcode,      hanxin,        NULL,        NULL, mailmark_2d, /*115-119*/
+           kix,        NULL,        NULL,        daft,        NULL, /*90-94*/
+          NULL,         dpd,     microqr,        NULL,        NULL, /*95-99*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*100-104*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*105-109*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*110-114*/
+          NULL,        NULL,        NULL,        NULL, mailmark_2d, /*115-119*/
        upu_s10, mailmark_4s,        NULL,        NULL,        NULL, /*120-124*/
           NULL,        NULL,        NULL,      azrune,      code32, /*125-129*/
      composite,   composite,   composite,   composite,   composite, /*130-134*/
      composite,   composite,   composite,   composite,   composite, /*135-139*/
-       channel,     codeone,  gridmatrix,       upnqr,       ultra, /*140-144*/
-          rmqr,       bc412,
+       channel,        NULL,        NULL,       upnqr,        NULL, /*140-144*/
+          NULL,       bc412,                                        /*145-146*/
 };
 
-#if defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+#define LIB_SEG_FUNCS_START 55
+
+/* Used for dispatching `barcode_seg_func_t` barcodes */
+static const barcode_seg_func_t barcode_seg_funcs[BARCODE_LAST + 1 - LIB_SEG_FUNCS_START] = {
+        pdf417,      pdf417,    maxicode,      qrcode,        NULL, /*55-59*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*60-64*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*65-69*/
+          NULL,  datamatrix,        NULL,        NULL,        NULL, /*70-74*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*75-79*/
+          NULL,        NULL,        NULL,        NULL, micropdf417, /*80-84*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*85-89*/
+          NULL,        NULL,       aztec,        NULL,        NULL, /*90-94*/
+          NULL,        NULL,        NULL,        hibc,        hibc, /*95-99*/
+          NULL,        NULL,        hibc,        NULL,        hibc, /*100-104*/
+          NULL,        hibc,        NULL,        hibc,        NULL, /*105-109*/
+          hibc,        NULL,        hibc,        NULL,        NULL, /*110-114*/
+       dotcode,      hanxin,        NULL,        NULL,        NULL, /*115-119*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*120-124*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*125-129*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*130-134*/
+          NULL,        NULL,        NULL,        NULL,        NULL, /*135-139*/
+          NULL,     codeone,  gridmatrix,        NULL,       ultra, /*140-144*/
+          rmqr,        NULL,                                        /*145-146*/
+};
 
-typedef int (*barcode_segs_func_t)(struct zint_symbol *, struct zint_seg[], const int);
-typedef int (*barcode_func_t)(struct zint_symbol *, unsigned char[], int);
 static int reduced_charset(struct zint_symbol *symbol, struct zint_seg segs[], const int seg_count);
 
 /* Main dispatch, checking for barcodes which handle ECIs/character sets themselves, otherwise calling
@@ -625,13 +622,12 @@ static int extended_or_reduced_charset(struct zint_symbol *symbol, struct zint_s
         case BARCODE_GRIDMATRIX:
         case BARCODE_HANXIN:
         case BARCODE_RMQR:
-            error_number = (*(barcode_segs_func_t)barcode_funcs[symbol->symbology])(symbol, segs, seg_count);
+            error_number = barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START](symbol, segs, seg_count);
             break;
         /* These are the standards which have support for specific character sets but not ECI */
         case BARCODE_MICROQR:
         case BARCODE_UPNQR:
-            error_number = (*(barcode_func_t)barcode_funcs[symbol->symbology])(symbol, segs[0].source,
-                                                                                segs[0].length);
+            error_number = barcode_src_funcs[symbol->symbology](symbol, segs[0].source, segs[0].length);
             break;
         default: error_number = reduced_charset(symbol, segs, seg_count);
             break;
@@ -671,19 +667,19 @@ static int reduced_charset(struct zint_symbol *symbol, struct zint_seg segs[], c
                 preprocessed += local_segs[i].length + 1;
             }
         }
-        if (supports_eci(symbol->symbology) || is_hibc(symbol->symbology)) {
-            error_number = (*(barcode_segs_func_t)barcode_funcs[symbol->symbology])(symbol, local_segs, seg_count);
+        if (barcode_src_funcs[symbol->symbology]) {
+            error_number = barcode_src_funcs[symbol->symbology](symbol, local_segs[0].source, local_segs[0].length);
         } else {
-            error_number = (*(barcode_func_t)barcode_funcs[symbol->symbology])(symbol, local_segs[0].source,
-                                                                                local_segs[0].length);
+            error_number = barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START](symbol, local_segs, seg_count);
         }
     } else {
-        if (supports_eci(symbol->symbology) || is_hibc(symbol->symbology)) {
-            segs_cpy(symbol, segs, seg_count, local_segs); /* Shallow copy (needed to set default ECIs) */
-            error_number = (*(barcode_segs_func_t)barcode_funcs[symbol->symbology])(symbol, local_segs, seg_count);
+        if (barcode_src_funcs[symbol->symbology]) {
+            error_number = barcode_src_funcs[symbol->symbology](symbol, segs[0].source, segs[0].length);
         } else {
-            error_number = (*(barcode_func_t)barcode_funcs[symbol->symbology])(symbol, segs[0].source,
-                                                                                segs[0].length);
+            assert(symbol->symbology >= LIB_SEG_FUNCS_START); /* Suppress clang-tidy-19 warning */
+            assert(barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START]); /* Suppress clang-tidy-19 warning */
+            segs_cpy(symbol, segs, seg_count, local_segs); /* Shallow copy (needed to set default ECIs) */
+            error_number = barcode_seg_funcs[symbol->symbology - LIB_SEG_FUNCS_START](symbol, local_segs, seg_count);
         }
     }
 
@@ -893,6 +889,72 @@ INTERNAL int escape_char_process_test(struct zint_symbol *symbol, const unsigned
 }
 #endif
 
+/* For backward-compatibility, map certain invalid symbol ids to zint equivalents, some silently, some with warning */
+static int map_invalid_symbology(struct zint_symbol *symbol) {
+
+    /* Symbol ids 1 to 126 are defined by tbarcode */
+    /* 26 allowed: UPC-A up to tbarcode 9, ISSN for tbarcode 10+, mapped to UPC-A */
+    /* 27 error: UPCD1 up to tbarcode 9, ISSN + 2 digit add-on for tbarcode 10+ */
+    /* 91 warning: BC412 up to tbarcode 9, Code 32 for tbarcode 10+, mapped to Code 128 */
+    /* Note: non-zero table entries map silently, i.e. do not produce a warning */
+    #define LIB_ID_MAP_LAST 111
+    static const unsigned char id_map[LIB_ID_MAP_LAST + 1] = {
+                          0,                   0,                0,                0,                   0, /*0-4*/
+        BARCODE_C25STANDARD,                   0,                0,                0,                   0, /*5-9*/
+               BARCODE_EANX,        BARCODE_EANX,     BARCODE_EANX,                0,                   0, /*10-14*/
+               BARCODE_EANX,                   0,     BARCODE_UPCA,                0,     BARCODE_CODABAR, /*15-19*/
+                          0,                   0,                0,                0,                   0, /*20-24*/
+                          0,        BARCODE_UPCA,                0,                0,                   0, /*25-29*/
+                          0,                   0,                0,  BARCODE_GS1_128,                   0, /*30-34*/
+                          0,        BARCODE_UPCA,                0,                0,        BARCODE_UPCE, /*35-39*/
+                          0,     BARCODE_POSTNET,  BARCODE_POSTNET,  BARCODE_POSTNET,     BARCODE_POSTNET, /*40-44*/
+            BARCODE_POSTNET,     BARCODE_PLESSEY,                0,    BARCODE_NVE18,                   0, /*45-49*/
+                          0,                   0,                0,                0,                   0, /*50-54*/
+                          0,                   0,                0,                0,     BARCODE_CODE128, /*55-59*/
+                          0,     BARCODE_CODE128,   BARCODE_CODE93,                0,     BARCODE_AUSPOST, /*60-64*/
+            BARCODE_AUSPOST,                   0,                0,                0,                   0, /*65-69*/
+                          0,                   0,                0,                0,                   0, /*70-74*/
+                          0,                   0,                0, BARCODE_DBAR_OMN,                   0, /*75-79*/
+                          0,                   0,                0,   BARCODE_PLANET,                   0, /*80-84*/
+                          0,                   0,                0,  BARCODE_GS1_128,                   0, /*85-89*/
+                          0,                   0,                0,                0,                   0, /*90-94*/
+                          0,                   0,                0,                0,                   0, /*95-99*/
+           BARCODE_HIBC_128,     BARCODE_HIBC_39,                0,  BARCODE_HIBC_DM,                   0, /*100-104*/
+            BARCODE_HIBC_QR,                   0, BARCODE_HIBC_PDF,                0, BARCODE_HIBC_MICPDF, /*105-109*/
+                          0, BARCODE_HIBC_BLOCKF,                                                          /*110-111*/
+    };
+    const int orig_symbology = symbol->symbology; /* For self-check */
+    int warn_number = 0;
+
+    if (symbol->symbology == 19) {
+        /* Has specific error message */
+        warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "207: Codabar 18 not supported");
+        if (warn_number >= ZINT_ERROR) {
+            return warn_number;
+        }
+        symbol->symbology = BARCODE_CODABAR;
+    } else if (symbol->symbology == 27) {
+        /* Not mapped */
+        return error_tag(symbol, ZINT_ERROR_INVALID_OPTION, "208: UPCD1 not supported");
+
+    } else if (symbol->symbology <= 0 || symbol->symbology > LIB_ID_MAP_LAST || id_map[symbol->symbology] == 0) {
+        warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "206: Symbology out of range");
+        if (warn_number >= ZINT_ERROR) {
+            return warn_number;
+        }
+        symbol->symbology = BARCODE_CODE128;
+    } else {
+        symbol->symbology = id_map[symbol->symbology];
+    }
+
+    if (symbol->symbology == orig_symbology) { /* Should never happen */
+        assert(0); /* Not reached */
+        return error_tag(symbol, ZINT_ERROR_ENCODING_PROBLEM, "000: Internal error");
+    }
+
+    return warn_number;
+}
+
 /* Encode a barcode. If `length` is 0, `source` must be NUL-terminated */
 int ZBarcode_Encode(struct zint_symbol *symbol, const unsigned char *source, int length) {
     struct zint_seg segs[1];
@@ -925,12 +987,25 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[
     if (seg_count > ZINT_MAX_SEG_COUNT) {
         return error_tag(symbol, ZINT_ERROR_INVALID_DATA, "771: Too many input segments (max 256)");
     }
-    local_segs = (struct zint_seg *) z_alloca(sizeof(struct zint_seg) * (seg_count > 0 ? seg_count : 1));
 
     if ((symbol->input_mode & 0x07) > 2) {
-        symbol->input_mode = DATA_MODE; /* Reset completely TODO: in future, warn/error */
+        symbol->input_mode = DATA_MODE; /* Reset completely */
+        warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "212: Invalid input mode - reset to DATA_MODE");
+        if (warn_number >= ZINT_ERROR) {
+            return warn_number;
+        }
     }
 
+    /* Check the symbology field */
+    if (!ZBarcode_ValidID(symbol->symbology)) {
+        warn_number = map_invalid_symbology(symbol);
+        if (warn_number >= ZINT_ERROR) {
+            return warn_number;
+        }
+    }
+
+    local_segs = (struct zint_seg *) z_alloca(sizeof(struct zint_seg) * (seg_count > 0 ? seg_count : 1));
+
     /* Check segment lengths */
     for (i = 0; i < seg_count; i++) {
         local_segs[i] = segs[i];
@@ -943,9 +1018,8 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[
         }
         if (local_segs[i].length <= 0) {
             if (i == 0) {
-                /* Note: should really be referencing the symbology only after the symbology check switch below */
-                if (is_composite(symbol->symbology) &&
-                        ((symbol->input_mode & 0x07) == GS1_MODE || check_force_gs1(symbol->symbology))) {
+                if (is_composite(symbol->symbology)
+                        && ((symbol->input_mode & 0x07) == GS1_MODE || check_force_gs1(symbol->symbology))) {
                     strcpy(symbol->errtxt, "779: No composite data in 2D component");
                 } else {
                     sprintf(symbol->errtxt, "778: No input data%s",
@@ -1015,111 +1089,6 @@ int ZBarcode_Encode_Segs(struct zint_symbol *symbol, const struct zint_seg segs[
         }
     }
 
-    /* Check the symbology field */
-    if (!ZBarcode_ValidID(symbol->symbology)) {
-        int orig_symbology = symbol->symbology; /* For self-check */
-        if (symbol->symbology < 1) {
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "206: Symbology out of range");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODE128;
-        /* symbol->symbologys 1 to 126 are defined by tbarcode */
-        } else if (symbol->symbology == 5) {
-            symbol->symbology = BARCODE_C25STANDARD;
-        } else if ((symbol->symbology >= 10) && (symbol->symbology <= 12)) {
-            symbol->symbology = BARCODE_EANX;
-        } else if (symbol->symbology == 15) {
-            symbol->symbology = BARCODE_EANX;
-        } else if (symbol->symbology == 17) {
-            symbol->symbology = BARCODE_UPCA;
-        } else if (symbol->symbology == 19) {
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "207: Codabar 18 not supported");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODABAR;
-        } else if (symbol->symbology == 26) { /* UPC-A up to tbarcode 9, ISSN for tbarcode 10+ */
-            symbol->symbology = BARCODE_UPCA;
-        } else if (symbol->symbology == 27) { /* UPCD1 up to tbarcode 9, ISSN + 2 digit add-on for tbarcode 10+ */
-            return error_tag(symbol, ZINT_ERROR_INVALID_OPTION, "208: UPCD1 not supported");
-        } else if (symbol->symbology == 33) {
-            symbol->symbology = BARCODE_GS1_128;
-        } else if (symbol->symbology == 36) {
-            symbol->symbology = BARCODE_UPCA;
-        } else if (symbol->symbology == 39) {
-            symbol->symbology = BARCODE_UPCE;
-        } else if ((symbol->symbology >= 41) && (symbol->symbology <= 45)) {
-            symbol->symbology = BARCODE_POSTNET;
-        } else if (symbol->symbology == 46) {
-            symbol->symbology = BARCODE_PLESSEY;
-        } else if (symbol->symbology == 48) {
-            symbol->symbology = BARCODE_NVE18;
-        } else if ((symbol->symbology == 59) || (symbol->symbology == 61)) {
-            symbol->symbology = BARCODE_CODE128;
-        } else if (symbol->symbology == 62) {
-            symbol->symbology = BARCODE_CODE93;
-        } else if ((symbol->symbology == 64) || (symbol->symbology == 65)) {
-            symbol->symbology = BARCODE_AUSPOST;
-        } else if (symbol->symbology == 78) {
-            symbol->symbology = BARCODE_DBAR_OMN;
-        } else if (symbol->symbology == 83) {
-            symbol->symbology = BARCODE_PLANET;
-        } else if (symbol->symbology == 88) {
-            symbol->symbology = BARCODE_GS1_128;
-        } else if (symbol->symbology == 91) { /* BC412 up to tbarcode 9, Code 32 for tbarcode 10+ */
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "212: Symbology out of range");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODE128;
-        } else if ((symbol->symbology >= 94) && (symbol->symbology <= 95)) {
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "213: Symbology out of range");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODE128;
-        } else if (symbol->symbology == 100) {
-            symbol->symbology = BARCODE_HIBC_128;
-        } else if (symbol->symbology == 101) {
-            symbol->symbology = BARCODE_HIBC_39;
-        } else if (symbol->symbology == 103) {
-            symbol->symbology = BARCODE_HIBC_DM;
-        } else if (symbol->symbology == 105) {
-            symbol->symbology = BARCODE_HIBC_QR;
-        } else if (symbol->symbology == 107) {
-            symbol->symbology = BARCODE_HIBC_PDF;
-        } else if (symbol->symbology == 109) {
-            symbol->symbology = BARCODE_HIBC_MICPDF;
-        } else if (symbol->symbology == 111) {
-            symbol->symbology = BARCODE_HIBC_BLOCKF;
-        } else if ((symbol->symbology == 113) || (symbol->symbology == 114)) {
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "214: Symbology out of range");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODE128;
-        } else if ((symbol->symbology >= 117) && (symbol->symbology <= 127)) {
-            if (symbol->symbology < 119 || symbol->symbology > 121) { /* BARCODE_MAILMARK_2D/4S/UPU_S10 */
-                warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "215: Symbology out of range");
-                if (warn_number >= ZINT_ERROR) {
-                    return warn_number;
-                }
-                symbol->symbology = BARCODE_CODE128;
-            }
-        /* Everything from 128 up is Zint-specific */
-        } else if (symbol->symbology > BARCODE_LAST) {
-            warn_number = error_tag(symbol, ZINT_WARN_INVALID_OPTION, "216: Symbology out of range");
-            if (warn_number >= ZINT_ERROR) {
-                return warn_number;
-            }
-            symbol->symbology = BARCODE_CODE128;
-        }
-        if (symbol->symbology == orig_symbology) { /* Should never happen */
-            return error_tag(symbol, ZINT_ERROR_ENCODING_PROBLEM, "000: Internal error"); /* Not reached */
-        }
-    }
-
     if (seg_count > 1 && !supports_eci(symbol->symbology)) {
         return error_tag(symbol, ZINT_ERROR_INVALID_OPTION, "775: Symbology does not support multiple segments");
     }
@@ -1624,165 +1593,44 @@ int ZBarcode_ValidID(int symbol_id) {
         return 0;
     }
 
-    return barcode_funcs[symbol_id] != NULL;
+    return barcode_src_funcs[symbol_id] != NULL
+            || (symbol_id >= LIB_SEG_FUNCS_START && barcode_seg_funcs[symbol_id - LIB_SEG_FUNCS_START] != NULL);
 }
 
 /* Copy BARCODE_XXX name of `symbol_id` into `name` buffer, NUL-terminated.
-   Returns 0 if valid, non-zero (1 or -1) if not valid */
+   Returns 0 if valid, 1 if not valid */
 int ZBarcode_BarcodeName(int symbol_id, char name[32]) {
-    struct item {
-        const char *name;
-        int define;
-        int val;
-    };
-    static const struct item data[] = {
-        { "", -1, 0 },
-        { "BARCODE_CODE11", BARCODE_CODE11, 1 },
-        { "BARCODE_C25STANDARD", BARCODE_C25STANDARD, 2 },
-        { "BARCODE_C25INTER", BARCODE_C25INTER, 3 },
-        { "BARCODE_C25IATA", BARCODE_C25IATA, 4 },
-        { "", -1, 5 },
-        { "BARCODE_C25LOGIC", BARCODE_C25LOGIC, 6 },
-        { "BARCODE_C25IND", BARCODE_C25IND, 7 },
-        { "BARCODE_CODE39", BARCODE_CODE39, 8 },
-        { "BARCODE_EXCODE39", BARCODE_EXCODE39, 9 },
-        { "", -1, 10 },
-        { "", -1, 11 },
-        { "", -1, 12 },
-        { "BARCODE_EANX", BARCODE_EANX, 13 },
-        { "BARCODE_EANX_CHK", BARCODE_EANX_CHK, 14 },
-        { "", -1, 15 },
-        { "BARCODE_GS1_128", BARCODE_GS1_128, 16 },
-        { "", -1, 17 },
-        { "BARCODE_CODABAR", BARCODE_CODABAR, 18 },
-        { "", -1, 19 },
-        { "BARCODE_CODE128", BARCODE_CODE128, 20 },
-        { "BARCODE_DPLEIT", BARCODE_DPLEIT, 21 },
-        { "BARCODE_DPIDENT", BARCODE_DPIDENT, 22 },
-        { "BARCODE_CODE16K", BARCODE_CODE16K, 23 },
-        { "BARCODE_CODE49", BARCODE_CODE49, 24 },
-        { "BARCODE_CODE93", BARCODE_CODE93, 25 },
-        { "", -1, 26 },
-        { "", -1, 27 },
-        { "BARCODE_FLAT", BARCODE_FLAT, 28 },
-        { "BARCODE_DBAR_OMN", BARCODE_DBAR_OMN, 29 },
-        { "BARCODE_DBAR_LTD", BARCODE_DBAR_LTD, 30 },
-        { "BARCODE_DBAR_EXP", BARCODE_DBAR_EXP, 31 },
-        { "BARCODE_TELEPEN", BARCODE_TELEPEN, 32 },
-        { "", -1, 33 },
-        { "BARCODE_UPCA", BARCODE_UPCA, 34 },
-        { "BARCODE_UPCA_CHK", BARCODE_UPCA_CHK, 35 },
-        { "", -1, 36 },
-        { "BARCODE_UPCE", BARCODE_UPCE, 37 },
-        { "BARCODE_UPCE_CHK", BARCODE_UPCE_CHK, 38 },
-        { "", -1, 39 },
-        { "BARCODE_POSTNET", BARCODE_POSTNET, 40 },
-        { "", -1, 41 },
-        { "", -1, 42 },
-        { "", -1, 43 },
-        { "", -1, 44 },
-        { "", -1, 45 },
-        { "", -1, 46 },
-        { "BARCODE_MSI_PLESSEY", BARCODE_MSI_PLESSEY, 47 },
-        { "", -1, 48 },
-        { "BARCODE_FIM", BARCODE_FIM, 49 },
-        { "BARCODE_LOGMARS", BARCODE_LOGMARS, 50 },
-        { "BARCODE_PHARMA", BARCODE_PHARMA, 51 },
-        { "BARCODE_PZN", BARCODE_PZN, 52 },
-        { "BARCODE_PHARMA_TWO", BARCODE_PHARMA_TWO, 53 },
-        { "BARCODE_CEPNET", BARCODE_CEPNET, 54 },
-        { "BARCODE_PDF417", BARCODE_PDF417, 55 },
-        { "BARCODE_PDF417COMP", BARCODE_PDF417COMP, 56 },
-        { "BARCODE_MAXICODE", BARCODE_MAXICODE, 57 },
-        { "BARCODE_QRCODE", BARCODE_QRCODE, 58 },
-        { "", -1, 59 },
-        { "BARCODE_CODE128AB", BARCODE_CODE128AB, 60 },
-        { "", -1, 61 },
-        { "", -1, 62 },
-        { "BARCODE_AUSPOST", BARCODE_AUSPOST, 63 },
-        { "", -1, 64 },
-        { "", -1, 65 },
-        { "BARCODE_AUSREPLY", BARCODE_AUSREPLY, 66 },
-        { "BARCODE_AUSROUTE", BARCODE_AUSROUTE, 67 },
-        { "BARCODE_AUSREDIRECT", BARCODE_AUSREDIRECT, 68 },
-        { "BARCODE_ISBNX", BARCODE_ISBNX, 69 },
-        { "BARCODE_RM4SCC", BARCODE_RM4SCC, 70 },
-        { "BARCODE_DATAMATRIX", BARCODE_DATAMATRIX, 71 },
-        { "BARCODE_EAN14", BARCODE_EAN14, 72 },
-        { "BARCODE_VIN", BARCODE_VIN, 73 },
-        { "BARCODE_CODABLOCKF", BARCODE_CODABLOCKF, 74 },
-        { "BARCODE_NVE18", BARCODE_NVE18, 75 },
-        { "BARCODE_JAPANPOST", BARCODE_JAPANPOST, 76 },
-        { "BARCODE_KOREAPOST", BARCODE_KOREAPOST, 77 },
-        { "", -1, 78 },
-        { "BARCODE_DBAR_STK", BARCODE_DBAR_STK, 79 },
-        { "BARCODE_DBAR_OMNSTK", BARCODE_DBAR_OMNSTK, 80 },
-        { "BARCODE_DBAR_EXPSTK", BARCODE_DBAR_EXPSTK, 81 },
-        { "BARCODE_PLANET", BARCODE_PLANET, 82 },
-        { "", -1, 83 },
-        { "BARCODE_MICROPDF417", BARCODE_MICROPDF417, 84 },
-        { "BARCODE_USPS_IMAIL", BARCODE_USPS_IMAIL, 85 },
-        { "BARCODE_PLESSEY", BARCODE_PLESSEY, 86 },
-        { "BARCODE_TELEPEN_NUM", BARCODE_TELEPEN_NUM, 87 },
-        { "", -1, 88 },
-        { "BARCODE_ITF14", BARCODE_ITF14, 89 },
-        { "BARCODE_KIX", BARCODE_KIX, 90 },
-        { "", -1, 91 },
-        { "BARCODE_AZTEC", BARCODE_AZTEC, 92 },
-        { "BARCODE_DAFT", BARCODE_DAFT, 93 },
-        { "", -1, 94 },
-        { "", -1, 95 },
-        { "BARCODE_DPD", BARCODE_DPD, 96 },
-        { "BARCODE_MICROQR", BARCODE_MICROQR, 97 },
-        { "BARCODE_HIBC_128", BARCODE_HIBC_128, 98 },
-        { "BARCODE_HIBC_39", BARCODE_HIBC_39, 99 },
-        { "", -1, 100 },
-        { "", -1, 101 },
-        { "BARCODE_HIBC_DM", BARCODE_HIBC_DM, 102 },
-        { "", -1, 103 },
-        { "BARCODE_HIBC_QR", BARCODE_HIBC_QR, 104 },
-        { "", -1, 105 },
-        { "BARCODE_HIBC_PDF", BARCODE_HIBC_PDF, 106 },
-        { "", -1, 107 },
-        { "BARCODE_HIBC_MICPDF", BARCODE_HIBC_MICPDF, 108 },
-        { "", -1, 109 },
-        { "BARCODE_HIBC_BLOCKF", BARCODE_HIBC_BLOCKF, 110 },
-        { "", -1, 111 },
-        { "BARCODE_HIBC_AZTEC", BARCODE_HIBC_AZTEC, 112 },
-        { "", -1, 113 },
-        { "", -1, 114 },
-        { "BARCODE_DOTCODE", BARCODE_DOTCODE, 115 },
-        { "BARCODE_HANXIN", BARCODE_HANXIN, 116 },
-        { "", -1, 117 },
-        { "", -1, 118 },
-        { "BARCODE_MAILMARK_2D", BARCODE_MAILMARK_2D, 119 },
-        { "BARCODE_UPU_S10", BARCODE_UPU_S10, 120 },
-        { "BARCODE_MAILMARK_4S", BARCODE_MAILMARK_4S, 121 },
-        { "", -1, 122 },
-        { "", -1, 123 },
-        { "", -1, 124 },
-        { "", -1, 125 },
-        { "", -1, 126 },
-        { "", -1, 127 },
-        { "BARCODE_AZRUNE", BARCODE_AZRUNE, 128 },
-        { "BARCODE_CODE32", BARCODE_CODE32, 129 },
-        { "BARCODE_EANX_CC", BARCODE_EANX_CC, 130 },
-        { "BARCODE_GS1_128_CC", BARCODE_GS1_128_CC, 131 },
-        { "BARCODE_DBAR_OMN_CC", BARCODE_DBAR_OMN_CC, 132 },
-        { "BARCODE_DBAR_LTD_CC", BARCODE_DBAR_LTD_CC, 133 },
-        { "BARCODE_DBAR_EXP_CC", BARCODE_DBAR_EXP_CC, 134 },
-        { "BARCODE_UPCA_CC", BARCODE_UPCA_CC, 135 },
-        { "BARCODE_UPCE_CC", BARCODE_UPCE_CC, 136 },
-        { "BARCODE_DBAR_STK_CC", BARCODE_DBAR_STK_CC, 137 },
-        { "BARCODE_DBAR_OMNSTK_CC", BARCODE_DBAR_OMNSTK_CC, 138 },
-        { "BARCODE_DBAR_EXPSTK_CC", BARCODE_DBAR_EXPSTK_CC, 139 },
-        { "BARCODE_CHANNEL", BARCODE_CHANNEL, 140 },
-        { "BARCODE_CODEONE", BARCODE_CODEONE, 141 },
-        { "BARCODE_GRIDMATRIX", BARCODE_GRIDMATRIX, 142 },
-        { "BARCODE_UPNQR", BARCODE_UPNQR, 143 },
-        { "BARCODE_ULTRA", BARCODE_ULTRA, 144 },
-        { "BARCODE_RMQR", BARCODE_RMQR, 145 },
-        { "BARCODE_BC412", BARCODE_BC412, 146 },
+    static const char *const names[] = {
+        "",            "CODE11",      "C25STANDARD", "C25INTER",       "C25IATA",        /*0-4*/
+        "",            "C25LOGIC",    "C25IND",      "CODE39",         "EXCODE39",       /*5-9*/
+        "",            "",            "",            "EANX",           "EANX_CHK",       /*10-14*/
+        "",            "GS1_128",     "",            "CODABAR",        "",               /*15-19*/
+        "CODE128",     "DPLEIT",      "DPIDENT",     "CODE16K",        "CODE49",         /*20-24*/
+        "CODE93",      "",            "",            "FLAT",           "DBAR_OMN",       /*25-29*/
+        "DBAR_LTD",    "DBAR_EXP",    "TELEPEN",     "",               "UPCA",           /*30-34*/
+        "UPCA_CHK",    "",            "UPCE",        "UPCE_CHK",       "",               /*35-39*/
+        "POSTNET",     "",            "",            "",               "",               /*40-44*/
+        "",            "",            "MSI_PLESSEY", "",               "FIM",            /*45-49*/
+        "LOGMARS",     "PHARMA",      "PZN",         "PHARMA_TWO",     "CEPNET",         /*50-54*/
+        "PDF417",      "PDF417COMP",  "MAXICODE",    "QRCODE",         "",               /*55-59*/
+        "CODE128AB",   "",            "",            "AUSPOST",        "",               /*60-64*/
+        "",            "AUSREPLY",    "AUSROUTE",    "AUSREDIRECT",    "ISBNX",          /*65-69*/
+        "RM4SCC",      "DATAMATRIX",  "EAN14",       "VIN",            "CODABLOCKF",     /*70-74*/
+        "NVE18",       "JAPANPOST",   "KOREAPOST",   "",               "DBAR_STK",       /*75-79*/
+        "DBAR_OMNSTK", "DBAR_EXPSTK", "PLANET",      "",               "MICROPDF417",    /*80-84*/
+        "USPS_IMAIL",  "PLESSEY",     "TELEPEN_NUM", "",               "ITF14",          /*85-89*/
+        "KIX",         "",            "AZTEC",       "DAFT",            "",              /*90-94*/
+        "",            "DPD",         "MICROQR",     "HIBC_128",       "HIBC_39",        /*95-99*/
+        "",            "",            "HIBC_DM",     "",               "HIBC_QR",        /*100-104*/
+        "",            "HIBC_PDF",    "",            "HIBC_MICPDF",    "",               /*105-109*/
+        "HIBC_BLOCKF", "",            "HIBC_AZTEC",  "",               "",               /*110-114*/
+        "DOTCODE",     "HANXIN",      "",            "",               "MAILMARK_2D",    /*115-119*/
+        "UPU_S10",     "MAILMARK_4S", "",            "",               "",               /*120-124*/
+        "",            "",            "",            "AZRUNE",         "CODE32",         /*125-129*/
+        "EANX_CC",     "GS1_128_CC",  "DBAR_OMN_CC", "DBAR_LTD_CC",    "DBAR_EXP_CC",    /*130-134*/
+        "UPCA_CC",     "UPCE_CC",     "DBAR_STK_CC", "DBAR_OMNSTK_CC", "DBAR_EXPSTK_CC", /*135-139*/
+        "CHANNEL",     "CODEONE",     "GRIDMATRIX",  "UPNQR",          "ULTRA",          /*140-144*/
+        "RMQR",        "BC412",                                                          /*145-146*/
     };
 
     name[0] = '\0';
@@ -1790,15 +1638,10 @@ int ZBarcode_BarcodeName(int symbol_id, char name[32]) {
     if (!ZBarcode_ValidID(symbol_id)) {
         return 1;
     }
-    assert(symbol_id >= 0 && symbol_id < ARRAY_SIZE(data) && data[symbol_id].name[0]);
+    assert(symbol_id >= 0 && symbol_id < ARRAY_SIZE(names) && names[symbol_id][0]);
 
-    /* Self-check, shouldn't happen */
-    if (data[symbol_id].val != symbol_id || (data[symbol_id].define != -1 && data[symbol_id].define != symbol_id)) {
-        assert(0); /* Not reached */
-        return -1;
-    }
-
-    strcpy(name, data[symbol_id].name);
+    memcpy(name, "BARCODE_", 8);
+    strcpy(name + 8, names[symbol_id]);
 
     return 0;
 }
@@ -2210,11 +2053,11 @@ int ZBarcode_NoPng(void) {
 
 /* Return the version of Zint linked to */
 int ZBarcode_Version(void) {
-    if (ZINT_VERSION_BUILD) {
-        return (ZINT_VERSION_MAJOR * 10000) + (ZINT_VERSION_MINOR * 100) + ZINT_VERSION_RELEASE * 10
-                + ZINT_VERSION_BUILD;
-    }
+#if ZINT_VERSION_BUILD
+    return (ZINT_VERSION_MAJOR * 10000) + (ZINT_VERSION_MINOR * 100) + ZINT_VERSION_RELEASE * 10 + ZINT_VERSION_BUILD;
+#else
     return (ZINT_VERSION_MAJOR * 10000) + (ZINT_VERSION_MINOR * 100) + ZINT_VERSION_RELEASE;
+#endif
 }
 
 /* vim: set ts=4 sw=4 et : */
diff --git a/backend/output.h b/backend/output.h
index 3dc18f59..a995eb00 100644
--- a/backend/output.h
+++ b/backend/output.h
@@ -113,11 +113,13 @@ INTERNAL FILE *out_win_fopen(const char *filename, const char *mode);
         bp[3] = (unsigned char) ((*p_u32 >> 24) & 0xFF); \
     } while (0)
 
-/* For more portability, use `#pragma pack()` pair for MSCV, per-type packed attribute otherwise */
-#ifdef _MSC_VER
-#  define OUT_PACK
+/* If `#pragma pack()` not supported, try per-type packed attribute */
+#ifdef __COMPCERT__
+/* Can't use `__attribute__` as may be defined to be no-op by libc if not GNU C or Clang (e.g. glibc does this) */
+#  define OUT_PACK __attribute((__packed__)) /* CompCert C workaround extension `__attribute` */
 #else
-#  define OUT_PACK __attribute__((__packed__))
+#  define OUT_USE_PRAGMA_PACK
+#  define OUT_PACK
 #endif
 
 #ifdef __cplusplus
diff --git a/backend/pcx.h b/backend/pcx.h
index 3debb3db..39b001ce 100644
--- a/backend/pcx.h
+++ b/backend/pcx.h
@@ -1,7 +1,7 @@
 /*  pcx.h - header structure for ZSoft PCX files */
 /*
     libzint - the open source barcode library
-    Copyright (C) 2016-2022 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2016-2024 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack(1)
 #endif
 
@@ -62,7 +62,7 @@ extern "C" {
         uint8_t filler[54];
     } OUT_PACK pcx_header_t;
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack()
 #endif
 
diff --git a/backend/pdf417.c b/backend/pdf417.c
index 285c4aa6..6742f6c0 100644
--- a/backend/pdf417.c
+++ b/backend/pdf417.c
@@ -68,7 +68,7 @@ static const char pdf_smodes[] = { '?', 'A', 'L', 'M', 'P', 'B', 'N' };
 
 /* Return (real) mode text */
 static const char *pdf_mode_str(const int mode) {
-    static const char *modes[3] = { "Text", "Byte", "Number" };
+    static const char modes[3][7] = { "Text", "Byte", "Number" };
     return mode >= PDF_TEX && mode <= PDF_NUM ? modes[mode - PDF_TEX] : "ERROR";
 }
 
diff --git a/backend/ps.c b/backend/ps.c
index 21ffd71c..16ca75c7 100644
--- a/backend/ps.c
+++ b/backend/ps.c
@@ -1,7 +1,7 @@
 /* ps.c - Post Script output */
 /*
     libzint - the open source barcode library
-    Copyright (C) 2009-2023 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2009-2024 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -265,12 +265,11 @@ INTERNAL int ps_plot(struct zint_symbol *symbol) {
     /* Start writing the header */
     fm_puts("%!PS-Adobe-3.0 EPSF-3.0\n"
             "%%Creator: Zint ", fmp);
-    if (ZINT_VERSION_BUILD) {
-        fm_printf(fmp, "%d.%d.%d.%d\n",
-                ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE, ZINT_VERSION_BUILD);
-    } else {
-        fm_printf(fmp, "%d.%d.%d\n", ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE);
-    }
+#if ZINT_VERSION_BUILD
+    fm_printf(fmp, "%d.%d.%d.%d\n", ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE, ZINT_VERSION_BUILD);
+#else
+    fm_printf(fmp, "%d.%d.%d\n", ZINT_VERSION_MAJOR, ZINT_VERSION_MINOR, ZINT_VERSION_RELEASE);
+#endif
     fm_puts("%%Title: Zint Generated Symbol\n"
             "%%Pages: 0\n"
             "%%BoundingBox: 0 0 ", fmp);
diff --git a/backend/qr.c b/backend/qr.c
index e0ee8cc3..9c03ddea 100644
--- a/backend/qr.c
+++ b/backend/qr.c
@@ -383,7 +383,7 @@ static int qr_cci_bits(const int version, const int mode) {
         {  5,  4,  4,  3, },
         {  6,  5,  5,  4, }
     };
-    static const unsigned char *rmqr_ccis[QR_NUM_MODES] = {
+    static const unsigned char *const rmqr_ccis[QR_NUM_MODES] = {
         rmqr_numeric_cci, rmqr_alphanum_cci, rmqr_byte_cci, rmqr_kanji_cci,
     };
     int mode_index = posn(qr_mode_types, (const char) mode);
diff --git a/backend/tests/test_aztec.c b/backend/tests/test_aztec.c
index dc3ffc6a..08ddabb0 100644
--- a/backend/tests/test_aztec.c
+++ b/backend/tests/test_aztec.c
@@ -257,7 +257,7 @@ static void test_options(const testCtx *const p_ctx) {
         /* 15*/ { BARCODE_AZRUNE, -1, -1, -1, -1, { 0, 0, "" }, "A", ZINT_ERROR_INVALID_DATA, -1, -1, "Error 508: Invalid character in data (digits only)" },
         /* 16*/ { BARCODE_AZRUNE, -1, -1, -1, -1, { 0, 0, "" }, "256", ZINT_ERROR_INVALID_DATA, -1, -1, "Error 509: Input out of range (0 to 255)" },
         /* 17*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 1, 2, "" }, "1234567890", 0, 15, 15, "" },
-        /* 18*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 1, 2, "12345678901234567890123456789012" }, "1234567890", 0, 23, 23, "" },
+        /* 18*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 1, 2, {'1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0','1','2','3','4','5','6','7','8','9','0','1','2'} }, "1234567890", 0, 23, 23, "" },
         /* 19*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 1, 1, "" }, "1234567890", ZINT_ERROR_INVALID_OPTION, -1, -1, "Error 701: Structured Append count out of range (2-26)" },
         /* 20*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 0, 2, "" }, "1234567890", ZINT_ERROR_INVALID_OPTION, -1, -1, "Error 702: Structured Append index out of range (1-2)" },
         /* 21*/ { BARCODE_AZTEC, -1, -1, -1, -1, { 3, 2, "" }, "1234567890", ZINT_ERROR_INVALID_OPTION, -1, -1, "Error 702: Structured Append index out of range (1-2)" },
diff --git a/backend/tests/test_library.c b/backend/tests/test_library.c
index 7a4fe08e..c8adf11b 100644
--- a/backend/tests/test_library.c
+++ b/backend/tests/test_library.c
@@ -151,12 +151,12 @@ static void test_checks(const testCtx *const p_ctx) {
         /* 87*/ { 88, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 252: Data does not start with an AI", BARCODE_GS1_128 },
         /* 88*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_GS1_128 },
         /* 89*/ { 88, -1, "[10]12", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_GS1_128 },
-        /* 90*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 212: Symbology out of range", BARCODE_CODE128 },
-        /* 91*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 212: Symbology out of range", -1 },
-        /* 92*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
-        /* 93*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
-        /* 94*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 213: Symbology out of range", BARCODE_CODE128 },
-        /* 95*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 213: Symbology out of range", -1 },
+        /* 90*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /* 91*/ { 91, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 92*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /* 93*/ { 94, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /* 94*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /* 95*/ { 95, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
         /* 96*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_128 },
         /* 97*/ { 100, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_128 },
         /* 98*/ { 101, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_39 },
@@ -171,30 +171,30 @@ static void test_checks(const testCtx *const p_ctx) {
         /*107*/ { 109, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_MICPDF },
         /*108*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, 0, "", BARCODE_HIBC_BLOCKF },
         /*109*/ { 111, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, 0, "", BARCODE_HIBC_BLOCKF },
-        /*110*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
-        /*111*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
-        /*112*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 214: Symbology out of range", BARCODE_CODE128 },
-        /*113*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 214: Symbology out of range", -1 },
-        /*114*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*115*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*116*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*117*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*118*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*119*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*120*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*121*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*122*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*123*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*124*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*125*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*126*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*127*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*128*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 215: Symbology out of range", BARCODE_CODE128 },
-        /*129*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 215: Symbology out of range", -1 },
-        /*130*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
-        /*131*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
-        /*132*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 216: Symbology out of range", BARCODE_CODE128 },
-        /*133*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 216: Symbology out of range", -1 },
+        /*110*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*111*/ { 113, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*112*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*113*/ { 114, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*114*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*115*/ { 117, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*116*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*117*/ { 118, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*118*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*119*/ { 122, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*120*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*121*/ { 123, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*122*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*123*/ { 124, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*124*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*125*/ { 125, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*126*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*127*/ { 126, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*128*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*129*/ { 127, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*130*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*131*/ { 147, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
+        /*132*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_INVALID_OPTION, "Warning 206: Symbology out of range", BARCODE_CODE128 },
+        /*133*/ { BARCODE_LAST + 1, -1, "1", -1, -1, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_INVALID_OPTION, "Error 206: Symbology out of range", -1 },
         /*134*/ { BARCODE_CODE128, -1, "\200", -1, UNICODE_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_ERROR_INVALID_DATA, "Error 245: Invalid UTF-8 in input data", -1 },
         /*135*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, -1, ZINT_WARN_NONCOMPLIANT, "Warning 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
         /*136*/ { BARCODE_GS1_128, -1, "[01]12345678901234", -1, GS1_MODE, -1, 0, 0, 0, 0, -1, -1, 0, -1, WARN_FAIL_ALL, ZINT_ERROR_NONCOMPLIANT, "Error 261: AI (01) position 14: Bad checksum '4', expected '1'", -1 },
@@ -394,6 +394,95 @@ static void test_input_data(const testCtx *const p_ctx) {
     testFinish();
 }
 
+static int test_prev_map_invalid_symbology(int *p_symbology) {
+    int symbology = *p_symbology;
+    int warn_number = 0;
+
+    if (symbology < 1) {
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODE128;
+    /* symbol->symbologys 1 to 126 are defined by tbarcode */
+    } else if (symbology == 5) {
+        symbology = BARCODE_C25STANDARD;
+    } else if ((symbology >= 10) && (symbology <= 12)) {
+        symbology = BARCODE_EANX;
+    } else if (symbology == 15) {
+        symbology = BARCODE_EANX;
+    } else if (symbology == 17) {
+        symbology = BARCODE_UPCA;
+    } else if (symbology == 19) {
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODABAR;
+    } else if (symbology == 26) { /* UPC-A up to tbarcode 9, ISSN for tbarcode 10+ */
+        symbology = BARCODE_UPCA;
+    } else if (symbology == 27) { /* UPCD1 up to tbarcode 9, ISSN + 2 digit add-on for tbarcode 10+ */
+        return ZINT_ERROR_INVALID_OPTION;
+    } else if (symbology == 33) {
+        symbology = BARCODE_GS1_128;
+    } else if (symbology == 36) {
+        symbology = BARCODE_UPCA;
+    } else if (symbology == 39) {
+        symbology = BARCODE_UPCE;
+    } else if ((symbology >= 41) && (symbology <= 45)) {
+        symbology = BARCODE_POSTNET;
+    } else if (symbology == 46) {
+        symbology = BARCODE_PLESSEY;
+    } else if (symbology == 48) {
+        symbology = BARCODE_NVE18;
+    } else if ((symbology == 59) || (symbology == 61)) {
+        symbology = BARCODE_CODE128;
+    } else if (symbology == 62) {
+        symbology = BARCODE_CODE93;
+    } else if ((symbology == 64) || (symbology == 65)) {
+        symbology = BARCODE_AUSPOST;
+    } else if (symbology == 78) {
+        symbology = BARCODE_DBAR_OMN;
+    } else if (symbology == 83) {
+        symbology = BARCODE_PLANET;
+    } else if (symbology == 88) {
+        symbology = BARCODE_GS1_128;
+    } else if (symbology == 91) { /* BC412 up to tbarcode 9, Code 32 for tbarcode 10+ */
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODE128;
+    } else if ((symbology >= 94) && (symbology <= 95)) {
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODE128;
+    } else if (symbology == 100) {
+        symbology = BARCODE_HIBC_128;
+    } else if (symbology == 101) {
+        symbology = BARCODE_HIBC_39;
+    } else if (symbology == 103) {
+        symbology = BARCODE_HIBC_DM;
+    } else if (symbology == 105) {
+        symbology = BARCODE_HIBC_QR;
+    } else if (symbology == 107) {
+        symbology = BARCODE_HIBC_PDF;
+    } else if (symbology == 109) {
+        symbology = BARCODE_HIBC_MICPDF;
+    } else if (symbology == 111) {
+        symbology = BARCODE_HIBC_BLOCKF;
+    } else if ((symbology == 113) || (symbology == 114)) {
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODE128;
+    } else if ((symbology >= 117) && (symbology <= 127)) {
+        if (symbology < 119 || symbology > 121) { /* BARCODE_MAILMARK_2D/4S/UPU_S10 */
+            warn_number = ZINT_WARN_INVALID_OPTION;
+            symbology = BARCODE_CODE128;
+        }
+    /* Everything from 128 up is Zint-specific */
+    } else if (symbology > BARCODE_LAST) {
+        warn_number = ZINT_WARN_INVALID_OPTION;
+        symbology = BARCODE_CODE128;
+    }
+    if (symbology == *p_symbology) { /* Should never happen */
+        return ZINT_ERROR_ENCODING_PROBLEM;
+    }
+
+    *p_symbology = symbology;
+
+    return warn_number;
+}
+
 static void test_symbologies(const testCtx *const p_ctx) {
     int i, ret;
     struct zint_symbol symbol = {0};
@@ -404,8 +493,21 @@ static void test_symbologies(const testCtx *const p_ctx) {
         if (testContinue(p_ctx, i)) continue;
 
         symbol.symbology = i;
-        ret = ZBarcode_Encode(&symbol, TU("1"), 0);
+        ret = ZBarcode_Encode(&symbol, TU(""), 0);
         assert_notequal(ret, ZINT_ERROR_ENCODING_PROBLEM, "i:%d Encoding problem (%s)\n", i, symbol.errtxt);
+
+        if (!ZBarcode_ValidID(i)) {
+            int prev_symbology = i;
+            int prev_ret = test_prev_map_invalid_symbology(&prev_symbology);
+            if (ret != ZINT_ERROR_INVALID_DATA) {
+                assert_equal(prev_ret, ret, "i:%d prev_ret (%d) != ret (%d)\n", i, prev_ret, ret);
+            }
+            assert_equal(prev_symbology, symbol.symbology, "i:%d prev_symbology (%d) != symbol.symbology (%d)\n",
+                            i, prev_symbology, symbol.symbology);
+        } else {
+            /* No input data */
+            assert_equal(ret, ZINT_ERROR_INVALID_DATA, "i:%d ret (%d) != ZINT_ERROR_INVALID_DATA\n", i, ret);
+        }
     }
 
     testFinish();
@@ -420,20 +522,21 @@ static void test_input_mode(const testCtx *const p_ctx) {
         int ret;
 
         int expected_input_mode;
+        char *expected_errtxt;
     };
     /* s/\/\*[ 0-9]*\*\//\=printf("\/\*%3d*\/", line(".") - line("'<")): */
     struct item data[] = {
-        /*  0*/ { "1234", DATA_MODE, 0, DATA_MODE },
-        /*  1*/ { "1234", DATA_MODE | ESCAPE_MODE, 0, DATA_MODE | ESCAPE_MODE },
-        /*  2*/ { "1234", UNICODE_MODE, 0, UNICODE_MODE },
-        /*  3*/ { "1234", UNICODE_MODE | ESCAPE_MODE, 0, UNICODE_MODE | ESCAPE_MODE },
-        /*  4*/ { "[01]12345678901231", GS1_MODE, 0, GS1_MODE },
-        /*  5*/ { "[01]12345678901231", GS1_MODE | ESCAPE_MODE, 0, GS1_MODE | ESCAPE_MODE },
-        /*  6*/ { "1234", 4 | ESCAPE_MODE, 0, DATA_MODE }, /* Unknown mode reset to bare DATA_MODE */
-        /*  7*/ { "1234", -1, 0, DATA_MODE },
-        /*  8*/ { "1234", DATA_MODE | 0x10, 0, DATA_MODE | 0x10 }, /* Unknown flags kept (but ignored) */
-        /*  9*/ { "1234", UNICODE_MODE | 0x10, 0, UNICODE_MODE | 0x10 },
-        /* 10*/ { "[01]12345678901231", GS1_MODE | 0x20, 0, GS1_MODE | 0x20 },
+        /*  0*/ { "1234", DATA_MODE, 0, DATA_MODE, "" },
+        /*  1*/ { "1234", DATA_MODE | ESCAPE_MODE, 0, DATA_MODE | ESCAPE_MODE, "" },
+        /*  2*/ { "1234", UNICODE_MODE, 0, UNICODE_MODE, "" },
+        /*  3*/ { "1234", UNICODE_MODE | ESCAPE_MODE, 0, UNICODE_MODE | ESCAPE_MODE, "" },
+        /*  4*/ { "[01]12345678901231", GS1_MODE, 0, GS1_MODE, "" },
+        /*  5*/ { "[01]12345678901231", GS1_MODE | ESCAPE_MODE, 0, GS1_MODE | ESCAPE_MODE, "" },
+        /*  6*/ { "1234", 4 | ESCAPE_MODE, ZINT_WARN_INVALID_OPTION, DATA_MODE, "Warning 212: Invalid input mode - reset to DATA_MODE" }, /* Unknown mode reset to bare DATA_MODE. Note: now warns */
+        /*  7*/ { "1234", -1, 0, DATA_MODE, "" },
+        /*  8*/ { "1234", DATA_MODE | 0x10, 0, DATA_MODE | 0x10, "" }, /* Unknown flags kept (but ignored) */
+        /*  9*/ { "1234", UNICODE_MODE | 0x10, 0, UNICODE_MODE | 0x10, "" },
+        /* 10*/ { "[01]12345678901231", GS1_MODE | 0x20, 0, GS1_MODE | 0x20, "" },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
@@ -453,6 +556,7 @@ static void test_input_mode(const testCtx *const p_ctx) {
         ret = ZBarcode_Encode(symbol, TU(data[i].data), length);
         assert_equal(ret, data[i].ret, "i:%d ZBarcode_Encode ret %d != %d (%s)\n", i, ret, data[i].ret, symbol->errtxt);
         assert_equal(symbol->input_mode, data[i].expected_input_mode, "i:%d symbol->input_mode %d != %d\n", i, symbol->input_mode, data[i].expected_input_mode);
+        assert_zero(strcmp(symbol->errtxt, data[i].expected_errtxt), "i:%d ZBarcode_Encode strcmp(%s, %s) != 0\n", i, symbol->errtxt, data[i].expected_errtxt);
 
         ZBarcode_Delete(symbol);
     }
@@ -725,7 +829,7 @@ static void test_cap(const testCtx *const p_ctx) {
     };
     int data_size = ARRAY_SIZE(data);
     int i;
-    unsigned int ret;
+    unsigned int uret;
 
     testStart("test_cap");
 
@@ -733,8 +837,8 @@ static void test_cap(const testCtx *const p_ctx) {
 
         if (testContinue(p_ctx, i)) continue;
 
-        ret = ZBarcode_Cap(data[i].symbology, data[i].cap_flag);
-        assert_equal(ret, data[i].expected, "i:%d ZBarcode_Cap(%s, 0x%X) 0x%X != 0x%X\n", i, testUtilBarcodeName(data[i].symbology), data[i].cap_flag, ret, data[i].expected);
+        uret = ZBarcode_Cap(data[i].symbology, data[i].cap_flag);
+        assert_equal(uret, data[i].expected, "i:%d ZBarcode_Cap(%s, 0x%X) 0x%X != 0x%X\n", i, testUtilBarcodeName(data[i].symbology), data[i].cap_flag, uret, data[i].expected);
     }
 
     testFinish();
@@ -742,7 +846,7 @@ static void test_cap(const testCtx *const p_ctx) {
 
 static void test_cap_compliant_height(const testCtx *const p_ctx) {
     int symbol_id;
-    int ret;
+    unsigned int uret;
 
     testStart("test_cap_compliant_height");
 
@@ -750,7 +854,7 @@ static void test_cap_compliant_height(const testCtx *const p_ctx) {
         if (!ZBarcode_ValidID(symbol_id)) continue;
         if (testContinue(p_ctx, symbol_id)) continue;
 
-        ret = ZBarcode_Cap(symbol_id, ZINT_CAP_COMPLIANT_HEIGHT);
+        uret = ZBarcode_Cap(symbol_id, ZINT_CAP_COMPLIANT_HEIGHT);
 
         switch (symbol_id) {
             /*case BARCODE_CODE11: TODO: Find doc */
@@ -822,10 +926,10 @@ static void test_cap_compliant_height(const testCtx *const p_ctx) {
             case BARCODE_DBAR_EXPSTK_CC:
             case BARCODE_CHANNEL:
             case BARCODE_BC412:
-                assert_equal(ret, ZINT_CAP_COMPLIANT_HEIGHT, "symbol_id %d (%s) ret 0x%X != ZINT_CAP_COMPLIANT_HEIGHT\n", symbol_id, testUtilBarcodeName(symbol_id), ret);
+                assert_equal(uret, ZINT_CAP_COMPLIANT_HEIGHT, "symbol_id %d (%s) uret 0x%X != ZINT_CAP_COMPLIANT_HEIGHT\n", symbol_id, testUtilBarcodeName(symbol_id), uret);
                 break;
             default:
-                assert_zero(ret, "symbol_id %d (%s) ret 0x%X non-zero\n", symbol_id, testUtilBarcodeName(symbol_id), ret);
+                assert_zero(uret, "symbol_id %d (%s) uret 0x%X non-zero\n", symbol_id, testUtilBarcodeName(symbol_id), uret);
                 break;
         }
     }
@@ -849,7 +953,7 @@ static void test_encode_file_empty(const testCtx *const p_ctx) {
     (void) testUtilRemove(filename); /* In case junk hanging around */
 
     fstream = testUtilOpen(filename, "w+");
-    assert_nonnull(fstream, "testUtilOpen(%s) failed (%d)\n", filename, ferror(fstream));
+    assert_nonnull(fstream, "testUtilOpen(%s) failed (%d)\n", filename, errno);
     ret = fclose(fstream);
     assert_zero(ret, "fclose(%s) %d != 0\n", filename, ret);
 
@@ -881,7 +985,7 @@ static void test_encode_file_too_large(const testCtx *const p_ctx) {
     (void) testUtilRemove(filename); /* In case junk hanging around */
 
     fstream = testUtilOpen(filename, "w+");
-    assert_nonnull(fstream, "testUtilOpen(%s) failed (%d)\n", filename, ferror(fstream));
+    assert_nonnull(fstream, "testUtilOpen(%s) failed (%d)\n", filename, errno);
     ret = (int) fwrite(buf, 1, sizeof(buf), fstream);
     assert_equal(ret, sizeof(buf), "fwrite return value: %d != %d\n", ret, (int)sizeof(buf));
     ret = fclose(fstream);
@@ -994,7 +1098,7 @@ static void test_encode_file(const testCtx *const p_ctx) {
     (void) testUtilRemove(outfile); /* In case junk hanging around */
 
     fp = testUtilOpen(filename, "w+");
-    assert_nonnull(fp, "testUtilOpen(%s) failed (%d)\n", filename, ferror(fp));
+    assert_nonnull(fp, "testUtilOpen(%s) failed (%d)\n", filename, errno);
     assert_notequal(fputs(data, fp), EOF, "fputs(%s) failed == EOF (%d)\n", data, ferror(fp));
     ret = fclose(fp);
     assert_zero(ret, "fclose(%s) %d != 0\n", filename, ret);
@@ -1073,6 +1177,7 @@ static void test_encode_print_outfile_directory(const testCtx *const p_ctx) {
 
 static void test_bad_args(const testCtx *const p_ctx) {
     int ret;
+    unsigned int uret;
     struct zint_symbol *symbol;
     char *data = "1";
     char *filename = "1.png";
@@ -1096,10 +1201,10 @@ static void test_bad_args(const testCtx *const p_ctx) {
     assert_zero(ZBarcode_ValidID(0), "ZBarcode_ValidID(0) non-zero\n");
     assert_zero(ZBarcode_ValidID(10), "ZBarcode_ValidID(10) non-zero\n"); /* Note 10 remapped to BARCODE_EANX in ZBarcode_Encode() for tbarcode compat but not counted as valid */
 
-    ret = ZBarcode_Cap(0, ~0);
-    assert_zero(ret, "ZBarcode_Cap(0, ~0) ret 0x%X != 0\n", ret);
-    ret = ZBarcode_Cap(10, ~0);
-    assert_zero(ret, "ZBarcode_Cap(10, ~0) ret 0x%X != 0\n", ret);
+    uret = ZBarcode_Cap(0, ~0);
+    assert_zero(uret, "ZBarcode_Cap(0, ~0) uret 0x%X != 0\n", uret);
+    uret = ZBarcode_Cap(10, ~0);
+    assert_zero(uret, "ZBarcode_Cap(10, ~0) uret 0x%X != 0\n", uret);
 
     /* NULL symbol */
     assert_equal(ZBarcode_Encode(NULL, TU(data), 1), ZINT_ERROR_INVALID_DATA, "ZBarcode_Encode(NULL, data, 1) != ZINT_ERROR_INVALID_DATA\n");
@@ -1240,6 +1345,210 @@ static void test_valid_id(const testCtx *const p_ctx) {
     testFinish();
 }
 
+static int test_prev_ZBarcode_BarcodeName(int symbol_id, char name[32]) {
+    struct item {
+        const char *name;
+        int define;
+        int val;
+    };
+    static const struct item data[] = {
+        { "", -1, 0 },
+        { "BARCODE_CODE11", BARCODE_CODE11, 1 },
+        { "BARCODE_C25STANDARD", BARCODE_C25STANDARD, 2 },
+        { "BARCODE_C25INTER", BARCODE_C25INTER, 3 },
+        { "BARCODE_C25IATA", BARCODE_C25IATA, 4 },
+        { "", -1, 5 },
+        { "BARCODE_C25LOGIC", BARCODE_C25LOGIC, 6 },
+        { "BARCODE_C25IND", BARCODE_C25IND, 7 },
+        { "BARCODE_CODE39", BARCODE_CODE39, 8 },
+        { "BARCODE_EXCODE39", BARCODE_EXCODE39, 9 },
+        { "", -1, 10 },
+        { "", -1, 11 },
+        { "", -1, 12 },
+        { "BARCODE_EANX", BARCODE_EANX, 13 },
+        { "BARCODE_EANX_CHK", BARCODE_EANX_CHK, 14 },
+        { "", -1, 15 },
+        { "BARCODE_GS1_128", BARCODE_GS1_128, 16 },
+        { "", -1, 17 },
+        { "BARCODE_CODABAR", BARCODE_CODABAR, 18 },
+        { "", -1, 19 },
+        { "BARCODE_CODE128", BARCODE_CODE128, 20 },
+        { "BARCODE_DPLEIT", BARCODE_DPLEIT, 21 },
+        { "BARCODE_DPIDENT", BARCODE_DPIDENT, 22 },
+        { "BARCODE_CODE16K", BARCODE_CODE16K, 23 },
+        { "BARCODE_CODE49", BARCODE_CODE49, 24 },
+        { "BARCODE_CODE93", BARCODE_CODE93, 25 },
+        { "", -1, 26 },
+        { "", -1, 27 },
+        { "BARCODE_FLAT", BARCODE_FLAT, 28 },
+        { "BARCODE_DBAR_OMN", BARCODE_DBAR_OMN, 29 },
+        { "BARCODE_DBAR_LTD", BARCODE_DBAR_LTD, 30 },
+        { "BARCODE_DBAR_EXP", BARCODE_DBAR_EXP, 31 },
+        { "BARCODE_TELEPEN", BARCODE_TELEPEN, 32 },
+        { "", -1, 33 },
+        { "BARCODE_UPCA", BARCODE_UPCA, 34 },
+        { "BARCODE_UPCA_CHK", BARCODE_UPCA_CHK, 35 },
+        { "", -1, 36 },
+        { "BARCODE_UPCE", BARCODE_UPCE, 37 },
+        { "BARCODE_UPCE_CHK", BARCODE_UPCE_CHK, 38 },
+        { "", -1, 39 },
+        { "BARCODE_POSTNET", BARCODE_POSTNET, 40 },
+        { "", -1, 41 },
+        { "", -1, 42 },
+        { "", -1, 43 },
+        { "", -1, 44 },
+        { "", -1, 45 },
+        { "", -1, 46 },
+        { "BARCODE_MSI_PLESSEY", BARCODE_MSI_PLESSEY, 47 },
+        { "", -1, 48 },
+        { "BARCODE_FIM", BARCODE_FIM, 49 },
+        { "BARCODE_LOGMARS", BARCODE_LOGMARS, 50 },
+        { "BARCODE_PHARMA", BARCODE_PHARMA, 51 },
+        { "BARCODE_PZN", BARCODE_PZN, 52 },
+        { "BARCODE_PHARMA_TWO", BARCODE_PHARMA_TWO, 53 },
+        { "BARCODE_CEPNET", BARCODE_CEPNET, 54 },
+        { "BARCODE_PDF417", BARCODE_PDF417, 55 },
+        { "BARCODE_PDF417COMP", BARCODE_PDF417COMP, 56 },
+        { "BARCODE_MAXICODE", BARCODE_MAXICODE, 57 },
+        { "BARCODE_QRCODE", BARCODE_QRCODE, 58 },
+        { "", -1, 59 },
+        { "BARCODE_CODE128AB", BARCODE_CODE128AB, 60 },
+        { "", -1, 61 },
+        { "", -1, 62 },
+        { "BARCODE_AUSPOST", BARCODE_AUSPOST, 63 },
+        { "", -1, 64 },
+        { "", -1, 65 },
+        { "BARCODE_AUSREPLY", BARCODE_AUSREPLY, 66 },
+        { "BARCODE_AUSROUTE", BARCODE_AUSROUTE, 67 },
+        { "BARCODE_AUSREDIRECT", BARCODE_AUSREDIRECT, 68 },
+        { "BARCODE_ISBNX", BARCODE_ISBNX, 69 },
+        { "BARCODE_RM4SCC", BARCODE_RM4SCC, 70 },
+        { "BARCODE_DATAMATRIX", BARCODE_DATAMATRIX, 71 },
+        { "BARCODE_EAN14", BARCODE_EAN14, 72 },
+        { "BARCODE_VIN", BARCODE_VIN, 73 },
+        { "BARCODE_CODABLOCKF", BARCODE_CODABLOCKF, 74 },
+        { "BARCODE_NVE18", BARCODE_NVE18, 75 },
+        { "BARCODE_JAPANPOST", BARCODE_JAPANPOST, 76 },
+        { "BARCODE_KOREAPOST", BARCODE_KOREAPOST, 77 },
+        { "", -1, 78 },
+        { "BARCODE_DBAR_STK", BARCODE_DBAR_STK, 79 },
+        { "BARCODE_DBAR_OMNSTK", BARCODE_DBAR_OMNSTK, 80 },
+        { "BARCODE_DBAR_EXPSTK", BARCODE_DBAR_EXPSTK, 81 },
+        { "BARCODE_PLANET", BARCODE_PLANET, 82 },
+        { "", -1, 83 },
+        { "BARCODE_MICROPDF417", BARCODE_MICROPDF417, 84 },
+        { "BARCODE_USPS_IMAIL", BARCODE_USPS_IMAIL, 85 },
+        { "BARCODE_PLESSEY", BARCODE_PLESSEY, 86 },
+        { "BARCODE_TELEPEN_NUM", BARCODE_TELEPEN_NUM, 87 },
+        { "", -1, 88 },
+        { "BARCODE_ITF14", BARCODE_ITF14, 89 },
+        { "BARCODE_KIX", BARCODE_KIX, 90 },
+        { "", -1, 91 },
+        { "BARCODE_AZTEC", BARCODE_AZTEC, 92 },
+        { "BARCODE_DAFT", BARCODE_DAFT, 93 },
+        { "", -1, 94 },
+        { "", -1, 95 },
+        { "BARCODE_DPD", BARCODE_DPD, 96 },
+        { "BARCODE_MICROQR", BARCODE_MICROQR, 97 },
+        { "BARCODE_HIBC_128", BARCODE_HIBC_128, 98 },
+        { "BARCODE_HIBC_39", BARCODE_HIBC_39, 99 },
+        { "", -1, 100 },
+        { "", -1, 101 },
+        { "BARCODE_HIBC_DM", BARCODE_HIBC_DM, 102 },
+        { "", -1, 103 },
+        { "BARCODE_HIBC_QR", BARCODE_HIBC_QR, 104 },
+        { "", -1, 105 },
+        { "BARCODE_HIBC_PDF", BARCODE_HIBC_PDF, 106 },
+        { "", -1, 107 },
+        { "BARCODE_HIBC_MICPDF", BARCODE_HIBC_MICPDF, 108 },
+        { "", -1, 109 },
+        { "BARCODE_HIBC_BLOCKF", BARCODE_HIBC_BLOCKF, 110 },
+        { "", -1, 111 },
+        { "BARCODE_HIBC_AZTEC", BARCODE_HIBC_AZTEC, 112 },
+        { "", -1, 113 },
+        { "", -1, 114 },
+        { "BARCODE_DOTCODE", BARCODE_DOTCODE, 115 },
+        { "BARCODE_HANXIN", BARCODE_HANXIN, 116 },
+        { "", -1, 117 },
+        { "", -1, 118 },
+        { "BARCODE_MAILMARK_2D", BARCODE_MAILMARK_2D, 119 },
+        { "BARCODE_UPU_S10", BARCODE_UPU_S10, 120 },
+        { "BARCODE_MAILMARK_4S", BARCODE_MAILMARK_4S, 121 },
+        { "", -1, 122 },
+        { "", -1, 123 },
+        { "", -1, 124 },
+        { "", -1, 125 },
+        { "", -1, 126 },
+        { "", -1, 127 },
+        { "BARCODE_AZRUNE", BARCODE_AZRUNE, 128 },
+        { "BARCODE_CODE32", BARCODE_CODE32, 129 },
+        { "BARCODE_EANX_CC", BARCODE_EANX_CC, 130 },
+        { "BARCODE_GS1_128_CC", BARCODE_GS1_128_CC, 131 },
+        { "BARCODE_DBAR_OMN_CC", BARCODE_DBAR_OMN_CC, 132 },
+        { "BARCODE_DBAR_LTD_CC", BARCODE_DBAR_LTD_CC, 133 },
+        { "BARCODE_DBAR_EXP_CC", BARCODE_DBAR_EXP_CC, 134 },
+        { "BARCODE_UPCA_CC", BARCODE_UPCA_CC, 135 },
+        { "BARCODE_UPCE_CC", BARCODE_UPCE_CC, 136 },
+        { "BARCODE_DBAR_STK_CC", BARCODE_DBAR_STK_CC, 137 },
+        { "BARCODE_DBAR_OMNSTK_CC", BARCODE_DBAR_OMNSTK_CC, 138 },
+        { "BARCODE_DBAR_EXPSTK_CC", BARCODE_DBAR_EXPSTK_CC, 139 },
+        { "BARCODE_CHANNEL", BARCODE_CHANNEL, 140 },
+        { "BARCODE_CODEONE", BARCODE_CODEONE, 141 },
+        { "BARCODE_GRIDMATRIX", BARCODE_GRIDMATRIX, 142 },
+        { "BARCODE_UPNQR", BARCODE_UPNQR, 143 },
+        { "BARCODE_ULTRA", BARCODE_ULTRA, 144 },
+        { "BARCODE_RMQR", BARCODE_RMQR, 145 },
+        { "BARCODE_BC412", BARCODE_BC412, 146 },
+    };
+
+    name[0] = '\0';
+
+    if (!ZBarcode_ValidID(symbol_id)) {
+        return 1;
+    }
+    if (!(symbol_id >= 0 && symbol_id < ARRAY_SIZE(data) && data[symbol_id].name[0])) {
+        return -1; /* Shouldn't happen */
+    }
+
+    /* Self-check, shouldn't happen */
+    if (data[symbol_id].val != symbol_id || (data[symbol_id].define != -1 && data[symbol_id].define != symbol_id)) {
+        return -1;
+    }
+
+    strcpy(name, data[symbol_id].name);
+
+    return 0;
+}
+
+static void test_barcode_name(const testCtx *const p_ctx) {
+
+    int ret;
+    char name[32];
+    int symbol_id;
+
+    (void)p_ctx;
+
+    testStart("test_barcode_name");
+
+    for (symbol_id = -1; symbol_id < 160; symbol_id++) {
+        int prev_ret;
+        char prev_name[32];
+        ret = ZBarcode_BarcodeName(symbol_id, name);
+        if (ZBarcode_ValidID(symbol_id)) {
+            assert_equal(ret, 0, "ZBarcode_BarcodeName(%d) != 0\n", symbol_id);
+            assert_nonzero(*name != '\0', "ZBarcode_BarcodeName(%d) empty when ZBarcode_Valid() true\n", symbol_id);
+        } else {
+            assert_equal(ret, 1, "ZBarcode_BarcodeName(%d) != 1\n", symbol_id);
+            assert_zero(*name, "ZBarcode_BarcodeName(%d) non-empty when ZBarcode_Valid() false\n", symbol_id);
+        }
+        prev_ret = test_prev_ZBarcode_BarcodeName(symbol_id, prev_name);
+        assert_equal(ret, prev_ret, "ZBarcode_BarcodeName(%d) ret %d != prev_ret %d\n", symbol_id, ret, prev_ret);
+        assert_zero(strcmp(name, prev_name), "ZBarcode_BarcodeName(%d) strcmp(%s, %s) != 0\n", symbol_id, name, prev_name);
+    }
+
+    testFinish();
+}
+
 INTERNAL int error_tag_test(struct zint_symbol *symbol, int error_number, const char *error_string);
 
 static void test_error_tag(const testCtx *const p_ctx) {
@@ -1826,6 +2135,7 @@ int main(int argc, char *argv[]) {
         { "test_encode_print_outfile_directory", test_encode_print_outfile_directory },
         { "test_bad_args", test_bad_args },
         { "test_valid_id", test_valid_id },
+        { "test_barcode_name", test_barcode_name },
         { "test_error_tag", test_error_tag },
         { "test_strip_bom", test_strip_bom },
         { "test_zero_outfile", test_zero_outfile },
diff --git a/backend/tests/test_qr.c b/backend/tests/test_qr.c
index 9cb97360..dbeef22d 100644
--- a/backend/tests/test_qr.c
+++ b/backend/tests/test_qr.c
@@ -1,6 +1,6 @@
 /*
     libzint - the open source barcode library
-    Copyright (C) 2019-2023 Robin Stuart <rstuart114@gmail.com>
+    Copyright (C) 2019-2024 Robin Stuart <rstuart114@gmail.com>
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -406,21 +406,21 @@ static void test_qr_input(const testCtx *const p_ctx) {
         /*126*/ { UNICODE_MODE, 16384, 4, 8 << 8, "é", 0, 16384, "7C 04 00 04 02 C3 A9 00 EC", 1, 1, "ECI-16384 B2 (no conversion)" },
         /*127*/ { UNICODE_MODE, 3, 4, -1, "product:Google Pixel 4a - 128 GB of Storage - Black;price:$439.97", 0, 3, "(86) 70 34 39 70 72 6F 64 75 63 74 3A 47 6F 6F 67 6C 65 20 50 69 78 65 6C 20 34 61 20 2D", 0, 1, "ECI-3 B57 A8; BWIPP different encodation (B65)" },
         /*128*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\176", 0, 0, "80 10 1F 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0x817E)" },
-        /*129*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\177", 0, 0, "40 28 17 F0 EC 11 EC 11 EC", 0, 1, "B2 (0x817F previously used Kanji mode, now excludes trailing 0x7F); BWIPP TODO: exclude also" },
+        /*129*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\177", 0, 0, "40 28 17 F0 EC 11 EC 11 EC", 1, 1, "B2 (0x817F previously used Kanji mode, now excludes trailing 0x7F)" },
         /*130*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\200", 0, 0, "80 10 20 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0x8180)" },
         /*131*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\237\176", 0, 0, "80 1B 5F 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0x9F7E)" },
-        /*132*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\237\177", 0, 0, "40 29 F7 F0 EC 11 EC 11 EC", 0, 1, "B2 (0x9F7F previously used Kanji mode, now excludes trailing 0x7F); BWIPP TODO: exclude also" },
+        /*132*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (1 << 8), "\237\177", 0, 0, "40 29 F7 F0 EC 11 EC 11 EC", 1, 1, "B2 (0x9F7F previously used Kanji mode, now excludes trailing 0x7F)" },
         /*133*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (5 << 8), "\340\176", 0, 0, "80 1B BF 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0xE07E)" },
-        /*134*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\340\177", 0, 0, "40 2E 07 F0 EC 11 EC 11 EC", 0, 1, "B2 (0xE07F previously used Kanji mode, now excludes trailing 0x7F); BWIPP TODO: exclude also" },
+        /*134*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\340\177", 0, 0, "40 2E 07 F0 EC 11 EC 11 EC", 1, 1, "B2 (0xE07F previously used Kanji mode, now excludes trailing 0x7F)" },
         /*135*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (4 << 8), "\352\244", 0, 0, "80 1F 92 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0xEAA4, last valid codepoint)" },
-        /*136*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\353\277", 0, 0, "80 1F FF 80 EC 11 EC 11 EC", 0, 1, "K1 (0xEBBF undefined in Shift JIS but not checked and uses Kanji mode); BWIPP TODO: exclude also" },
+        /*136*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (6 << 8), "\353\277", 0, 0, "80 1F FF 80 EC 11 EC 11 EC", 1, 1, "K1 (0xEBBF undefined in Shift JIS but not checked and uses Kanji mode)" },
         /*137*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\353\300", 0, 0, "40 2E BC 00 EC 11 EC 11 EC", 1, 1, "B2 (0xEBC0 was always excluded)" },
         /*138*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\300", 0, 0, "80 10 40 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0x81C0)" },
         /*139*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (2 << 8), "\201\374", 0, 0, "80 10 5E 00 EC 11 EC 11 EC", 1, 1, "K1 (Shift JIS 0x81FC)" },
-        /*140*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\375", 0, 0, "40 28 1F D0 EC 11 EC 11 EC", 0, 1, "B2 (0x81FD previously used Kanji mode, now excludes trailing 0xFD); BWIPP TODO: exclude also" },
-        /*141*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\376", 0, 0, "40 28 1F E0 EC 11 EC 11 EC", 0, 1, "B2 (0x81FE previously used Kanji mode, now excludes trailing 0xFE); BWIPP TODO: exclude also" },
-        /*142*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\377", 0, 0, "40 28 1F F0 EC 11 EC 11 EC", 0, 1, "B2 (0x81FF previously used Kanji mode, now excludes trailing 0xFF); BWIPP TODO: exclude also" },
-        /*143*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE, "\201\377", 0, 0, "40 28 1F F0 EC 11 EC 11 EC", 0, 1, "B2 (0x81FF previously used Kanji mode, now excludes trailing 0xFF); BWIPP TODO: exclude also" },
+        /*140*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (8 << 8), "\201\375", 0, 0, "40 28 1F D0 EC 11 EC 11 EC", 1, 1, "B2 (0x81FD previously used Kanji mode, now excludes trailing 0xFD)" },
+        /*141*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (4 << 8), "\201\376", 0, 0, "40 28 1F E0 EC 11 EC 11 EC", 1, 1, "B2 (0x81FE previously used Kanji mode, now excludes trailing 0xFE)" },
+        /*142*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (6 << 8), "\201\377", 0, 0, "40 28 1F F0 EC 11 EC 11 EC", 1, 1, "B2 (0x81FF previously used Kanji mode, now excludes trailing 0xFF)" },
+        /*143*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (6 << 8), "\201\377", 0, 0, "40 28 1F F0 EC 11 EC 11 EC", 1, 1, "B2 (0x81FF previously used Kanji mode, now excludes trailing 0xFF)" },
         /*144*/ { DATA_MODE, 0, 4, ZINT_FULL_MULTIBYTE | (7 << 8), "\201\255", 0, 0, "80 10 36 80 EC 11 EC 11 EC", 1, 1, "K1 (0x81AD undefined in Shift JIS but not checked and uses Kanji mode)" },
     };
     int data_size = ARRAY_SIZE(data);
@@ -4251,6 +4251,29 @@ static void test_qr_encode(const testCtx *const p_ctx) {
                     "100000100100010011101"
                     "111111100011110001100"
                 },
+        /*128*/ { BARCODE_QRCODE, UNICODE_MODE, -1, 2, -1, 1 << 8, { 0, 0, "" }, "202404110011看看16", -1, ZINT_WARN_NONCOMPLIANT, 21, 21, 1, "Shift-JIS range (BWIPP via bwip-js issue #335)",
+                    "111111100000101111111"
+                    "100000101111101000001"
+                    "101110100111001011101"
+                    "101110100100001011101"
+                    "101110101110101011101"
+                    "100000100100101000001"
+                    "111111101010101111111"
+                    "000000000111100000000"
+                    "101010100001000010010"
+                    "110111010011011110011"
+                    "000000111000101100000"
+                    "010100000001011100010"
+                    "111100101000100001110"
+                    "000000001101000101010"
+                    "111111100110010010101"
+                    "100000100001000100001"
+                    "101110101010001010001"
+                    "101110100011000110110"
+                    "101110101100111100001"
+                    "100000100011010111000"
+                    "111111101110111010101"
+                },
     };
     int data_size = ARRAY_SIZE(data);
     int i, length, ret;
diff --git a/backend/tests/testcommon.c b/backend/tests/testcommon.c
index d2ba6b4f..a30e206a 100644
--- a/backend/tests/testcommon.c
+++ b/backend/tests/testcommon.c
@@ -3263,36 +3263,36 @@ int testUtilBwipp(int index, const struct zint_symbol *symbol, int option_1, int
     /* Hack in various adjustments */
     if (symbology == BARCODE_DBAR_OMN || symbology == BARCODE_DBAR_LTD || symbology == BARCODE_DBAR_EXP) {
         /* Begin with space */
-        char adj[5] = " -sbs";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sbs";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_CODE11 || symbology == BARCODE_CODE39 || symbology == BARCODE_EXCODE39
             || symbology == BARCODE_CODABAR || symbology == BARCODE_PHARMA || symbology == BARCODE_PZN
             || symbology == BARCODE_CODE32 || symbology == BARCODE_VIN) {
         /* Ratio 3 width bar/space -> 2 width */
-        char adj[8] = " -sr=0.6";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sr=0.6";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_C25INTER || symbology == BARCODE_DPLEIT || symbology == BARCODE_DPIDENT
             || symbology == BARCODE_ITF14) {
         /* Ratio 2 width bar/space -> 3 width */
-        char adj[8] = " -sr=1.3";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sr=1.3";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_FIM) {
         /* Ratio 2.25 width bar/space -> 1 width */
-        char adj[10] = " -sr=0.444";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sr=0.444";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_PLESSEY) {
         /* Ceiling ratio 3/4/5 width bar/space -> 2 width then round ratio 2 width bar/space -> 3 width */
-        char adj[16] = " -sc=0.4 -sr=1.3";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sc=0.4 -sr=1.3";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_CODE11 || symbology == BARCODE_CODE39 || symbology == BARCODE_EXCODE39
             || symbology == BARCODE_HIBC_39 || symbology == BARCODE_LOGMARS || symbology == BARCODE_PHARMA
@@ -3300,28 +3300,28 @@ int testUtilBwipp(int index, const struct zint_symbol *symbol, int option_1, int
             || symbology == BARCODE_C25INTER || symbology == BARCODE_DPLEIT || symbology == BARCODE_DPIDENT
             || symbology == BARCODE_ITF14 || symbology == BARCODE_PHARMA_TWO) {
         /* End sbs loop on bar */
-        char adj[6] = " -selb";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -selb";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_C25STANDARD) {
         /* Zint uses 4X start/stop wides while BWIPP uses 3X - convert */
-        char adj[91] = " -sp='i 0 eq i limit 4 sub eq or sbs i get 3 eq and { (1111) print true } { false } ifelse'";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sp='i 0 eq i limit 4 sub eq or sbs i get 3 eq and { (1111) print true } { false } ifelse'";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_POSTNET || symbology == BARCODE_PLANET || symbology == BARCODE_RM4SCC
             || symbology == BARCODE_JAPANPOST || symbology == BARCODE_KIX || symbology == BARCODE_DAFT
             || symbology == BARCODE_USPS_IMAIL || symbology == BARCODE_AUSPOST || symbology == BARCODE_PHARMA_TWO) {
         /* Emulate rows with BWIPP heights. */
-        char adj[5] = " -shs";
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -shs";
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
     if (symbology == BARCODE_CODE16K || symbology == BARCODE_CODE49) {
-        char adj[15] = " -sxs=10 -sxe=1"; /* Strip first 10 and last zero */
-        memmove(cmd + GS_INITIAL_LEN + sizeof(adj), cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
-        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj));
+        char adj[] = " -sxs=10 -sxe=1"; /* Strip first 10 and last zero */
+        memmove(cmd + GS_INITIAL_LEN + sizeof(adj) - 1, cmd + GS_INITIAL_LEN, strlen(cmd) + 1 - GS_INITIAL_LEN);
+        memcpy(cmd + GS_INITIAL_LEN, adj, sizeof(adj) - 1);
     }
 
     if (symbol->debug & ZINT_DEBUG_TEST_PRINT) {
diff --git a/backend/tests/testcommon.h b/backend/tests/testcommon.h
index 81515080..59d6d97c 100644
--- a/backend/tests/testcommon.h
+++ b/backend/tests/testcommon.h
@@ -57,10 +57,8 @@ extern "C" {
 #define testutil_pclose(stream) _pclose(stream)
 #else
 #include <unistd.h>
-#  if defined(ZINT_IS_C89) || defined(ZINT_IS_C99)
-    extern FILE *popen(const char *command, const char *type);
-    extern int pclose(FILE *stream);
-#  endif
+extern FILE *popen(const char *command, const char *type);
+extern int pclose(FILE *stream);
 #define testutil_popen(command, mode) popen(command, mode)
 #define testutil_pclose(stream) pclose(stream)
 #endif
@@ -70,6 +68,7 @@ extern "C" {
 #  pragma GCC diagnostic ignored "-Woverlength-strings"
 #elif defined(_MSC_VER)
 #  pragma warning(disable: 4305) /* truncation from 'double' to 'float' */
+#  pragma warning(disable: 4702) /* unreachable code */
 #endif
 
 extern int assertionFailed;
diff --git a/backend/tests/tools/bwipp_dump.ps.tar.xz b/backend/tests/tools/bwipp_dump.ps.tar.xz
index c5b0a300..2b6babb9 100644
Binary files a/backend/tests/tools/bwipp_dump.ps.tar.xz and b/backend/tests/tools/bwipp_dump.ps.tar.xz differ
diff --git a/backend/tif.h b/backend/tif.h
index a9c8ea01..6894b252 100644
--- a/backend/tif.h
+++ b/backend/tif.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack(1)
 #endif
 
@@ -60,7 +60,7 @@ extern "C" {
         uint16_t blue;
     } OUT_PACK tiff_color_t;
 
-#ifdef _MSC_VER
+#ifdef OUT_USE_PRAGMA_PACK
 #pragma pack()
 #endif
 
diff --git a/backend/tools/gen_gs1_lint.php b/backend/tools/gen_gs1_lint.php
index e23e382d..44690bfa 100644
--- a/backend/tools/gen_gs1_lint.php
+++ b/backend/tools/gen_gs1_lint.php
@@ -294,22 +294,21 @@ foreach ($spec_parts as $spec => $spec_part) {
         $comment = ' (Used by';
         foreach ($spec_comments[$spec] as $i => $spec_comment) {
             if ($i) {
-                if ($i > 3) {
-                    $comment .= '...';
-                    break;
-                }
                 $comment .= ', ';
             } else {
                 $comment .= ' ';
             }
             $comment .= $spec_comment;
         }
+        if (strlen($comment) > 118 - 3 /*start comment*/ - 4 /*)end comment*/ - strlen($spec)) {
+            $comment = substr($comment, 0, 118 - 3 - 4 - strlen($spec) - 3) . '...';
+        }
         $comment .= ')';
     }
     print <<<EOD
 /* $spec$comment */
-static int $spec_func(const unsigned char *data, const int data_len,
-$tab$tab{$tab}int *p_err_no, int *p_err_posn, char err_msg[50]) {
+static int $spec_func(const unsigned char *data,
+$tab$tab{$tab}const int data_len, int *p_err_no, int *p_err_posn, char err_msg[50]) {
 {$tab}return 
 EOD;
 
diff --git a/backend/zint.h b/backend/zint.h
index 086a3199..a688b36f 100644
--- a/backend/zint.h
+++ b/backend/zint.h
@@ -459,7 +459,7 @@ extern "C" {
     ZINT_EXTERN int ZBarcode_ValidID(int symbol_id);
 
     /* Copy BARCODE_XXX name of `symbol_id` into `name` buffer, NUL-terminated.
-       Returns 0 if valid, non-zero (1 or -1) if not valid */
+       Returns 0 if valid, 1 if not valid */
     ZINT_EXTERN int ZBarcode_BarcodeName(int symbol_id, char name[32]);
 
     /* Return the capability flags for symbology `symbol_id` that match `cap_flag` */
diff --git a/docs/README b/docs/README
index 74e46329..9bf3b7be 100644
--- a/docs/README
+++ b/docs/README
@@ -1,11 +1,11 @@
-% docs/README 2024-05-27
+% docs/README 2024-06-27
 
 For generation of "docs/manual.pdf" and "docs/manual.txt" from "manual.pmd" using a recent version of pandoc
 
 On Ubuntu/Debian (tested on Ubuntu 22.04)
 
-    wget https://github.com/jgm/pandoc/releases/download/3.2/pandoc-3.2-1-amd64.deb
-    sudo dpkg -i pandoc-3.2-1-amd64.deb
+    wget https://github.com/jgm/pandoc/releases/download/3.2.1/pandoc-3.2.1-1-amd64.deb
+    sudo dpkg -i pandoc-3.2.1-1-amd64.deb
     sudo apt install python3-pip
     pip install pandoc-tablenos --user
     export PATH=~/.local/bin:"$PATH"
@@ -20,9 +20,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.2/pandoc-3.2-linux-amd64.tar.gz
-    tar xf pandoc-3.2-linux-amd64.tar.gz
-    sudo mv -i pandoc-3.2/bin/pandoc /usr/local/bin
+    wget https://github.com/jgm/pandoc/releases/download/3.2.1/pandoc-3.2.1-linux-amd64.tar.gz
+    tar xf pandoc-3.2.1-linux-amd64.tar.gz
+    sudo mv -i pandoc-3.2.1/bin/pandoc /usr/local/bin
     sudo dnf install python3-pip
     pip install pandoc-tablenos --user
     export PATH=~/.local/bin:"$PATH"
diff --git a/docs/manual.html b/docs/manual.html
index 2ee2b9c5..0322bfcb 100644
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -199,7 +199,7 @@
     tbody tr:first-child td {
       padding-top: 0.5em;
     }
-    header {
+    thead > tr {
       margin-bottom: 4em;
       text-align: center;
     }
@@ -332,7 +332,7 @@
 <h1 class="title">Zint Barcode Generator and Zint Barcode Studio User
 Manual</h1>
 <p class="author">Version 2.13.0.9</p>
-<p class="date">May 2024</p>
+<p class="date">June 2024</p>
 </header>
 <nav id="TOC" role="doc-toc">
 <ul>
@@ -1198,25 +1198,25 @@ as given below:</p>
 data-tag=": Sequence Format Characters">
 <caption><span>Table : Sequence Format Characters</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Character</th>
 <th style="text-align: left;">Effect</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>$</code></td>
 <td style="text-align: left;">Insert leading zeroes</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>#</code></td>
 <td style="text-align: left;">Insert leading spaces</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>*</code></td>
 <td style="text-align: left;">Insert leading asterisks</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Any other character</td>
 <td style="text-align: left;">Interpreted literally</td>
 </tr>
@@ -1310,7 +1310,7 @@ table below.</p>
 <col style="width: 57%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Escape Sequence</th>
 <th style="text-align: left;">ASCII Equivalent</th>
 <th style="text-align: left;">Name</th>
@@ -1318,106 +1318,106 @@ table below.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\0</code></td>
 <td style="text-align: left;">0x00</td>
 <td style="text-align: left;"><code>NUL</code></td>
 <td style="text-align: left;">Null character</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\E</code></td>
 <td style="text-align: left;">0x04</td>
 <td style="text-align: left;"><code>EOT</code></td>
 <td style="text-align: left;">End of Transmission</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\a</code></td>
 <td style="text-align: left;">0x07</td>
 <td style="text-align: left;"><code>BEL</code></td>
 <td style="text-align: left;">Bell</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\b</code></td>
 <td style="text-align: left;">0x08</td>
 <td style="text-align: left;"><code>BS</code></td>
 <td style="text-align: left;">Backspace</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\t</code></td>
 <td style="text-align: left;">0x09</td>
 <td style="text-align: left;"><code>HT</code></td>
 <td style="text-align: left;">Horizontal Tab</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\n</code></td>
 <td style="text-align: left;">0x0A</td>
 <td style="text-align: left;"><code>LF</code></td>
 <td style="text-align: left;">Line Feed</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\v</code></td>
 <td style="text-align: left;">0x0B</td>
 <td style="text-align: left;"><code>VT</code></td>
 <td style="text-align: left;">Vertical Tab</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\f</code></td>
 <td style="text-align: left;">0x0C</td>
 <td style="text-align: left;"><code>FF</code></td>
 <td style="text-align: left;">Form Feed</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\r</code></td>
 <td style="text-align: left;">0x0D</td>
 <td style="text-align: left;"><code>CR</code></td>
 <td style="text-align: left;">Carriage Return</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\e</code></td>
 <td style="text-align: left;">0x1B</td>
 <td style="text-align: left;"><code>ESC</code></td>
 <td style="text-align: left;">Escape</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\G</code></td>
 <td style="text-align: left;">0x1D</td>
 <td style="text-align: left;"><code>GS</code></td>
 <td style="text-align: left;">Group Separator</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\R</code></td>
 <td style="text-align: left;">0x1E</td>
 <td style="text-align: left;"><code>RS</code></td>
 <td style="text-align: left;">Record Separator</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\\</code></td>
 <td style="text-align: left;">0x5C</td>
 <td style="text-align: left;"><code>\</code></td>
 <td style="text-align: left;">Backslash</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\dNNN</code></td>
 <td style="text-align: left;">NNN</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;">Any 8-bit character where NNN is decimal
 (000-255)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\oNNN</code></td>
 <td style="text-align: left;">0oNNN</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;">Any 8-bit character where NNN is octal
 (000-377)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\xNN</code></td>
 <td style="text-align: left;">0xNN</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;">Any 8-bit character where NN is
 hexadecimal (00-FF)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>\uNNNN</code></td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -1425,7 +1425,7 @@ hexadecimal (00-FF)</td>
 class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a>
 character where NNNN is hexadecimal (0000-FFFF)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>\UNNNNNN</code></td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -1468,45 +1468,45 @@ following table.</p>
 <table id="tbl:output_file_formats" data-tag=": Output File Formats">
 <caption><span>Table : Output File Formats</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Extension</th>
 <th style="text-align: left;">File format</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>bmp</td>
 <td style="text-align: left;">Windows Bitmap</td>
 </tr>
-<tr class="even">
+<tr>
 <td>emf</td>
 <td style="text-align: left;">Enhanced Metafile Format</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>eps</td>
 <td style="text-align: left;">Encapsulated PostScript</td>
 </tr>
-<tr class="even">
+<tr>
 <td>gif</td>
 <td style="text-align: left;">Graphics Interchange Format</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>pcx</td>
 <td style="text-align: left;">ZSoft Paintbrush image</td>
 </tr>
-<tr class="even">
+<tr>
 <td>png</td>
 <td style="text-align: left;">Portable Network Graphic</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>svg</td>
 <td style="text-align: left;">Scalable Vector Graphic</td>
 </tr>
-<tr class="even">
+<tr>
 <td>tif</td>
 <td style="text-align: left;">Tagged Image File Format</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>txt</td>
 <td style="text-align: left;">Text file (see <a
 href="#other-options">4.19 Other Options</a>)</td>
@@ -1541,7 +1541,7 @@ class="sourceCode bash"><code class="sourceCode bash"><span id="cb22-1"><a href=
 <col style="width: 55%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Numeric Value</th>
 <th style="text-align: left;">Name<a href="#fn3" class="footnote-ref"
 id="fnref3" role="doc-noteref"><sup>3</sup></a></th>
@@ -1549,507 +1549,507 @@ id="fnref3" role="doc-noteref"><sup>3</sup></a></th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">1</td>
 <td style="text-align: left;"><code>BARCODE_CODE11</code></td>
 <td style="text-align: left;">Code 11</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">2<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_C25STANDARD</code></td>
 <td style="text-align: left;">Standard Code 2 of 5</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">3</td>
 <td style="text-align: left;"><code>BARCODE_C25INTER</code></td>
 <td style="text-align: left;">Interleaved 2 of 5</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">4</td>
 <td style="text-align: left;"><code>BARCODE_C25IATA</code></td>
 <td style="text-align: left;">Code 2 of 5 IATA</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">6</td>
 <td style="text-align: left;"><code>BARCODE_C25LOGIC</code></td>
 <td style="text-align: left;">Code 2 of 5 Data Logic</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">7</td>
 <td style="text-align: left;"><code>BARCODE_C25IND</code></td>
 <td style="text-align: left;">Code 2 of 5 Industrial</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">8</td>
 <td style="text-align: left;"><code>BARCODE_CODE39</code></td>
 <td style="text-align: left;">Code 3 of 9 (Code 39)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">9</td>
 <td style="text-align: left;"><code>BARCODE_EXCODE39</code></td>
 <td style="text-align: left;">Extended Code 3 of 9 (Code 39+)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">13</td>
 <td style="text-align: left;"><code>BARCODE_EANX</code></td>
 <td style="text-align: left;">EAN (EAN-2, EAN-5, EAN-8 and EAN-13)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">14</td>
 <td style="text-align: left;"><code>BARCODE_EANX_CHK</code></td>
 <td style="text-align: left;">EAN + Check Digit</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">16<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_GS1_128</code></td>
 <td style="text-align: left;">GS1-128 (UCC.EAN-128)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">18</td>
 <td style="text-align: left;"><code>BARCODE_CODABAR</code></td>
 <td style="text-align: left;">Codabar</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">20</td>
 <td style="text-align: left;"><code>BARCODE_CODE128</code></td>
 <td style="text-align: left;">Code 128 (automatic Code Set
 switching)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">21</td>
 <td style="text-align: left;"><code>BARCODE_DPLEIT</code></td>
 <td style="text-align: left;">Deutsche Post Leitcode</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">22</td>
 <td style="text-align: left;"><code>BARCODE_DPIDENT</code></td>
 <td style="text-align: left;">Deutsche Post Identcode</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">23</td>
 <td style="text-align: left;"><code>BARCODE_CODE16K</code></td>
 <td style="text-align: left;">Code 16K</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">24</td>
 <td style="text-align: left;"><code>BARCODE_CODE49</code></td>
 <td style="text-align: left;">Code 49</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">25</td>
 <td style="text-align: left;"><code>BARCODE_CODE93</code></td>
 <td style="text-align: left;">Code 93</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">28</td>
 <td style="text-align: left;"><code>BARCODE_FLAT</code></td>
 <td style="text-align: left;">Flattermarken</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">29<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMN</code></td>
 <td style="text-align: left;">GS1 DataBar Omnidirectional (including GS1
 DataBar Truncated)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">30<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_LTD</code></td>
 <td style="text-align: left;">GS1 DataBar Limited</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">31<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXP</code></td>
 <td style="text-align: left;">GS1 DataBar Expanded</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">32</td>
 <td style="text-align: left;"><code>BARCODE_TELEPEN</code></td>
 <td style="text-align: left;">Telepen Alpha</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">34</td>
 <td style="text-align: left;"><code>BARCODE_UPCA</code></td>
 <td style="text-align: left;">UPC-A</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">35</td>
 <td style="text-align: left;"><code>BARCODE_UPCA_CHK</code></td>
 <td style="text-align: left;">UPC-A + Check Digit</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">37</td>
 <td style="text-align: left;"><code>BARCODE_UPCE</code></td>
 <td style="text-align: left;">UPC-E</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">38</td>
 <td style="text-align: left;"><code>BARCODE_UPCE_CHK</code></td>
 <td style="text-align: left;">UPC-E + Check Digit</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">40</td>
 <td style="text-align: left;"><code>BARCODE_POSTNET</code></td>
 <td style="text-align: left;">POSTNET</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">47</td>
 <td style="text-align: left;"><code>BARCODE_MSI_PLESSEY</code></td>
 <td style="text-align: left;">MSI Plessey</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">49</td>
 <td style="text-align: left;"><code>BARCODE_FIM</code></td>
 <td style="text-align: left;">FIM</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">50</td>
 <td style="text-align: left;"><code>BARCODE_LOGMARS</code></td>
 <td style="text-align: left;">LOGMARS</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">51</td>
 <td style="text-align: left;"><code>BARCODE_PHARMA</code></td>
 <td style="text-align: left;">Pharmacode One-Track</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">52</td>
 <td style="text-align: left;"><code>BARCODE_PZN</code></td>
 <td style="text-align: left;">PZN</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">53</td>
 <td style="text-align: left;"><code>BARCODE_PHARMA_TWO</code></td>
 <td style="text-align: left;">Pharmacode Two-Track</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">54</td>
 <td style="text-align: left;"><code>BARCODE_CEPNET</code></td>
 <td style="text-align: left;">Brazilian CEPNet</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">55</td>
 <td style="text-align: left;"><code>BARCODE_PDF417</code></td>
 <td style="text-align: left;">PDF417</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">56<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_PDF417COMP</code></td>
 <td style="text-align: left;">Compact PDF417 (Truncated PDF417)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">57</td>
 <td style="text-align: left;"><code>BARCODE_MAXICODE</code></td>
 <td style="text-align: left;">MaxiCode</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">58</td>
 <td style="text-align: left;"><code>BARCODE_QRCODE</code></td>
 <td style="text-align: left;">QR Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">60</td>
 <td style="text-align: left;"><code>BARCODE_CODE128AB</code></td>
 <td style="text-align: left;">Code 128 (Suppress Code Set C)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">63</td>
 <td style="text-align: left;"><code>BARCODE_AUSPOST</code></td>
 <td style="text-align: left;">Australia Post Standard Customer</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">66</td>
 <td style="text-align: left;"><code>BARCODE_AUSREPLY</code></td>
 <td style="text-align: left;">Australia Post Reply Paid</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">67</td>
 <td style="text-align: left;"><code>BARCODE_AUSROUTE</code></td>
 <td style="text-align: left;">Australia Post Routing</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">68</td>
 <td style="text-align: left;"><code>BARCODE_AUSDIRECT</code></td>
 <td style="text-align: left;">Australia Post Redirection</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">69</td>
 <td style="text-align: left;"><code>BARCODE_ISBNX</code></td>
 <td style="text-align: left;">ISBN (EAN-13 with verification stage)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">70</td>
 <td style="text-align: left;"><code>BARCODE_RM4SCC</code></td>
 <td style="text-align: left;">Royal Mail 4-State Customer Code
 (RM4SCC)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">71</td>
 <td style="text-align: left;"><code>BARCODE_DATAMATRIX</code></td>
 <td style="text-align: left;">Data Matrix (ECC200)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">72</td>
 <td style="text-align: left;"><code>BARCODE_EAN14</code></td>
 <td style="text-align: left;">EAN-14</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">73</td>
 <td style="text-align: left;"><code>BARCODE_VIN</code></td>
 <td style="text-align: left;">Vehicle Identification Number</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">74</td>
 <td style="text-align: left;"><code>BARCODE_CODABLOCKF</code></td>
 <td style="text-align: left;">Codablock-F</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">75</td>
 <td style="text-align: left;"><code>BARCODE_NVE18</code></td>
 <td style="text-align: left;">NVE-18 (SSCC-18)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">76</td>
 <td style="text-align: left;"><code>BARCODE_JAPANPOST</code></td>
 <td style="text-align: left;">Japanese Postal Code</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">77</td>
 <td style="text-align: left;"><code>BARCODE_KOREAPOST</code></td>
 <td style="text-align: left;">Korea Post</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">79<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_STK</code></td>
 <td style="text-align: left;">GS1 DataBar Stacked</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">80<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMNSTK</code></td>
 <td style="text-align: left;">GS1 DataBar Stacked Omnidirectional</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">81<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXPSTK</code></td>
 <td style="text-align: left;">GS1 DataBar Expanded Stacked</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">82</td>
 <td style="text-align: left;"><code>BARCODE_PLANET</code></td>
 <td style="text-align: left;">PLANET</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">84</td>
 <td style="text-align: left;"><code>BARCODE_MICROPDF417</code></td>
 <td style="text-align: left;">MicroPDF417</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">85<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_USPS_IMAIL</code></td>
 <td style="text-align: left;">USPS Intelligent Mail (OneCode)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">86</td>
 <td style="text-align: left;"><code>BARCODE_PLESSEY</code></td>
 <td style="text-align: left;">UK Plessey</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">87</td>
 <td style="text-align: left;"><code>BARCODE_TELEPEN_NUM</code></td>
 <td style="text-align: left;">Telepen Numeric</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">89</td>
 <td style="text-align: left;"><code>BARCODE_ITF14</code></td>
 <td style="text-align: left;">ITF-14</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">90</td>
 <td style="text-align: left;"><code>BARCODE_KIX</code></td>
 <td style="text-align: left;">Dutch Post KIX Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">92</td>
 <td style="text-align: left;"><code>BARCODE_AZTEC</code></td>
 <td style="text-align: left;">Aztec Code</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">93</td>
 <td style="text-align: left;"><code>BARCODE_DAFT</code></td>
 <td style="text-align: left;">DAFT Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">96</td>
 <td style="text-align: left;"><code>BARCODE_DPD</code></td>
 <td style="text-align: left;">DPD Code</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">97</td>
 <td style="text-align: left;"><code>BARCODE_MICROQR</code></td>
 <td style="text-align: left;">Micro QR Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">98</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_128</code></td>
 <td style="text-align: left;">HIBC Code 128</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">99</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_39</code></td>
 <td style="text-align: left;">HIBC Code 39</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">102</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_DM</code></td>
 <td style="text-align: left;">HIBC Data Matrix ECC200</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">104</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_QR</code></td>
 <td style="text-align: left;">HIBC QR Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">106</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_PDF</code></td>
 <td style="text-align: left;">HIBC PDF417</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">108</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_MICPDF</code></td>
 <td style="text-align: left;">HIBC MicroPDF417</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">110</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_BLOCKF</code></td>
 <td style="text-align: left;">HIBC Codablock-F</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">112</td>
 <td style="text-align: left;"><code>BARCODE_HIBC_AZTEC</code></td>
 <td style="text-align: left;">HIBC Aztec Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">115</td>
 <td style="text-align: left;"><code>BARCODE_DOTCODE</code></td>
 <td style="text-align: left;">DotCode</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">116</td>
 <td style="text-align: left;"><code>BARCODE_HANXIN</code></td>
 <td style="text-align: left;">Han Xin (Chinese Sensible) Code</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">119</td>
 <td style="text-align: left;"><code>BARCODE_MAILMARK_2D</code></td>
 <td style="text-align: left;">Royal Mail 2D Mailmark (CMDM) (Data
 Matrix)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">121</td>
 <td style="text-align: left;"><code>BARCODE_MAILMARK_4S</code></td>
 <td style="text-align: left;">Royal Mail 4-State Mailmark</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">128</td>
 <td style="text-align: left;"><code>BARCODE_AZRUNE</code></td>
 <td style="text-align: left;">Aztec Runes</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">129</td>
 <td style="text-align: left;"><code>BARCODE_CODE32</code></td>
 <td style="text-align: left;">Code 32</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">130</td>
 <td style="text-align: left;"><code>BARCODE_EANX_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with EAN linear
 component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">131<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_GS1_128_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1-128 linear
 component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">132<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMN_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Omnidirectional linear component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">133<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_LTD_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Limited linear component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">134<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXP_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Expanded linear component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">135</td>
 <td style="text-align: left;"><code>BARCODE_UPCA_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with UPC-A linear
 component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">136</td>
 <td style="text-align: left;"><code>BARCODE_UPCE_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with UPC-E linear
 component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">137<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_STK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Stacked component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">138<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMNSTK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Stacked Omnidirectional component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">139<code>*</code></td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXPSTK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Expanded Stacked component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">140</td>
 <td style="text-align: left;"><code>BARCODE_CHANNEL</code></td>
 <td style="text-align: left;">Channel Code</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">141</td>
 <td style="text-align: left;"><code>BARCODE_CODEONE</code></td>
 <td style="text-align: left;">Code One</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">142</td>
 <td style="text-align: left;"><code>BARCODE_GRIDMATRIX</code></td>
 <td style="text-align: left;">Grid Matrix</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">143</td>
 <td style="text-align: left;"><code>BARCODE_UPNQR</code></td>
 <td style="text-align: left;">UPNQR (Univerzalnega Plačilnega Naloga
 QR)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">144</td>
 <td style="text-align: left;"><code>BARCODE_ULTRA</code></td>
 <td style="text-align: left;">Ultracode</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">145</td>
 <td style="text-align: left;"><code>BARCODE_RMQR</code></td>
 <td style="text-align: left;">Rectangular Micro QR Code (rMQR)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">146</td>
 <td style="text-align: left;"><code>BARCODE_BC412</code></td>
 <td style="text-align: left;">IBM BC412 (SEMI T1-95)</td>
@@ -2271,7 +2271,7 @@ data-tag=": Scaling Multipliers and Minima">
 <col style="width: 15%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>MaxiCode?</th>
 <th style="text-align: left;">Output</th>
 <th>Multiplier</th>
@@ -2280,35 +2280,35 @@ data-tag=": Scaling Multipliers and Minima">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>No</td>
 <td style="text-align: left;">Raster</td>
 <td>2</td>
 <td style="text-align: left;">0.5</td>
 <td style="text-align: left;">1</td>
 </tr>
-<tr class="even">
+<tr>
 <td>No</td>
 <td style="text-align: left;">Vector</td>
 <td>2</td>
 <td style="text-align: left;">0.1</td>
 <td style="text-align: left;">0.1</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>Yes</td>
 <td style="text-align: left;">Raster</td>
 <td>10</td>
 <td style="text-align: left;">0.2</td>
 <td style="text-align: left;">N/A</td>
 </tr>
-<tr class="even">
+<tr>
 <td>Yes</td>
 <td style="text-align: left;">Vector (non-EMF)</td>
 <td>2</td>
 <td style="text-align: left;">0.1</td>
 <td style="text-align: left;">N/A</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>Yes</td>
 <td style="text-align: left;">EMF</td>
 <td>40</td>
@@ -2422,100 +2422,100 @@ character set is Latin-2 (ISO/IEC 8859-2 plus ASCII).</p>
 data-tag=": Default Character Sets">
 <caption><span>Table : Default Character Sets</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Symbology</th>
 <th style="text-align: left;">Default character sets</th>
 <th>Alternate if input not Latin-1</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Aztec Code</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Codablock-F</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Code 128</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Code 16K</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Code One</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Data Matrix</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">DotCode</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Grid Matrix</td>
 <td style="text-align: left;">GB 2312 (includes ASCII)</td>
 <td>N/A</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Han Xin</td>
 <td style="text-align: left;">Latin-1</td>
 <td>GB 18030 (includes ASCII)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">MaxiCode</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">MicroPDF417</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Micro QR Code</td>
 <td style="text-align: left;">Latin-1</td>
 <td>Shift JIS (includes ASCII<a href="#fn5" class="footnote-ref"
 id="fnref5" role="doc-noteref"><sup>5</sup></a>)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">PDF417</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">QR Code</td>
 <td style="text-align: left;">Latin-1</td>
 <td>Shift JIS (see above)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">rMQR</td>
 <td style="text-align: left;">Latin-1</td>
 <td>Shift JIS (see above)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Ultracode</td>
 <td style="text-align: left;">Latin-1</td>
 <td>None</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">UPNQR</td>
 <td style="text-align: left;">Latin-2</td>
 <td>N/A</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">All others</td>
 <td style="text-align: left;">ASCII</td>
 <td>N/A</td>
@@ -2568,22 +2568,22 @@ that support ECI are</p>
 data-tag=": ECI-Aware Symbologies">
 <caption><span>Table : ECI-Aware Symbologies</span> </caption>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Aztec Code</td>
 <td style="text-align: left;">Grid Matrix</td>
 <td style="text-align: left;">PDF417</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Code One</td>
 <td style="text-align: left;">Han Xin Code</td>
 <td style="text-align: left;">QR Code</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Data Matrix</td>
 <td style="text-align: left;">MaxiCode</td>
 <td style="text-align: left;">rMQR</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">DotCode</td>
 <td style="text-align: left;">MicroPDF417</td>
 <td style="text-align: left;">Ultracode</td>
@@ -2604,142 +2604,142 @@ translates the data into the target encoding.</p>
 <table id="tbl:eci_codes" data-tag=": ECI Codes">
 <caption><span>Table : ECI Codes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>ECI Code</th>
 <th>Character Encoding Scheme (ISO/IEC 8859 schemes include ASCII)</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>ISO/IEC 8859-1 - Latin alphabet No. 1</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>ISO/IEC 8859-2 - Latin alphabet No. 2</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>ISO/IEC 8859-3 - Latin alphabet No. 3</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>ISO/IEC 8859-4 - Latin alphabet No. 4</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>ISO/IEC 8859-5 - Latin/Cyrillic alphabet</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>ISO/IEC 8859-6 - Latin/Arabic alphabet</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>ISO/IEC 8859-7 - Latin/Greek alphabet</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>ISO/IEC 8859-8 - Latin/Hebrew alphabet</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>11</td>
 <td>ISO/IEC 8859-9 - Latin alphabet No. 5 (Turkish)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>12</td>
 <td>ISO/IEC 8859-10 - Latin alphabet No. 6 (Nordic)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>13</td>
 <td>ISO/IEC 8859-11 - Latin/Thai alphabet</td>
 </tr>
-<tr class="even">
+<tr>
 <td>15</td>
 <td>ISO/IEC 8859-13 - Latin alphabet No. 7 (Baltic)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>16</td>
 <td>ISO/IEC 8859-14 - Latin alphabet No. 8 (Celtic)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>17</td>
 <td>ISO/IEC 8859-15 - Latin alphabet No. 9</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>18</td>
 <td>ISO/IEC 8859-16 - Latin alphabet No. 10</td>
 </tr>
-<tr class="even">
+<tr>
 <td>20</td>
 <td>Shift JIS (JIS X 0208 and JIS X 0201)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>21</td>
 <td>Windows 1250 - Latin 2 (Central Europe)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>22</td>
 <td>Windows 1251 - Cyrillic</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>23</td>
 <td>Windows 1252 - Latin 1</td>
 </tr>
-<tr class="even">
+<tr>
 <td>24</td>
 <td>Windows 1256 - Arabic</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>25</td>
 <td>UTF-16BE (High order byte first)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>26</td>
 <td>UTF-8</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>27</td>
 <td>ASCII (ISO/IEC 646 IRV)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>28</td>
 <td>Big5 (Taiwan) Chinese Character Set</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>29</td>
 <td>GB 2312 (PRC) Chinese Character Set</td>
 </tr>
-<tr class="even">
+<tr>
 <td>30</td>
 <td>Korean Character Set EUC-KR (KS X 1001:2002)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>31</td>
 <td>GBK Chinese Character Set</td>
 </tr>
-<tr class="even">
+<tr>
 <td>32</td>
 <td>GB 18030 Chinese Character Set</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>33</td>
 <td>UTF-16LE (Low order byte first)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>34</td>
 <td>UTF-32BE (High order bytes first)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>35</td>
 <td>UTF-32LE (Low order bytes first)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>170</td>
 <td>ISO/IEC 646 Invariant<a href="#fn6" class="footnote-ref" id="fnref6"
 role="doc-noteref"><sup>6</sup></a></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>899</td>
 <td>8-bit binary data</td>
 </tr>
@@ -2852,26 +2852,26 @@ the output filename as shown in the table below:</p>
 data-tag=": Batch Filename Formatting">
 <caption><span>Table : Batch Filename Formatting</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input Character</th>
 <th style="text-align: left;">Interpretation</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td><code>~</code></td>
 <td style="text-align: left;">Insert a number or 0</td>
 </tr>
-<tr class="even">
+<tr>
 <td><code>#</code></td>
 <td style="text-align: left;">Insert a number or space</td>
 </tr>
-<tr class="odd">
+<tr>
 <td><code>@</code></td>
 <td style="text-align: left;">Insert a number or <code>*</code> (or
 <code>+</code> on Windows)</td>
 </tr>
-<tr class="even">
+<tr>
 <td>Any other</td>
 <td style="text-align: left;">Insert literally</td>
 </tr>
@@ -2887,33 +2887,33 @@ class="sourceCode bash"><code class="sourceCode bash"><span id="cb50-1"><a href=
 data-tag=": Batch Filename Examples">
 <caption><span>Table : Batch Filename Examples</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Input</th>
 <th style="text-align: left;">Filenames Generated</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>-o file~~~.svg</code></td>
 <td style="text-align: left;"><code>"file001.svg"</code>,
 <code>"file002.svg"</code>, <code>"file003.svg"</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>-o @@@@bar.png</code></td>
 <td style="text-align: left;"><code>"***1.png"</code>,
 <code>"***2.png"</code>, <code>"***3.png"</code> (except Windows)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>-o @@@@bar.png</code></td>
 <td style="text-align: left;"><code>"+++1.png"</code>,
 <code>"+++2.png"</code>, <code>"+++3.png"</code> (on Windows)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>-o my~~~bar.eps</code></td>
 <td style="text-align: left;"><code>"my001bar.eps"</code>,
 <code>"my002bar.eps"</code>, <code>"my003bar.eps"</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>-o t#es~t~.png</code></td>
 <td style="text-align: left;"><code>"t es0t1.png"</code>,
 <code>"t es0t2.png"</code>, <code>"t es0t3.png"</code></td>
@@ -2928,18 +2928,18 @@ when creating a large number of barcodes:</p>
 data-tag=": Batch Directory Examples">
 <caption><span>Table : Batch Directory Examples</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Input</th>
 <th style="text-align: left;">Filenames Generated</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>-o dir~/file~~~.svg</code></td>
 <td style="text-align: left;"><code>"dir0/file001.svg"</code>,
 <code>"dir0/file002.svg"</code>, …</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"></td>
 <td style="text-align: left;">, <code>"dir0/file999.svg"</code>,
 <code>"dir1/file000.svg"</code>, …</td>
@@ -3344,7 +3344,7 @@ Structure <code>zint_symbol</code> </caption>
 <col style="width: 23%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Member Name</th>
 <th style="text-align: left;">Type</th>
 <th style="text-align: left;">Meaning</th>
@@ -3352,14 +3352,14 @@ Structure <code>zint_symbol</code> </caption>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>symbology</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Symbol to use - see <a
 href="#specifying-a-symbology">5.9 Specifying a Symbology</a>.</td>
 <td style="text-align: left;"><code>BARCODE_CODE128</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>height</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Symbol height in X-dimensions, excluding
@@ -3367,41 +3367,41 @@ fixed width-to-height symbols.<a href="#fn8" class="footnote-ref"
 id="fnref8" role="doc-noteref"><sup>8</sup></a></td>
 <td style="text-align: left;">Symbol dependent</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>scale</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Scale factor for adjusting size of image
 (sets X-dimension).</td>
 <td style="text-align: left;">1.0</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>whitespace_width</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Horizontal whitespace width in
 X-dimensions.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>whitespace_height</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Vertical whitespace height in
 X-dimensions.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>border_width</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Border width in X-dimensions.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>output_options</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Set various output parameters - see <a
 href="#adjusting-output-options">5.10 Adjusting Output Options</a>.</td>
 <td style="text-align: left;">0 (none)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>fgcolour</code></td>
 <td style="text-align: left;">character string</td>
 <td style="text-align: left;">Foreground (ink) colour as RGB/RGBA
@@ -3409,7 +3409,7 @@ hexadecimal string or <code>"C,M,Y,K"</code> decimal percentages string,
 with a terminating <code>NUL</code>.</td>
 <td style="text-align: left;"><code>"000000"</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>bgcolour</code></td>
 <td style="text-align: left;">character string</td>
 <td style="text-align: left;">Background (paper) colour as RGB/RGBA
@@ -3417,21 +3417,21 @@ hexadecimal string or <code>"C,M,Y,K"</code> decimal percentages string,
 with a terminating <code>NUL</code>.</td>
 <td style="text-align: left;"><code>"ffffff"</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>fgcolor</code></td>
 <td style="text-align: left;">pointer</td>
 <td style="text-align: left;">Points to fgcolour allowing alternate
 spelling.</td>
 <td style="text-align: left;"></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>bgcolor</code></td>
 <td style="text-align: left;">pointer</td>
 <td style="text-align: left;">Points to bgcolour allowing alternate
 spelling.</td>
 <td style="text-align: left;"></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>outfile</code></td>
 <td style="text-align: left;">character string</td>
 <td style="text-align: left;">Contains the name of the file to output a
@@ -3443,100 +3443,100 @@ resulting barcode symbol to. Must end in <code>.png</code>,
 role="doc-noteref"><sup>9</sup></a></td>
 <td style="text-align: left;"><code>"out.png"</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>primary</code></td>
 <td style="text-align: left;">character string</td>
 <td style="text-align: left;">Primary message data for more complex
 symbols, with a terminating <code>NUL</code>.</td>
 <td style="text-align: left;"><code>""</code> (empty)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>option_1</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Symbol specific options.</td>
 <td style="text-align: left;">-1</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>option_2</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Symbol specific options.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>option_3</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Symbol specific options.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>show_hrt</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Set to 0 to hide Human Readable Text
 (HRT).</td>
 <td style="text-align: left;">1</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>input_mode</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Set encoding of input data - see <a
 href="#setting-the-input-mode">5.11 Setting the Input Mode</a>.</td>
 <td style="text-align: left;"><code>DATA_MODE</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>eci</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Extended Channel Interpretation code.</td>
 <td style="text-align: left;">0 (none)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>dpmm</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Resolution of output in dots per mm (BMP,
 EMF, PCX, PNG and TIF only).</td>
 <td style="text-align: left;">0 (none)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>dot_size</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Diameter of dots used in dotty mode (in
 X-dimensions).</td>
 <td style="text-align: left;">0.8</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>text_gap</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Gap between barcode and text (HRT) in
 X-dimensions.</td>
 <td style="text-align: left;">1.0</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>guard_descent</code></td>
 <td style="text-align: left;">float</td>
 <td style="text-align: left;">Height of guard bar descent (EAN/UPC only)
 in X-dimensions.</td>
 <td style="text-align: left;">5.0</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>structapp</code></td>
 <td style="text-align: left;">Structured Append structure</td>
 <td style="text-align: left;">Mark a symbol as part of a sequence of
 symbols.</td>
 <td style="text-align: left;">count 0 (disabled)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>debug</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Debugging flags.</td>
 <td style="text-align: left;">0</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>warn_level</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Affects error/warning value returned by
 Zint API - see <a href="#handling-errors">5.8 Handling Errors</a>.</td>
 <td style="text-align: left;"><code>WARN_DEFAULT</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>text</code></td>
 <td style="text-align: left;">unsigned character string</td>
 <td style="text-align: left;">Human Readable Text, which usually
@@ -3544,31 +3544,31 @@ consists of input data plus one more check digit. Uses UTF-8 formatting,
 with a terminating <code>NUL</code>.</td>
 <td style="text-align: left;"><code>""</code> (empty) (output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>rows</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Number of rows used by the symbol.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>width</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Width of the generated symbol.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>encoded_data</code></td>
 <td style="text-align: left;">array of unsigned character arrays</td>
 <td style="text-align: left;">Representation of the encoded data.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>row_height</code></td>
 <td style="text-align: left;">array of floats</td>
 <td style="text-align: left;">Heights of each row.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>errtxt</code></td>
 <td style="text-align: left;">character string</td>
 <td style="text-align: left;">Error message in the event that an error
@@ -3576,7 +3576,7 @@ occurred, with a terminating <code>NUL</code> - see <a
 href="#handling-errors">5.8 Handling Errors</a>.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>bitmap</code></td>
 <td style="text-align: left;">pointer to unsigned character array</td>
 <td style="text-align: left;">Pointer to stored bitmap image - see <a
@@ -3584,21 +3584,21 @@ href="#buffering-symbols-in-memory-raster">5.4 Buffering Symbols in
 Memory (raster)</a>.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>bitmap_width</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Width of stored bitmap image (in pixels) -
 see <code>bitmap</code> member.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>bitmap_height</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Height of stored bitmap image (in pixels)
 - see <code>bitmap</code> member.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>alphamap</code></td>
 <td style="text-align: left;">pointer to unsigned character array</td>
 <td style="text-align: left;">Pointer to array representing alpha
@@ -3606,7 +3606,7 @@ channel of stored bitmap image (or <code>NULL</code> if no alpha channel
 used) - see <code>bitmap</code> member.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>vector</code></td>
 <td style="text-align: left;">pointer to vector structure</td>
 <td style="text-align: left;">Pointer to vector header containing
@@ -3615,7 +3615,7 @@ href="#buffering-symbols-in-memory-vector">5.5 Buffering Symbols in
 Memory (vector)</a>.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>memfile</code></td>
 <td style="text-align: left;">pointer to unsigned character array</td>
 <td style="text-align: left;">Pointer to in-memory file buffer if
@@ -3624,7 +3624,7 @@ see <a href="#buffering-symbols-in-memory-memfile">5.6 Buffering Symbols
 in Memory (memfile)</a>.</td>
 <td style="text-align: left;">(output only)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>memfile_size</code></td>
 <td style="text-align: left;">integer</td>
 <td style="text-align: left;">Length of in-memory file buffer.</td>
@@ -3669,57 +3669,57 @@ data-tag=": API Warning and Error Return Values">
 <col style="width: 60%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Return Value</th>
 <th style="text-align: left;">Meaning</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_WARN_HRT_TRUNCATED</code></td>
 <td style="text-align: left;">The Human Readable Text returned in
 <code>text</code> was truncated (maximum 199 bytes).</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_WARN_INVALID_OPTION</code></td>
 <td style="text-align: left;">One of the values in
 <code>zint_struct</code> was set incorrectly but Zint has made a guess
 at what it should have been and generated a barcode accordingly.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_WARN_USES_ECI</code></td>
 <td style="text-align: left;">Zint has automatically inserted an ECI
 character. The symbol may not be readable with some readers.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_WARN_NONCOMPLIANT</code></td>
 <td style="text-align: left;">The symbol was created but is not
 compliant with certain standards set in its specification (e.g. height,
 GS1 AI data lengths).</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR</code></td>
 <td style="text-align: left;">Marks the divide between warnings and
 errors. For return values greater than or equal to this no symbol (or
 only an incomplete symbol) is generated.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_TOO_LONG</code></td>
 <td style="text-align: left;">The input data is too long or too short
 for the selected symbology. No symbol has been generated.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_INVALID_DATA</code></td>
 <td style="text-align: left;">The data to be encoded includes characters
 which are not permitted by the selected symbology (e.g. alphabetic
 characters in an EAN symbol). No symbol has been generated.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_INVALID_CHECK</code></td>
 <td style="text-align: left;">Data with an incorrect check digit has
 been entered. No symbol has been generated.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td
 style="text-align: left;"><code>ZINT_ERROR_INVALID_OPTION</code></td>
 <td style="text-align: left;">One of the values in
@@ -3727,42 +3727,42 @@ style="text-align: left;"><code>ZINT_ERROR_INVALID_OPTION</code></td>
 unwilling) to guess what it should have been. No symbol has been
 generated.</td>
 </tr>
-<tr class="even">
+<tr>
 <td
 style="text-align: left;"><code>ZINT_ERROR_ENCODING_PROBLEM</code></td>
 <td style="text-align: left;">A problem has occurred during encoding of
 the data. This should never happen. Please contact the developer if you
 encounter this error.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_FILE_ACCESS</code></td>
 <td style="text-align: left;">Zint was unable to open the requested
 output file. This is usually a file permissions problem.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_MEMORY</code></td>
 <td style="text-align: left;">Zint ran out of memory. This should only
 be a problem with legacy systems.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_FILE_WRITE</code></td>
 <td style="text-align: left;">Zint failed to write all contents to the
 requested output file. This should only occur if the output device
 becomes full.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_USES_ECI</code></td>
 <td style="text-align: left;">Returned if <code>warn_level</code> set to
 <code>WARN_FAIL_ALL</code> and <code>ZINT_WARN_USES_ECI</code>
 occurs.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_NONCOMPLIANT</code></td>
 <td style="text-align: left;">Returned if <code>warn_level</code> set to
 <code>WARN_FAIL_ALL</code> and <code>ZINT_WARN_NONCOMPLIANT</code>
 occurs.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_ERROR_HRT_TRUNCATED</code></td>
 <td style="text-align: left;">Returned if <code>warn_level</code> set to
 <code>WARN_FAIL_ALL</code> and <code>ZINT_WARN_HRT_TRUNCATED</code>
@@ -3823,101 +3823,101 @@ value:</p>
 <col style="width: 65%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Value</th>
 <th style="text-align: left;">Effect</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">0</td>
 <td style="text-align: left;">No options selected.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BARCODE_BIND_TOP</code></td>
 <td style="text-align: left;">Boundary bar above the symbol only.<a
 href="#fn10" class="footnote-ref" id="fnref10"
 role="doc-noteref"><sup>10</sup></a></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>BARCODE_BIND</code></td>
 <td style="text-align: left;">Boundary bars above and below the symbol
 and between rows if stacking multiple symbols.<a href="#fn11"
 class="footnote-ref" id="fnref11"
 role="doc-noteref"><sup>11</sup></a></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BARCODE_BOX</code></td>
 <td style="text-align: left;">Add a box surrounding the symbol and
 whitespace.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>BARCODE_STDOUT</code></td>
 <td style="text-align: left;">Output the file to stdout.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>READER_INIT</code></td>
 <td style="text-align: left;">Create as a Reader Initialisation
 (Programming) symbol.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>SMALL_TEXT</code></td>
 <td style="text-align: left;">Use a smaller font for the Human Readable
 Text.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BOLD_TEXT</code></td>
 <td style="text-align: left;">Embolden the Human Readable Text.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>CMYK_COLOUR</code></td>
 <td style="text-align: left;">Select the CMYK colour space option for
 Encapsulated PostScript and TIF files.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BARCODE_DOTTY_MODE</code></td>
 <td style="text-align: left;">Plot a matrix symbol using dots rather
 than squares.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>GS1_GS_SEPARATOR</code></td>
 <td style="text-align: left;">Use GS (Group Separator) instead of FNC1
 as GS1 separator (Data Matrix only).</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>OUT_BUFFER_INTERMEDIATE</code></td>
 <td style="text-align: left;">Return the bitmap buffer as ASCII values
 instead of separate colour channels - see <a
 href="#buffering-symbols-in-memory-raster">5.4 Buffering Symbols in
 Memory (raster)</a>.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>BARCODE_QUIET_ZONES</code></td>
 <td style="text-align: left;">Add compliant quiet zones (additional to
 any specified whitespace).<a href="#fn12" class="footnote-ref"
 id="fnref12" role="doc-noteref"><sup>12</sup></a></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BARCODE_NO_QUIET_ZONES</code></td>
 <td style="text-align: left;">Disable quiet zones, notably those with
 defaults.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>COMPLIANT_HEIGHT</code></td>
 <td style="text-align: left;">Warn if height specified not compliant, or
 use standard height (if any) as default.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>EANUPC_GUARD_WHITESPACE</code></td>
 <td style="text-align: left;">Add quiet zone indicators (“&lt;” and/or
 “&gt;”) to HRT whitespace (EAN/UPC).</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>EMBED_VECTOR_FONT</code></td>
 <td style="text-align: left;">Embed font in vector output - currently
 available for SVG output only.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>BARCODE_MEMORY_FILE</code></td>
 <td style="text-align: left;">Write output to in-memory buffer
 <code>symbol-&gt;memfile</code> instead of to <code>outfile</code>
@@ -3939,62 +3939,62 @@ below.</p>
 <col style="width: 74%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Value</th>
 <th style="text-align: left;">Effect</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>DATA_MODE</code></td>
 <td style="text-align: left;">Uses full 8-bit range interpreted as
 binary data.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>UNICODE_MODE</code></td>
 <td style="text-align: left;">Uses UTF-8 input.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>GS1_MODE</code></td>
 <td style="text-align: left;">Encodes GS1 data using FNC1
 characters.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"><em>The above are exclusive, the following
 optional and OR-ed.</em></td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ESCAPE_MODE</code></td>
 <td style="text-align: left;">Process input data for escape
 sequences.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>GS1PARENS_MODE</code></td>
 <td style="text-align: left;">Parentheses (round brackets) used in GS1
 data instead of square brackets to delimit Application Identifiers
 (parentheses must not otherwise occur in the data).</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>GS1NOCHECK_MODE</code></td>
 <td style="text-align: left;">Do not check GS1 data for validity,
 i.e. suppress checks for valid AIs and data lengths. Invalid characters
 (e.g. control characters, extended ASCII characters) are still checked
 for.</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>HEIGHTPERROW_MODE</code></td>
 <td style="text-align: left;">Interpret the <code>height</code> member
 as per-row rather than as overall height.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>FAST_MODE</code></td>
 <td style="text-align: left;">Use faster if less optimal encodation or
 other shortcuts if available (affects <code>DATAMATRIX</code>,
 <code>MICROPDF417</code>, <code>PDF417</code>, <code>QRCODE</code> and
 <code>UPNQR</code> only).</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>EXTRA_ESCAPE_MODE</code></td>
 <td style="text-align: left;">Process special symbology-specific escape
 sequences (<code>CODE128</code> only).</td>
@@ -4164,77 +4164,77 @@ argument and checking the return to see which are set.</p>
 <col style="width: 64%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Value</th>
 <th style="text-align: left;">Meaning</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_HRT</code></td>
 <td style="text-align: left;">Can the symbology print Human Readable
 Text?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_STACKABLE</code></td>
 <td style="text-align: left;">Is the symbology stackable?</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_EANUPC</code><a
 href="#fn13" class="footnote-ref" id="fnref13"
 role="doc-noteref"><sup>13</sup></a></td>
 <td style="text-align: left;">Is the symbology EAN/UPC?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_COMPOSITE</code></td>
 <td style="text-align: left;">Does the symbology support composite data?
 (see <a href="#gs1-composite-symbols-iso-24723">6.3 GS1 Composite
 Symbols (ISO 24723)</a> below)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_ECI</code></td>
 <td style="text-align: left;">Does the symbology support Extended
 Channel Interpretations?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_GS1</code></td>
 <td style="text-align: left;">Does the symbology support GS1 data?</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_DOTTY</code></td>
 <td style="text-align: left;">Can the symbology be outputted as
 dots?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_QUIET_ZONES</code></td>
 <td style="text-align: left;">Does the symbology have default quiet
 zones?</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_FIXED_RATIO</code></td>
 <td style="text-align: left;">Does the symbology have a fixed
 width-to-height (aspect) ratio?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_READER_INIT</code></td>
 <td style="text-align: left;">Does the symbology support Reader
 Initialisation?</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_FULL_MULTIBYTE</code></td>
 <td style="text-align: left;">Is the <code>ZINT_FULL_MULTIBYTE</code>
 option applicable?</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_MASK</code></td>
 <td style="text-align: left;">Is mask selection applicable?</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;"><code>ZINT_CAP_STRUCTAPP</code></td>
 <td style="text-align: left;">Does the symbology support Structured
 Append?</td>
 </tr>
-<tr class="even">
+<tr>
 <td
 style="text-align: left;"><code>ZINT_CAP_COMPLIANT_HEIGHT</code></td>
 <td style="text-align: left;">Does the symbology have a compliant height
@@ -4595,37 +4595,37 @@ data-tag=": MSI Plessey Check Digit Options">
 <caption><span>Table : MSI Plessey Check Digit Options</span>
 </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Value</th>
 <th style="text-align: left;">Check Digits</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>0</td>
 <td style="text-align: left;">None</td>
 </tr>
-<tr class="even">
+<tr>
 <td>1</td>
 <td style="text-align: left;">Modulo-10 (Luhn)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>2</td>
 <td style="text-align: left;">Modulo-10 &amp; Modulo-10</td>
 </tr>
-<tr class="even">
+<tr>
 <td>3</td>
 <td style="text-align: left;">Modulo-11 (IBM)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>4</td>
 <td style="text-align: left;">Modulo-11 (IBM) &amp; Modulo-10</td>
 </tr>
-<tr class="even">
+<tr>
 <td>5</td>
 <td style="text-align: left;">Modulo-11 (NCR)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>6</td>
 <td style="text-align: left;">Modulo-11 (NCR) &amp; Modulo-10</td>
 </tr>
@@ -4933,7 +4933,7 @@ alphanumeric, and is of the form:</p>
 <col style="width: 29%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Destination Post Code</th>
 <th style="text-align: left;">Tracking Number</th>
 <th style="text-align: left;">Service Code</th>
@@ -4941,7 +4941,7 @@ alphanumeric, and is of the form:</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">PPPPPPP (7 alphanumerics)</td>
 <td style="text-align: left;">TTTTTTTTTTTTTT (14 alphanumerics)</td>
 <td style="text-align: left;">SSS (3 digits)</td>
@@ -5077,39 +5077,39 @@ shown in the table below:</p>
 <table id="tbl:channel_maxima" data-tag=": Channel Value Ranges">
 <caption><span>Table : Channel Value Ranges</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Channels</th>
 <th style="text-align: left;">Minimum Value</th>
 <th style="text-align: left;">Maximum Value</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">3</td>
 <td style="text-align: left;">00</td>
 <td style="text-align: left;">26</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">4</td>
 <td style="text-align: left;">000</td>
 <td style="text-align: left;">292</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">5</td>
 <td style="text-align: left;">0000</td>
 <td style="text-align: left;">3493</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">6</td>
 <td style="text-align: left;">00000</td>
 <td style="text-align: left;">44072</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">7</td>
 <td style="text-align: left;">000000</td>
 <td style="text-align: left;">576688</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">8</td>
 <td style="text-align: left;">0000000</td>
 <td style="text-align: left;">7742862</td>
@@ -5367,68 +5367,68 @@ data-tag=": GS1 Composite Symbology Values">
 <col style="width: 53%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Numeric Value</th>
 <th style="text-align: left;">Name</th>
 <th style="text-align: left;">Barcode Name</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">130</td>
 <td style="text-align: left;"><code>BARCODE_EANX_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with EAN linear
 component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">131</td>
 <td style="text-align: left;"><code>BARCODE_GS1_128_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1-128 linear
 component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">132</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMN_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Omnidirectional linear component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">133</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_LTD_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Limited linear component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">134</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXP_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Expanded linear component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">135</td>
 <td style="text-align: left;"><code>BARCODE_UPCA_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with UPC-A linear
 component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">136</td>
 <td style="text-align: left;"><code>BARCODE_UPCE_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with UPC-E linear
 component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">137</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_STK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Stacked component</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">138</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_OMNSTK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
 Stacked Omnidirectional component</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">139</td>
 <td style="text-align: left;"><code>BARCODE_DBAR_EXPSTK_CC</code></td>
 <td style="text-align: left;">GS1 Composite Symbol with GS1 DataBar
@@ -5590,7 +5590,7 @@ data-tag=": Australia Post Input Formats">
 <col style="width: 12%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Input Length</th>
 <th style="text-align: left;">Required Input Format</th>
 <th>Symbol Length</th>
@@ -5599,35 +5599,35 @@ data-tag=": Australia Post Input Formats">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">8</td>
 <td style="text-align: left;"><code>99999999</code></td>
 <td>37-bar</td>
 <td>11</td>
 <td style="text-align: left;">None</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">13</td>
 <td style="text-align: left;"><code>99999999AAAAA</code></td>
 <td>52-bar</td>
 <td>59</td>
 <td style="text-align: left;">C</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">16</td>
 <td style="text-align: left;"><code>9999999999999999</code></td>
 <td>52-bar</td>
 <td>59</td>
 <td style="text-align: left;">N</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">18</td>
 <td style="text-align: left;"><code>99999999AAAAAAAAAA</code></td>
 <td>67-bar</td>
 <td>62</td>
 <td style="text-align: left;">C</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">23</td>
 <td style="text-align: left;"><code>99999999999999999999999</code></td>
 <td>67-bar</td>
@@ -5716,7 +5716,7 @@ data-tag=": Royal Mail 4-State Mailmark Input Fields">
 <col style="width: 23%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Format</th>
 <th style="text-align: left;">Version ID</th>
 <th style="text-align: left;">Class</th>
@@ -5726,7 +5726,7 @@ data-tag=": Royal Mail 4-State Mailmark Input Fields">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">1 digit (0-4)</td>
 <td style="text-align: left;">1 digit (0-3)</td>
 <td style="text-align: left;">1 alphanum. (0-9A-E)</td>
@@ -5745,12 +5745,12 @@ data-tag=": Royal Mail Mailmark Destination+DPS Patterns">
 <caption><span>Table : Royal Mail Mailmark Destination+DPS
 Patterns:</span> </caption>
 <tbody>
-<tr class="odd">
+<tr>
 <td><code>FNFNLLNLS</code></td>
 <td><code>FFNNLLNLS</code></td>
 <td><code>FFNNNLLNL</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td><code>FFNFNLLNL</code></td>
 <td><code>FNNLLNLSS</code></td>
 <td><code>FNNNLLNLS</code></td>
@@ -5846,7 +5846,7 @@ from Zint.</p>
 <table id="tbl:datamatrix_sizes" data-tag=": Data Matrix Sizes">
 <caption><span>Table : Data Matrix Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -5858,7 +5858,7 @@ from Zint.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>10 x 10</td>
 <td></td>
@@ -5868,7 +5868,7 @@ from Zint.</p>
 <td>21</td>
 <td>104 x 104</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>12 x 12</td>
 <td></td>
@@ -5878,7 +5878,7 @@ from Zint.</p>
 <td>22</td>
 <td>120 x 120</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>14 x 14</td>
 <td></td>
@@ -5888,7 +5888,7 @@ from Zint.</p>
 <td>23</td>
 <td>132 x 132</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>16 x 16</td>
 <td></td>
@@ -5898,7 +5898,7 @@ from Zint.</p>
 <td>24</td>
 <td>144 x 144</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>18 x 18</td>
 <td></td>
@@ -5908,7 +5908,7 @@ from Zint.</p>
 <td>25</td>
 <td>8 x 18</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>20 x 20</td>
 <td></td>
@@ -5918,7 +5918,7 @@ from Zint.</p>
 <td>26</td>
 <td>8 x 32</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>22 x 22</td>
 <td></td>
@@ -5928,7 +5928,7 @@ from Zint.</p>
 <td>28</td>
 <td>12 x 26</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>24 x 24</td>
 <td></td>
@@ -5938,7 +5938,7 @@ from Zint.</p>
 <td>28</td>
 <td>12 x 36</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>26 x 26</td>
 <td></td>
@@ -5948,7 +5948,7 @@ from Zint.</p>
 <td>29</td>
 <td>16 x 36</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>32 x 32</td>
 <td></td>
@@ -5972,7 +5972,7 @@ generated with the following values as before:</p>
 <table id="tbl:dmre_sizes" data-tag=": DMRE Sizes">
 <caption><span>Table : DMRE Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -5981,63 +5981,63 @@ generated with the following values as before:</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>31</td>
 <td>8 x 48</td>
 <td></td>
 <td>40</td>
 <td>20 x 36</td>
 </tr>
-<tr class="even">
+<tr>
 <td>32</td>
 <td>8 x 64</td>
 <td></td>
 <td>41</td>
 <td>20 x 44</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>33</td>
 <td>8 x 80</td>
 <td></td>
 <td>42</td>
 <td>20 x 64</td>
 </tr>
-<tr class="even">
+<tr>
 <td>34</td>
 <td>8 x 96</td>
 <td></td>
 <td>43</td>
 <td>22 x 48</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>35</td>
 <td>8 x 120</td>
 <td></td>
 <td>44</td>
 <td>24 x 48</td>
 </tr>
-<tr class="even">
+<tr>
 <td>36</td>
 <td>8 x 144</td>
 <td></td>
 <td>45</td>
 <td>24 x 64</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>37</td>
 <td>12 x 64</td>
 <td></td>
 <td>46</td>
 <td>26 x 40</td>
 </tr>
-<tr class="even">
+<tr>
 <td>38</td>
 <td>12 x 88</td>
 <td></td>
 <td>47</td>
 <td>26 x 48</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>39</td>
 <td>16 x 64</td>
 <td></td>
@@ -6089,64 +6089,64 @@ data-tag=": Royal Mail 2D Mailmark Input Fields">
 <caption><span>Table : Royal Mail 2D Mailmark Input Fields</span>
 </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Field Name</th>
 <th style="text-align: left;">Length</th>
 <th style="text-align: left;">Values</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">UPU Country ID</td>
 <td style="text-align: left;">4</td>
 <td style="text-align: left;"><code>"JGB "</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Information Type</td>
 <td style="text-align: left;">1</td>
 <td style="text-align: left;">Alphanumeric</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Version ID</td>
 <td style="text-align: left;">1</td>
 <td style="text-align: left;"><code>"1"</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Class</td>
 <td style="text-align: left;">1</td>
 <td style="text-align: left;">Alphanumeric</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Supply Chain ID</td>
 <td style="text-align: left;">7</td>
 <td style="text-align: left;">Numeric</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Item ID</td>
 <td style="text-align: left;">8</td>
 <td style="text-align: left;">Numeric</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Destination+DPS</td>
 <td style="text-align: left;">9</td>
 <td style="text-align: left;">Alphanumeric (1 of 6 patterns)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Service Type</td>
 <td style="text-align: left;">1</td>
 <td style="text-align: left;">Numeric</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">RTS Post Code</td>
 <td style="text-align: left;">7</td>
 <td style="text-align: left;">Alphanumeric (1 of 6 patterns)</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Reserved</td>
 <td style="text-align: left;">6</td>
 <td style="text-align: left;">Spaces</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Customer Data</td>
 <td style="text-align: left;">6, 45 or 29</td>
 <td style="text-align: left;">Anything (Latin-1)</td>
@@ -6166,12 +6166,12 @@ data-tag=": Royal Mail 2D Mailmark RTS Patterns">
 <caption><span>Table : Royal Mail 2D Mailmark RTS Patterns</span>
 </caption>
 <tbody>
-<tr class="odd">
+<tr>
 <td><code>FNFNLLS</code></td>
 <td><code>FFNNLLS</code></td>
 <td><code>FFNNNLL</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td><code>FFNFNLL</code></td>
 <td><code>FNNLLSS</code></td>
 <td><code>FNNNLLS</code></td>
@@ -6189,7 +6189,7 @@ amounts of optional customer data:</p>
 data-tag=": Royal Mail 2D Mailmark Sizes">
 <caption><span>Table : Royal Mail 2D Mailmark Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th style="text-align: left;">Name</th>
 <th style="text-align: left;">Size</th>
 <th>Customer Data</th>
@@ -6197,19 +6197,19 @@ data-tag=": Royal Mail 2D Mailmark Sizes">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Type 7</td>
 <td style="text-align: left;">24 x 24</td>
 <td>6 characters</td>
 <td>8</td>
 </tr>
-<tr class="even">
+<tr>
 <td style="text-align: left;">Type 9</td>
 <td style="text-align: left;">32 x 32</td>
 <td>45 characters</td>
 <td>10</td>
 </tr>
-<tr class="odd">
+<tr>
 <td style="text-align: left;">Type 29</td>
 <td style="text-align: left;">16 x 48</td>
 <td>29 characters</td>
@@ -6244,7 +6244,7 @@ following table.</p>
 <table id="tbl:qrcode_eccs" data-tag=": QR Code ECC Levels">
 <caption><span>Table : QR Code ECC Levels</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>ECC Level</th>
 <th>Error Correction Capacity</th>
@@ -6252,25 +6252,25 @@ following table.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>L</td>
 <td>Approx 20% of symbol</td>
 <td>Approx 7%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>M</td>
 <td>Approx 37% of symbol</td>
 <td>Approx 15%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>Q</td>
 <td>Approx 55% of symbol</td>
 <td>Approx 25%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>H</td>
 <td>Approx 65% of symbol</td>
@@ -6287,7 +6287,7 @@ table below.</p>
 <table id="tbl:qrcode_sizes" data-tag=": QR Code Sizes">
 <caption><span>Table : QR Code Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -6299,7 +6299,7 @@ table below.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>21 x 21</td>
 <td></td>
@@ -6309,7 +6309,7 @@ table below.</p>
 <td>29</td>
 <td>133 x 133</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>25 x 25</td>
 <td></td>
@@ -6319,7 +6319,7 @@ table below.</p>
 <td>30</td>
 <td>137 x 137</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>29 x 29</td>
 <td></td>
@@ -6329,7 +6329,7 @@ table below.</p>
 <td>31</td>
 <td>141 x 141</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>33 x 33</td>
 <td></td>
@@ -6339,7 +6339,7 @@ table below.</p>
 <td>32</td>
 <td>145 x 145</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>37 x 37</td>
 <td></td>
@@ -6349,7 +6349,7 @@ table below.</p>
 <td>33</td>
 <td>149 x 149</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>41 x 41</td>
 <td></td>
@@ -6359,7 +6359,7 @@ table below.</p>
 <td>34</td>
 <td>153 x 153</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>45 x 45</td>
 <td></td>
@@ -6369,7 +6369,7 @@ table below.</p>
 <td>35</td>
 <td>157 x 157</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>49 x 49</td>
 <td></td>
@@ -6379,7 +6379,7 @@ table below.</p>
 <td>36</td>
 <td>161 x 161</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>53 x 53</td>
 <td></td>
@@ -6389,7 +6389,7 @@ table below.</p>
 <td>37</td>
 <td>165 x 165</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>57 x 57</td>
 <td></td>
@@ -6399,7 +6399,7 @@ table below.</p>
 <td>38</td>
 <td>169 x 169</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>11</td>
 <td>61 x 61</td>
 <td></td>
@@ -6409,7 +6409,7 @@ table below.</p>
 <td>39</td>
 <td>173 x 173</td>
 </tr>
-<tr class="even">
+<tr>
 <td>12</td>
 <td>65 x 65</td>
 <td></td>
@@ -6419,7 +6419,7 @@ table below.</p>
 <td>40</td>
 <td>177 x 177</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>13</td>
 <td>69 x 69</td>
 <td></td>
@@ -6429,7 +6429,7 @@ table below.</p>
 <td></td>
 <td></td>
 </tr>
-<tr class="even">
+<tr>
 <td>14</td>
 <td>73 x 73</td>
 <td></td>
@@ -6501,7 +6501,7 @@ data-tag=": Micro QR Code Sizes">
 <col style="width: 48%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Version</th>
 <th>Symbol Size</th>
@@ -6509,26 +6509,26 @@ data-tag=": Micro QR Code Sizes">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>M1</td>
 <td>11 x 11</td>
 <td style="text-align: left;">Numeric only</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>M2</td>
 <td>13 x 13</td>
 <td style="text-align: left;">Numeric, uppercase letters, space, and the
 characters <code>"$%*+-./:"</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>M3</td>
 <td>15 x 15</td>
 <td style="text-align: left;">Latin-1 and Shift JIS</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>M4</td>
 <td>17 x 17</td>
@@ -6555,7 +6555,7 @@ data-tag=": Micro QR ECC Levels">
 <col style="width: 20%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th style="text-align: left;">ECC Level</th>
 <th style="text-align: left;">Error Correction Capacity</th>
@@ -6564,21 +6564,21 @@ data-tag=": Micro QR ECC Levels">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td style="text-align: left;">L</td>
 <td style="text-align: left;">Approx 20% of symbol</td>
 <td style="text-align: left;">Approx 7%</td>
 <td style="text-align: left;">M1, M2, M3, M4</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td style="text-align: left;">M</td>
 <td style="text-align: left;">Approx 37% of symbol</td>
 <td style="text-align: left;">Approx 15%</td>
 <td style="text-align: left;">M2, M3, M4</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td style="text-align: left;">Q</td>
 <td style="text-align: left;">Approx 55% of symbol</td>
@@ -6620,7 +6620,7 @@ for this type of symbol.</p>
 <table id="tbl:rmqr_eccs" data-tag=": rMQR ECC Levels">
 <caption><span>Table : rMQR ECC Levels</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>ECC Level</th>
 <th>Error Correction Capacity</th>
@@ -6628,13 +6628,13 @@ for this type of symbol.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>2</td>
 <td>M</td>
 <td>Approx 37% of symbol</td>
 <td>Approx 15%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>H</td>
 <td>Approx 65% of symbol</td>
@@ -6660,7 +6660,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <col style="width: 28%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Version</th>
 <th>Symbol Size (HxW)</th>
@@ -6671,7 +6671,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>R7x43</td>
 <td>7 x 43</td>
@@ -6680,7 +6680,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R13x77</td>
 <td style="text-align: left;">13 x 77</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>R7x59</td>
 <td>7 x 59</td>
@@ -6689,7 +6689,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R13x99</td>
 <td style="text-align: left;">13 x 99</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>R7x77</td>
 <td>7 x 77</td>
@@ -6698,7 +6698,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R13x139</td>
 <td style="text-align: left;">13 x 139</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>R7x99</td>
 <td>7 x 99</td>
@@ -6707,7 +6707,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15x43</td>
 <td style="text-align: left;">15 x 43</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>R7x139</td>
 <td>7 x 139</td>
@@ -6716,7 +6716,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15x59</td>
 <td style="text-align: left;">15 x 59</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>R9x43</td>
 <td>9 x 43</td>
@@ -6725,7 +6725,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15x77</td>
 <td style="text-align: left;">15 x 77</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>R9x59</td>
 <td>9 x 59</td>
@@ -6734,7 +6734,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15x99</td>
 <td style="text-align: left;">15 x 99</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>R9x77</td>
 <td>9 x 77</td>
@@ -6743,7 +6743,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15x139</td>
 <td style="text-align: left;">15 x 139</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>R9x99</td>
 <td>9 x 99</td>
@@ -6752,7 +6752,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R17x43</td>
 <td style="text-align: left;">17 x 43</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>R9x139</td>
 <td>9 x 139</td>
@@ -6761,7 +6761,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R17x59</td>
 <td style="text-align: left;">17 x 59</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>11</td>
 <td>R11x27</td>
 <td>11 x 27</td>
@@ -6770,7 +6770,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R17x77</td>
 <td style="text-align: left;">17 x 77</td>
 </tr>
-<tr class="even">
+<tr>
 <td>12</td>
 <td>R11x43</td>
 <td>11 x 43</td>
@@ -6779,7 +6779,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R17x99</td>
 <td style="text-align: left;">17 x 99</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>13</td>
 <td>R11x59</td>
 <td>11 x 59</td>
@@ -6788,7 +6788,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R17x139</td>
 <td style="text-align: left;">17 x 139</td>
 </tr>
-<tr class="even">
+<tr>
 <td>14</td>
 <td>R11x77</td>
 <td>11 x 77</td>
@@ -6797,7 +6797,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R7xW</td>
 <td style="text-align: left;">7 x automatic width</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>15</td>
 <td>R11x99</td>
 <td>11 x 99</td>
@@ -6806,7 +6806,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R9xW</td>
 <td style="text-align: left;">9 x automatic width</td>
 </tr>
-<tr class="even">
+<tr>
 <td>16</td>
 <td>R11x139</td>
 <td>11 x 139</td>
@@ -6815,7 +6815,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R11xW</td>
 <td style="text-align: left;">11 x automatic width</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>17</td>
 <td>R13x27</td>
 <td>13 x 27</td>
@@ -6824,7 +6824,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R13xW</td>
 <td style="text-align: left;">13 x automatic width</td>
 </tr>
-<tr class="even">
+<tr>
 <td>18</td>
 <td>R13x43</td>
 <td>13 x 43</td>
@@ -6833,7 +6833,7 @@ while allowing Zint to determine the minimum symbol width.</p>
 <td>R15xW</td>
 <td style="text-align: left;">15 x automatic width</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>19</td>
 <td>R13x59</td>
 <td>13 x 59</td>
@@ -6864,7 +6864,7 @@ set by Zint and do not need to be specified. UPNQR is unusual in that it
 uses Latin-2 (ISO/IEC 8859-2 plus ASCII) formatted data. Zint will
 accept UTF-8 data and convert it to Latin-2, or if your data is already
 Latin-2 formatted use the <code>--binary</code> switch (API
-<code>input_mode = DATA MODE</code>).</p>
+<code>input_mode = DATA_MODE</code>).</p>
 <p>The following example creates a symbol from data saved as a Latin-2
 file:</p>
 <div class="sourceCode" id="cb113"><pre
@@ -6893,46 +6893,46 @@ data-tag=": MaxiCode Structured Carrier Message Format">
 <caption><span>Table : MaxiCode Structured Carrier Message
 Format:</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Characters</th>
 <th style="text-align: left;">Meaning</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1 - 9</td>
 <td style="text-align: left;">Postcode data which can consist of up to 9
 digits (for mode 2)</td>
 </tr>
-<tr class="even">
+<tr>
 <td></td>
 <td style="text-align: left;">or up to 6 alphanumeric characters (for
 mode 3). Remaining</td>
 </tr>
-<tr class="odd">
+<tr>
 <td></td>
 <td style="text-align: left;">unused characters for mode 3 can be filled
 with the SPACE</td>
 </tr>
-<tr class="even">
+<tr>
 <td></td>
 <td style="text-align: left;">character (ASCII 32) or omitted.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td></td>
 <td style="text-align: left;">(adjust the following character positions
 according to postcode</td>
 </tr>
-<tr class="even">
+<tr>
 <td></td>
 <td style="text-align: left;">length)</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>10 - 12</td>
 <td style="text-align: left;">Three-digit country code according to ISO
 3166-1.</td>
 </tr>
-<tr class="even">
+<tr>
 <td>13 - 15</td>
 <td style="text-align: left;">Three-digit service code. This depends on
 your parcel courier.</td>
@@ -6989,7 +6989,7 @@ data-tag=": MaxiCode Data Length Maxima">
 <col style="width: 30%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>Mode</th>
 <th>Maximum Data Length for Capital Letters</th>
 <th style="text-align: left;">Maximum Data Length for Numeric
@@ -6998,31 +6998,31 @@ Digits</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>2<code>*</code></td>
 <td>84</td>
 <td style="text-align: left;">126</td>
 <td style="text-align: left;">50</td>
 </tr>
-<tr class="even">
+<tr>
 <td>3<code>*</code></td>
 <td>84</td>
 <td style="text-align: left;">126</td>
 <td style="text-align: left;">50</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>4</td>
 <td>93</td>
 <td style="text-align: left;">138</td>
 <td style="text-align: left;">50</td>
 </tr>
-<tr class="even">
+<tr>
 <td>5</td>
 <td>77</td>
 <td style="text-align: left;">113</td>
 <td style="text-align: left;">66</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>6</td>
 <td>93</td>
 <td style="text-align: left;">138</td>
@@ -7064,7 +7064,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <table id="tbl:aztec_sizes" data-tag=": Aztec Code Sizes">
 <caption><span>Table : Aztec Code Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -7076,7 +7076,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>15 x 15<code>*</code></td>
 <td></td>
@@ -7086,7 +7086,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>25</td>
 <td>105 x 105</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>19 x 19<code>*</code></td>
 <td></td>
@@ -7096,7 +7096,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>26</td>
 <td>109 x 109</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>23 x 23<code>*</code></td>
 <td></td>
@@ -7106,7 +7106,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>27</td>
 <td>113 x 113</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>27 x 27<code>*</code></td>
 <td></td>
@@ -7116,7 +7116,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>28</td>
 <td>117 x 117</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>19 x 19</td>
 <td></td>
@@ -7126,7 +7126,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>29</td>
 <td>121 x 121</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>23 x 23</td>
 <td></td>
@@ -7136,7 +7136,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>30</td>
 <td>125 x 125</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>27 x 27</td>
 <td></td>
@@ -7146,7 +7146,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>31</td>
 <td>131 x 131</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>31 x 31</td>
 <td></td>
@@ -7156,7 +7156,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>32</td>
 <td>135 x 135</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>37 x 37</td>
 <td></td>
@@ -7166,7 +7166,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>33</td>
 <td>139 x 139</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>41 x 41</td>
 <td></td>
@@ -7176,7 +7176,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>34</td>
 <td>143 x 143</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>11</td>
 <td>45 x 45</td>
 <td></td>
@@ -7186,7 +7186,7 @@ have a smaller bullseye pattern at the centre of the symbol.</p>
 <td>35</td>
 <td>147 x 147</td>
 </tr>
-<tr class="even">
+<tr>
 <td>12</td>
 <td>49 x 49</td>
 <td></td>
@@ -7211,25 +7211,25 @@ data-tag=": Aztec Code Error Correction Modes">
 <caption><span>Table : Aztec Code Error Correction Modes</span>
 </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Mode</th>
 <th>Error Correction Capacity</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>&gt;10% + 3 codewords</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>&gt;23% + 3 codewords</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>&gt;36% + 3 codewords</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>&gt;50% + 3 codewords</td>
 </tr>
@@ -7287,7 +7287,7 @@ data-tag=": Code One Sizes">
 <col style="width: 22%" />
 </colgroup>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Version</th>
 <th style="text-align: left;">Size (W x H)</th>
@@ -7296,70 +7296,70 @@ data-tag=": Code One Sizes">
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>A</td>
 <td style="text-align: left;">16 x 18</td>
 <td style="text-align: left;">22</td>
 <td style="text-align: left;">13</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>B</td>
 <td style="text-align: left;">22 x 22</td>
 <td style="text-align: left;">44</td>
 <td style="text-align: left;">27</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>C</td>
 <td style="text-align: left;">28 x 28</td>
 <td style="text-align: left;">104</td>
 <td style="text-align: left;">64</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>D</td>
 <td style="text-align: left;">40 x 42</td>
 <td style="text-align: left;">217</td>
 <td style="text-align: left;">135</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>E</td>
 <td style="text-align: left;">52 x 54</td>
 <td style="text-align: left;">435</td>
 <td style="text-align: left;">271</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>F</td>
 <td style="text-align: left;">70 x 76</td>
 <td style="text-align: left;">886</td>
 <td style="text-align: left;">553</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>G</td>
 <td style="text-align: left;">104 x 98</td>
 <td style="text-align: left;">1755</td>
 <td style="text-align: left;">1096</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>H</td>
 <td style="text-align: left;">148 x 134</td>
 <td style="text-align: left;">3550</td>
 <td style="text-align: left;">2218</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>S</td>
 <td style="text-align: left;">width x 8</td>
 <td style="text-align: left;">18</td>
 <td style="text-align: left;">N/A</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>T</td>
 <td style="text-align: left;">width x 16</td>
@@ -7403,7 +7403,7 @@ specified by using the <code>--secure</code> option (API
 <table id="tbl:gridmatrix_sizes" data-tag=": Grid Matrix Sizes">
 <caption><span>Table : Grid Matrix Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -7412,49 +7412,49 @@ specified by using the <code>--secure</code> option (API
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>18 x 18</td>
 <td></td>
 <td>8</td>
 <td>102 x 102</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>30 x 30</td>
 <td></td>
 <td>9</td>
 <td>114 x 114</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>42 x 42</td>
 <td></td>
 <td>10</td>
 <td>126 x 126</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>54 x 54</td>
 <td></td>
 <td>11</td>
 <td>138 x 138</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>66 x 66</td>
 <td></td>
 <td>12</td>
 <td>150 x 150</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>78 x 78</td>
 <td></td>
 <td>13</td>
 <td>162 x 162</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>90 x 90</td>
 <td></td>
@@ -7470,29 +7470,29 @@ data-tag=": Grid Matrix Error Correction Modes">
 <caption><span>Table : Grid Matrix Error Correction Modes</span>
 </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Mode</th>
 <th>Error Correction Capacity</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>Approximately 10%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>Approximately 20%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>Approximately 30%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>Approximately 40%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>Approximately 50%</td>
 </tr>
@@ -7555,7 +7555,7 @@ to the following table.</p>
 <table id="tbl:hanxin_sizes" data-tag=": Han Xin Sizes">
 <caption><span>Table : Han Xin Sizes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Input</th>
 <th>Symbol Size</th>
 <th></th>
@@ -7567,7 +7567,7 @@ to the following table.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>23 x 23</td>
 <td></td>
@@ -7577,7 +7577,7 @@ to the following table.</p>
 <td>57</td>
 <td>135 x 135</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>25 x 25</td>
 <td></td>
@@ -7587,7 +7587,7 @@ to the following table.</p>
 <td>58</td>
 <td>137 x 137</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>27 x 27</td>
 <td></td>
@@ -7597,7 +7597,7 @@ to the following table.</p>
 <td>59</td>
 <td>139 x 139</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>29 x 29</td>
 <td></td>
@@ -7607,7 +7607,7 @@ to the following table.</p>
 <td>60</td>
 <td>141 x 141</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>31 x 31</td>
 <td></td>
@@ -7617,7 +7617,7 @@ to the following table.</p>
 <td>61</td>
 <td>143 x 143</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>33 x 33</td>
 <td></td>
@@ -7627,7 +7627,7 @@ to the following table.</p>
 <td>62</td>
 <td>145 x 145</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>7</td>
 <td>35 x 35</td>
 <td></td>
@@ -7637,7 +7637,7 @@ to the following table.</p>
 <td>63</td>
 <td>147 x 147</td>
 </tr>
-<tr class="even">
+<tr>
 <td>8</td>
 <td>37 x 37</td>
 <td></td>
@@ -7647,7 +7647,7 @@ to the following table.</p>
 <td>64</td>
 <td>149 x 149</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>9</td>
 <td>39 x 39</td>
 <td></td>
@@ -7657,7 +7657,7 @@ to the following table.</p>
 <td>65</td>
 <td>151 x 151</td>
 </tr>
-<tr class="even">
+<tr>
 <td>10</td>
 <td>41 x 41</td>
 <td></td>
@@ -7667,7 +7667,7 @@ to the following table.</p>
 <td>66</td>
 <td>153 x 153</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>11</td>
 <td>43 x 43</td>
 <td></td>
@@ -7677,7 +7677,7 @@ to the following table.</p>
 <td>67</td>
 <td>155 x 155</td>
 </tr>
-<tr class="even">
+<tr>
 <td>12</td>
 <td>45 x 45</td>
 <td></td>
@@ -7687,7 +7687,7 @@ to the following table.</p>
 <td>68</td>
 <td>157 x 157</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>13</td>
 <td>47 x 47</td>
 <td></td>
@@ -7697,7 +7697,7 @@ to the following table.</p>
 <td>69</td>
 <td>159 x 159</td>
 </tr>
-<tr class="even">
+<tr>
 <td>14</td>
 <td>49 x 49</td>
 <td></td>
@@ -7707,7 +7707,7 @@ to the following table.</p>
 <td>70</td>
 <td>161 x 161</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>15</td>
 <td>51 x 51</td>
 <td></td>
@@ -7717,7 +7717,7 @@ to the following table.</p>
 <td>71</td>
 <td>163 x 163</td>
 </tr>
-<tr class="even">
+<tr>
 <td>16</td>
 <td>53 x 53</td>
 <td></td>
@@ -7727,7 +7727,7 @@ to the following table.</p>
 <td>72</td>
 <td>165 x 165</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>17</td>
 <td>55 x 55</td>
 <td></td>
@@ -7737,7 +7737,7 @@ to the following table.</p>
 <td>73</td>
 <td>167 x 167</td>
 </tr>
-<tr class="even">
+<tr>
 <td>18</td>
 <td>57 x 57</td>
 <td></td>
@@ -7747,7 +7747,7 @@ to the following table.</p>
 <td>74</td>
 <td>169 x 169</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>19</td>
 <td>59 x 59</td>
 <td></td>
@@ -7757,7 +7757,7 @@ to the following table.</p>
 <td>75</td>
 <td>171 x 171</td>
 </tr>
-<tr class="even">
+<tr>
 <td>20</td>
 <td>61 x 61</td>
 <td></td>
@@ -7767,7 +7767,7 @@ to the following table.</p>
 <td>76</td>
 <td>173 x 173</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>21</td>
 <td>63 x 63</td>
 <td></td>
@@ -7777,7 +7777,7 @@ to the following table.</p>
 <td>77</td>
 <td>175 x 175</td>
 </tr>
-<tr class="even">
+<tr>
 <td>22</td>
 <td>65 x 65</td>
 <td></td>
@@ -7787,7 +7787,7 @@ to the following table.</p>
 <td>78</td>
 <td>177 x 177</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>23</td>
 <td>67 x 67</td>
 <td></td>
@@ -7797,7 +7797,7 @@ to the following table.</p>
 <td>79</td>
 <td>179 x 179</td>
 </tr>
-<tr class="even">
+<tr>
 <td>24</td>
 <td>69 x 69</td>
 <td></td>
@@ -7807,7 +7807,7 @@ to the following table.</p>
 <td>80</td>
 <td>181 x 181</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>25</td>
 <td>71 x 71</td>
 <td></td>
@@ -7817,7 +7817,7 @@ to the following table.</p>
 <td>81</td>
 <td>183 x 183</td>
 </tr>
-<tr class="even">
+<tr>
 <td>26</td>
 <td>73 x 73</td>
 <td></td>
@@ -7827,7 +7827,7 @@ to the following table.</p>
 <td>82</td>
 <td>185 x 185</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>27</td>
 <td>75 x 75</td>
 <td></td>
@@ -7837,7 +7837,7 @@ to the following table.</p>
 <td>83</td>
 <td>187 x 187</td>
 </tr>
-<tr class="even">
+<tr>
 <td>28</td>
 <td>77 x 77</td>
 <td></td>
@@ -7860,25 +7860,25 @@ Xin Code which can be set by using the <code>--secure</code> option (API
 <table id="tbl:hanxin_eccs" data-tag=": Han Xin Error Correction Modes">
 <caption><span>Table : Han Xin Error Correction Modes</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Mode</th>
 <th>Recovery Capacity</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>Approx 8%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>Approx 15%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>Approx 23%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>Approx 30%</td>
 </tr>
@@ -7914,39 +7914,39 @@ data-tag=": Ultracode Error Correction Values">
 <caption><span>Table : Ultracode Error Correction Values</span>
 </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Value</th>
 <th>EC Level</th>
 <th>Amount of symbol holding error correction data</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>1</td>
 <td>EC0</td>
 <td>0% - Error detection only</td>
 </tr>
-<tr class="even">
+<tr>
 <td>2</td>
 <td>EC1</td>
 <td>Approx 5%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>3</td>
 <td>EC2</td>
 <td>Approx 9% - Default value</td>
 </tr>
-<tr class="even">
+<tr>
 <td>4</td>
 <td>EC3</td>
 <td>Approx 17%</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>5</td>
 <td>EC4</td>
 <td>Approx 25%</td>
 </tr>
-<tr class="even">
+<tr>
 <td>6</td>
 <td>EC5</td>
 <td>Approx 33%</td>
@@ -7989,37 +7989,37 @@ below.</p>
 <table id="tbl:fim_characters" data-tag=": Valid FIM Characters">
 <caption><span>Table : Valid FIM Characters</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Code Letter</th>
 <th style="text-align: left;">Usage</th>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>A</td>
 <td style="text-align: left;">Used for courtesy reply mail and metered
 reply mail with a</td>
 </tr>
-<tr class="even">
+<tr>
 <td></td>
 <td style="text-align: left;">pre-printed POSTNET symbol.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>B</td>
 <td style="text-align: left;">Used for business reply mail without a
 pre-printed zip code.</td>
 </tr>
-<tr class="even">
+<tr>
 <td>C</td>
 <td style="text-align: left;">Used for business reply mail with a
 pre-printed zip code.</td>
 </tr>
-<tr class="odd">
+<tr>
 <td>D</td>
 <td style="text-align: left;">Used for Information Based Indicia (IBI)
 postage.</td>
 </tr>
-<tr class="even">
+<tr>
 <td>E</td>
 <td style="text-align: left;">Used for customized mail with a USPS
 Intelligent Mail barcode.</td>
@@ -8202,7 +8202,7 @@ It’s reproduced here for reference.</p>
 <table id="tbl:ascii" data-tag=": ASCII">
 <caption><span>Table : ASCII</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Hex</th>
 <th style="text-align: left;">0</th>
 <th style="text-align: left;">1</th>
@@ -8215,7 +8215,7 @@ It’s reproduced here for reference.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>0</td>
 <td style="text-align: left;"><code>NUL</code></td>
 <td style="text-align: left;"><code>DLE</code></td>
@@ -8226,7 +8226,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>`</code></td>
 <td style="text-align: left;"><code>p</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>1</td>
 <td style="text-align: left;"><code>SOH</code></td>
 <td style="text-align: left;"><code>DC1</code></td>
@@ -8237,7 +8237,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>a</code></td>
 <td style="text-align: left;"><code>q</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>2</td>
 <td style="text-align: left;"><code>STX</code></td>
 <td style="text-align: left;"><code>DC2</code></td>
@@ -8248,7 +8248,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>b</code></td>
 <td style="text-align: left;"><code>r</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>3</td>
 <td style="text-align: left;"><code>ETX</code></td>
 <td style="text-align: left;"><code>DC3</code></td>
@@ -8259,7 +8259,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>c</code></td>
 <td style="text-align: left;"><code>s</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>4</td>
 <td style="text-align: left;"><code>EOT</code></td>
 <td style="text-align: left;"><code>DC4</code></td>
@@ -8270,7 +8270,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>d</code></td>
 <td style="text-align: left;"><code>t</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>5</td>
 <td style="text-align: left;"><code>ENQ</code></td>
 <td style="text-align: left;"><code>NAK</code></td>
@@ -8281,7 +8281,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>e</code></td>
 <td style="text-align: left;"><code>u</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>6</td>
 <td style="text-align: left;"><code>ACK</code></td>
 <td style="text-align: left;"><code>SYN</code></td>
@@ -8292,7 +8292,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>f</code></td>
 <td style="text-align: left;"><code>v</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>7</td>
 <td style="text-align: left;"><code>BEL</code></td>
 <td style="text-align: left;"><code>ETB</code></td>
@@ -8303,7 +8303,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>g</code></td>
 <td style="text-align: left;"><code>w</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>8</td>
 <td style="text-align: left;"><code>BS</code></td>
 <td style="text-align: left;"><code>CAN</code></td>
@@ -8314,7 +8314,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>h</code></td>
 <td style="text-align: left;"><code>x</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>9</td>
 <td style="text-align: left;"><code>TAB</code></td>
 <td style="text-align: left;"><code>EM</code></td>
@@ -8325,7 +8325,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>i</code></td>
 <td style="text-align: left;"><code>y</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>A</td>
 <td style="text-align: left;"><code>LF</code></td>
 <td style="text-align: left;"><code>SUB</code></td>
@@ -8336,7 +8336,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>j</code></td>
 <td style="text-align: left;"><code>z</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>B</td>
 <td style="text-align: left;"><code>VT</code></td>
 <td style="text-align: left;"><code>ESC</code></td>
@@ -8347,7 +8347,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>k</code></td>
 <td style="text-align: left;"><code>{</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>C</td>
 <td style="text-align: left;"><code>FF</code></td>
 <td style="text-align: left;"><code>FS</code></td>
@@ -8358,7 +8358,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>l</code></td>
 <td style="text-align: left;"><code>|</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>D</td>
 <td style="text-align: left;"><code>CR</code></td>
 <td style="text-align: left;"><code>GS</code></td>
@@ -8369,7 +8369,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>m</code></td>
 <td style="text-align: left;"><code>}</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>E</td>
 <td style="text-align: left;"><code>SO</code></td>
 <td style="text-align: left;"><code>RS</code></td>
@@ -8380,7 +8380,7 @@ It’s reproduced here for reference.</p>
 <td style="text-align: left;"><code>n</code></td>
 <td style="text-align: left;"><code>~</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>F</td>
 <td style="text-align: left;"><code>SI</code></td>
 <td style="text-align: left;"><code>US</code></td>
@@ -8406,7 +8406,7 @@ not defined.</p>
 <table id="tbl:iso_iec_8869_1" data-tag=": ISO/IEC 8859-1">
 <caption><span>Table : ISO/IEC 8859-1</span> </caption>
 <thead>
-<tr class="header">
+<tr>
 <th>Hex</th>
 <th style="text-align: left;">8</th>
 <th style="text-align: left;">9</th>
@@ -8419,7 +8419,7 @@ not defined.</p>
 </tr>
 </thead>
 <tbody>
-<tr class="odd">
+<tr>
 <td>0</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8430,7 +8430,7 @@ not defined.</p>
 <td style="text-align: left;"><code>à</code></td>
 <td style="text-align: left;"><code>ð</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>1</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8441,7 +8441,7 @@ not defined.</p>
 <td style="text-align: left;"><code>á</code></td>
 <td style="text-align: left;"><code>ñ</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>2</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8452,7 +8452,7 @@ not defined.</p>
 <td style="text-align: left;"><code>â</code></td>
 <td style="text-align: left;"><code>ò</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>3</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8463,7 +8463,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ã</code></td>
 <td style="text-align: left;"><code>ó</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>4</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8474,7 +8474,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ä</code></td>
 <td style="text-align: left;"><code>ô</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>5</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8485,7 +8485,7 @@ not defined.</p>
 <td style="text-align: left;"><code>å</code></td>
 <td style="text-align: left;"><code>õ</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>6</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8496,7 +8496,7 @@ not defined.</p>
 <td style="text-align: left;"><code>æ</code></td>
 <td style="text-align: left;"><code>ö</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>7</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8507,7 +8507,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ç</code></td>
 <td style="text-align: left;"><code>÷</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>8</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8518,7 +8518,7 @@ not defined.</p>
 <td style="text-align: left;"><code>è</code></td>
 <td style="text-align: left;"><code>ø</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>9</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8529,7 +8529,7 @@ not defined.</p>
 <td style="text-align: left;"><code>é</code></td>
 <td style="text-align: left;"><code>ù</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>A</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8540,7 +8540,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ê</code></td>
 <td style="text-align: left;"><code>ú</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>B</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8551,7 +8551,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ë</code></td>
 <td style="text-align: left;"><code>û</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>C</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8562,7 +8562,7 @@ not defined.</p>
 <td style="text-align: left;"><code>ì</code></td>
 <td style="text-align: left;"><code>ü</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>D</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8573,7 +8573,7 @@ not defined.</p>
 <td style="text-align: left;"><code>í</code></td>
 <td style="text-align: left;"><code>ý</code></td>
 </tr>
-<tr class="odd">
+<tr>
 <td>E</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
@@ -8584,7 +8584,7 @@ not defined.</p>
 <td style="text-align: left;"><code>î</code></td>
 <td style="text-align: left;"><code>þ</code></td>
 </tr>
-<tr class="even">
+<tr>
 <td>F</td>
 <td style="text-align: left;"></td>
 <td style="text-align: left;"></td>
diff --git a/docs/manual.pmd b/docs/manual.pmd
index ab8d66fb..5a3698a7 100644
--- a/docs/manual.pmd
+++ b/docs/manual.pmd
@@ -1,6 +1,6 @@
 % Zint Barcode Generator and Zint Barcode Studio User Manual
 % Version 2.13.0.9
-% May 2024
+% June 2024
 
 # 1. Introduction
 
@@ -4246,7 +4246,7 @@ Slovenia). The size, error correction level and ECI are set by Zint and do not
 need to be specified. UPNQR is unusual in that it uses Latin-2 (ISO/IEC 8859-2
 plus ASCII) formatted data. Zint will accept UTF-8 data and convert it to
 Latin-2, or if your data is already Latin-2 formatted use the `--binary` switch
-(API `input_mode = DATA MODE`).
+(API `input_mode = DATA_MODE`).
 
 The following example creates a symbol from data saved as a Latin-2 file:
 
diff --git a/docs/manual.txt b/docs/manual.txt
index 87b7df0f..8dfa8af6 100644
--- a/docs/manual.txt
+++ b/docs/manual.txt
@@ -1,6 +1,6 @@
 Zint Barcode Generator and Zint Barcode Studio User Manual
 Version 2.13.0.9
-May 2024
+June 2024
 
 *******************************************************************************
 * For reference the following is a text-only version of the Zint manual,      *
@@ -4082,7 +4082,7 @@ Slovenia). The size, error correction level and ECI are set by Zint and do not
 need to be specified. UPNQR is unusual in that it uses Latin-2 (ISO/IEC 8859-2
 plus ASCII) formatted data. Zint will accept UTF-8 data and convert it to
 Latin-2, or if your data is already Latin-2 formatted use the --binary switch
-(API input_mode = DATA MODE).
+(API input_mode = DATA_MODE).
 
 The following example creates a symbol from data saved as a Latin-2 file:
 
@@ -4814,7 +4814,7 @@ configured barcode is displayed once the "Generate" button is pressed.
 
 Annex D. Man Page ZINT(1)
 
-% ZINT(1) Version 2.13.0.9 % % May 2024
+% ZINT(1) Version 2.13.0.9 % % June 2024
 
 NAME
 
diff --git a/docs/templates/styles.html b/docs/templates/styles.html
index b307ffe2..5c543dcd 100644
--- a/docs/templates/styles.html
+++ b/docs/templates/styles.html
@@ -220,7 +220,7 @@ td {
 tbody tr:first-child td {
   padding-top: 0.5em;
 }
-header {
+thead > tr {
   margin-bottom: 4em;
   text-align: center;
 }
diff --git a/docs/zint.1 b/docs/zint.1
index a524ae20..fe50dadd 100644
--- a/docs/zint.1
+++ b/docs/zint.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.2
 .\"
-.TH "ZINT" "1" "May 2024" "Version 2.13.0.9" ""
+.TH "ZINT" "1" "June 2024" "Version 2.13.0.9" ""
 .SH NAME
 \f[CR]zint\f[R] \- encode data as a barcode image
 .SH SYNOPSIS
diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd
index 48d4d0ef..fb2b46d0 100644
--- a/docs/zint.1.pmd
+++ b/docs/zint.1.pmd
@@ -1,6 +1,6 @@
 % ZINT(1) Version 2.13.0.9
 %
-% May 2024
+% June 2024
 
 # NAME
 
diff --git a/frontend/main.c b/frontend/main.c
index 455ef3a7..1469e1eb 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -48,24 +48,15 @@ typedef char static_assert_int_at_least_32bits[sizeof(int) * CHAR_BIT < 32 ? -1
 
 /* Following copied from "backend/common.h" */
 
-#ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) ((int) (sizeof(x) / sizeof((x)[0])))
-#endif
-
-/* Determine if C89 or C99 (excluding MSVC, which doesn't define __STDC_VERSION__) */
-#ifndef _MSC_VER
-#  if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L
-#    define ZINT_IS_C89
-#  elif __STDC_VERSION__ <= 199901L /* Actually includes pseudo-standards "C94/C95" as well */
-#    define ZINT_IS_C99
-#  endif
-#endif
 
 #ifdef _MSC_VER
 #  include <malloc.h>
 #  define z_alloca(nmemb) _alloca(nmemb)
+#elif defined(__COMPCERT__)
+#  define z_alloca(nmemb) malloc(nmemb) /* So links - leads to loads of leaks obs */
 #else
-#  if defined(ZINT_IS_C89) || defined(ZINT_IS_C99) || defined(__NuttX__) || defined(_AIX) \
+#  if (defined(__GNUC__) && !defined(alloca) && !defined(__NetBSD__)) || defined(__NuttX__) || defined(_AIX) \
         || (defined(__sun) && defined(__SVR4) /*Solaris*/)
 #    include <alloca.h>
 #  endif
@@ -749,20 +740,20 @@ static int validate_units(char *buf, const char units[][5], int units_size) {
 }
 
 /* Parse and validate argument "xdim[,resolution]" to "--scalexdimdp" */
-static int validate_scalexdimdp(const char *optarg, float *p_x_dim_mm, float *p_dpmm) {
+static int validate_scalexdimdp(const char *arg, float *p_x_dim_mm, float *p_dpmm) {
     static const char x_units[][5] = { "mm", "in" };
     static const char r_units[][5] = { "dpmm", "dpi" };
     char x_buf[7 + 1 + 4 + 1] = {0}; /* Allow for 7 digits + dot + 4-char unit + NUL */
     char r_buf[7 + 1 + 4 + 1] = {0}; /* As above */
     int units_i; /* For `validate_units()` */
     char errbuf[64]; /* For `validate_float()` */
-    const char *comma = strchr(optarg, ',');
+    const char *comma = strchr(arg, ',');
     if (comma) {
-        if (comma == optarg || comma - optarg >= ARRAY_SIZE(x_buf)) {
-            fprintf(stderr, "Error 174: scalexdimdp X-dim too %s\n", comma == optarg ? "short" : "long");
+        if (comma == arg || comma - arg >= ARRAY_SIZE(x_buf)) {
+            fprintf(stderr, "Error 174: scalexdimdp X-dim too %s\n", comma == arg ? "short" : "long");
             return 0;
         }
-        strncpy(x_buf, optarg, comma - optarg);
+        strncpy(x_buf, arg, comma - arg);
         comma++;
         if (!*comma || strlen(comma) >= ARRAY_SIZE(r_buf)) {
             fprintf(stderr, "Error 175: scalexdimdp resolution too %s\n", !*comma ? "short" : "long");
@@ -770,11 +761,11 @@ static int validate_scalexdimdp(const char *optarg, float *p_x_dim_mm, float *p_
         }
         strcpy(r_buf, comma);
     } else {
-        if (!*optarg || strlen(optarg) >= ARRAY_SIZE(x_buf)) {
-            fprintf(stderr, "Error 176: scalexdimdp X-dim too %s\n", !*optarg ? "short" : "long");
+        if (!*arg || strlen(arg) >= ARRAY_SIZE(x_buf)) {
+            fprintf(stderr, "Error 176: scalexdimdp X-dim too %s\n", !*arg ? "short" : "long");
             return 0;
         }
-        strcpy(x_buf, optarg);
+        strcpy(x_buf, arg);
     }
     if ((units_i = validate_units(x_buf, x_units, ARRAY_SIZE(x_units))) == -2) {
         fprintf(stderr, "Error 177: scalexdimdp X-dim units must occur at end\n");
@@ -809,19 +800,19 @@ static int validate_scalexdimdp(const char *optarg, float *p_x_dim_mm, float *p_
 }
 
 /* Parse and validate Structured Append argument "index,count[,ID]" to "--structapp" */
-static int validate_structapp(const char *optarg, struct zint_structapp *structapp) {
+static int validate_structapp(const char *arg, struct zint_structapp *structapp) {
     char index[10] = {0}, count[10] = {0};
-    const char *comma = strchr(optarg, ',');
+    const char *comma = strchr(arg, ',');
     const char *comma2;
     if (!comma) {
         fprintf(stderr, "Error 155: Invalid Structured Append argument, expect \"index,count[,ID]\"\n");
         return 0;
     }
-    if (comma == optarg || comma - optarg > 9) {
-        fprintf(stderr, "Error 156: Structured Append index too %s\n", comma == optarg ? "short" : "long");
+    if (comma == arg || comma - arg > 9) {
+        fprintf(stderr, "Error 156: Structured Append index too %s\n", comma == arg ? "short" : "long");
         return 0;
     }
-    strncpy(index, optarg, comma - optarg);
+    strncpy(index, arg, comma - arg);
     comma++;
     comma2 = strchr(comma, ',');
     if (comma2) {
@@ -864,14 +855,14 @@ static int validate_structapp(const char *optarg, struct zint_structapp *structa
 }
 
 /* Parse and validate the segment argument "ECI,DATA" to "--segN" */
-static int validate_seg(const char *optarg, const int N, struct zint_seg segs[10]) {
+static int validate_seg(const char *arg, const int N, struct zint_seg segs[10]) {
     char eci[10] = {0};
-    const char *comma = strchr(optarg, ',');
-    if (!comma || comma == optarg || comma - optarg > 9 || *(comma + 1) == '\0') {
+    const char *comma = strchr(arg, ',');
+    if (!comma || comma == arg || comma - arg > 9 || *(comma + 1) == '\0') {
         fprintf(stderr, "Error 166: Invalid segment argument, expect \"ECI,DATA\"\n");
         return 0;
     }
-    strncpy(eci, optarg, comma - optarg);
+    strncpy(eci, arg, comma - arg);
     if (!validate_int(eci, -1 /*len*/, &segs[N].eci)) {
         fprintf(stderr, "Error 167: Invalid segment ECI (digits only)\n");
         return 0;
@@ -902,6 +893,7 @@ static int batch_process(struct zint_symbol *symbol, const char *filename, const
     char format_string[256], reversed_string[256], format_char;
     int format_len, i, o, mirror_start_o = 0;
     char adjusted[2] = {0};
+    const int from_stdin = strcmp(filename, "-") == 0; /* Suppress clang-19 warning clang-analyzer-unix.Stream */
 
     if (mirror_mode) {
         /* Use directory if any from outfile */
@@ -936,7 +928,7 @@ static int batch_process(struct zint_symbol *symbol, const char *filename, const
         }
     }
 
-    if (strcmp(filename, "-") == 0) {
+    if (from_stdin) {
         file = stdin;
     } else {
 #ifdef _WIN32
@@ -1113,7 +1105,7 @@ static int batch_process(struct zint_symbol *symbol, const char *filename, const
         warn_number = ZINT_WARN_INVALID_OPTION; /* TODO: maybe new warning e.g. ZINT_WARN_INVALID_INPUT? */
     }
 
-    if (file != stdin) {
+    if (!from_stdin) {
         if (fclose(file) != 0) {
             fprintf(stderr, "Warning 196: Failure on closing input file '%s' (%d: %s)\n", filename, errno,
                     strerror(errno));